clang-format

Author: Alexander Batashev

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

@@ -17,10 +17,10 @@
 #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/range.hpp>
 #include <CL/sycl/types.hpp>
-#include <CL/sycl/enums.hpp>
 
 #include <type_traits>
 
@@ -105,7 +105,8 @@ struct sub_group {
   using range_type = range<1>;
   using linear_id_type = uint32_t;
   static constexpr int dimensions = 1;
-  static constexpr sycl::memory_scope fence_scope = sycl::memory_scope::sub_group;
+  static constexpr sycl::memory_scope fence_scope =
+      sycl::memory_scope::sub_group;
 
   /* --- common interface members --- */
 
@@ -728,13 +729,13 @@ struct sub_group {
 #endif
   }
 
-  protected:
-    template <int dimensions> friend class cl::sycl::nd_item;
-    friend sub_group this_sub_group();
-    sub_group() = default;
-  };
+protected:
+  template <int dimensions> friend class cl::sycl::nd_item;
+  friend sub_group this_sub_group();
+  sub_group() = default;
+};
 
-  inline sub_group this_sub_group() {
+inline sub_group this_sub_group() {
 #ifdef __SYCL_DEVICE_ONLY__
   return sub_group();
 #else

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

@@ -14,8 +14,8 @@
 #include <CL/sycl/detail/generic_type_traits.hpp>
 #include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/detail/type_traits.hpp>
-#include <CL/sycl/id.hpp>
 #include <CL/sycl/enums.hpp>
+#include <CL/sycl/id.hpp>
 
 #ifdef __SYCL_DEVICE_ONLY__
 __SYCL_INLINE_NAMESPACE(cl) {
@@ -260,8 +260,7 @@ getScope(ONEAPI::memory_scope Scope) {
   }
 }
 
-constexpr __spv::Scope::Flag
-getScope(memory_scope Scope) {
+constexpr __spv::Scope::Flag getScope(memory_scope Scope) {
   switch (Scope) {
   case memory_scope::work_item:
     return __spv::Scope::Invocation;

sycl/include/CL/sycl/enums.hpp

@@ -11,11 +11,11 @@
 __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
+  work_item = 0,
+  sub_group = 1,
+  work_group = 2,
+  device = 3,
+  system = 4
 };
 
 #if __cplusplus >= 201703L
@@ -25,6 +25,5 @@ inline constexpr auto memory_scope_work_group = memory_scope::work_group;
 inline constexpr auto memory_scope_device = memory_scope::device;
 inline constexpr auto memory_scope_system = memory_scope::system;
 #endif
-}
-}
-
+} // namespace sycl
+} // __SYCL_INLINE_NAMESPACE(cl)

sycl/include/CL/sycl/group.hpp

@@ -15,11 +15,11 @@
 #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/pointers.hpp>
 #include <CL/sycl/range.hpp>
-#include <CL/sycl/enums.hpp>
 #include <stdexcept>
 #include <type_traits>
 

sycl/include/CL/sycl/sub_group.hpp

@@ -8,28 +8,29 @@
 
 #pragma once
 
-#include <CL/sycl/group.hpp>
 #include <CL/sycl/ONEAPI/sub_group.hpp>
+#include <CL/sycl/group.hpp>
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 using ONEAPI::sub_group;
 // TODO move the entire sub_group class implementation to this file once
 // breaking changes are allowed.
 
-template <> inline void group_barrier<sub_group>(sub_group Group, memory_scope FenceScope) {
+template <>
+inline void group_barrier<sub_group>(sub_group Group, memory_scope FenceScope) {
   (void)Group;
   (void)FenceScope;
 #ifdef __SYCL_DEVICE_ONLY__
-    __spirv_ControlBarrier(
-        __spv::Scope::Subgroup, detail::spirv::getScope(FenceScope),
-        __spv::MemorySemanticsMask::AcquireRelease |
-            __spv::MemorySemanticsMask::SubgroupMemory |
-            __spv::MemorySemanticsMask::WorkgroupMemory |
-            __spv::MemorySemanticsMask::CrossWorkgroupMemory);
+  __spirv_ControlBarrier(__spv::Scope::Subgroup,
+                         detail::spirv::getScope(FenceScope),
+                         __spv::MemorySemanticsMask::AcquireRelease |
+                             __spv::MemorySemanticsMask::SubgroupMemory |
+                             __spv::MemorySemanticsMask::WorkgroupMemory |
+                             __spv::MemorySemanticsMask::CrossWorkgroupMemory);
 #else
-    throw runtime_error("Sub-groups are not supported on host device.",
-                        PI_INVALID_DEVICE);
+  throw runtime_error("Sub-groups are not supported on host device.",
+                      PI_INVALID_DEVICE);
 #endif
 }
 } // namespace sycl