address feedback

Author: Alexander Batashev

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -606,4 +606,5 @@ __spirv_MemoryBarrier(__spv::Scope Memory, uint32_t Semantics) noexcept;
 __SYCL_CONVERGENT__ extern SYCL_EXTERNAL __SYCL_EXPORT void
 __spirv_GroupWaitEvents(__spv::Scope Execution, uint32_t NumEvents,
                         __ocl_event_t *WaitEvents) noexcept;
+
 #endif // !__SYCL_DEVICE_ONLY__

sycl/include/CL/sycl/ONEAPI/sub_group.hpp

@@ -17,8 +17,8 @@
 #include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/detail/spirv.hpp>
 #include <CL/sycl/detail/type_traits.hpp>
-#include <CL/sycl/enums.hpp>
 #include <CL/sycl/id.hpp>
+#include <CL/sycl/memory_enums.hpp>
 #include <CL/sycl/range.hpp>
 #include <CL/sycl/types.hpp>
 

sycl/include/CL/sycl/detail/spirv.hpp

@@ -14,7 +14,6 @@
 #include <CL/sycl/detail/generic_type_traits.hpp>
 #include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/detail/type_traits.hpp>
-#include <CL/sycl/enums.hpp>
 #include <CL/sycl/id.hpp>
 
 #ifdef __SYCL_DEVICE_ONLY__
@@ -260,21 +259,6 @@ getScope(ONEAPI::memory_scope Scope) {
   }
 }
 
-constexpr __spv::Scope::Flag getScope(memory_scope Scope) {
-  switch (Scope) {
-  case memory_scope::work_item:
-    return __spv::Scope::Invocation;
-  case memory_scope::sub_group:
-    return __spv::Scope::Subgroup;
-  case memory_scope::work_group:
-    return __spv::Scope::Workgroup;
-  case memory_scope::device:
-    return __spv::Scope::Device;
-  case memory_scope::system:
-    return __spv::Scope::CrossDevice;
-  }
-}
-
 template <typename T, access::address_space AddressSpace>
 inline typename detail::enable_if_t<std::is_integral<T>::value, T>
 AtomicCompareExchange(multi_ptr<T, AddressSpace> MPtr,

sycl/include/CL/sycl/group.hpp

@@ -15,9 +15,9 @@
 #include <CL/sycl/detail/generic_type_traits.hpp>
 #include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/device_event.hpp>
-#include <CL/sycl/enums.hpp>
 #include <CL/sycl/h_item.hpp>
 #include <CL/sycl/id.hpp>
+#include <CL/sycl/memory_enums.hpp>
 #include <CL/sycl/pointers.hpp>
 #include <CL/sycl/range.hpp>
 #include <stdexcept>

sycl/include/CL/sycl/enums.hpp renamed to sycl/include/CL/sycl/memory_enums.hpp

@@ -8,15 +8,11 @@
 
 #pragma once
 
+#include <CL/sycl/ONEAPI/atomic_enums.hpp>
+
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
-enum class memory_scope : unsigned char {
-  work_item = 0,
-  sub_group = 1,
-  work_group = 2,
-  device = 3,
-  system = 4
-};
+using ONEAPI::memory_scope;
 
 #if __cplusplus >= 201703L
 inline constexpr auto memory_scope_work_item = memory_scope::work_item;