[NFC][SYCL] Move include/CL/__spirv -> include/sycl/__spirv (#15515)

aelovikov-intel · web-flow · commit b5f0191833fe · 2024-10-11T07:30:09.000-07:00
diff --git a/libdevice/bfloat16_wrapper.cpp b/libdevice/bfloat16_wrapper.cpp
@@ -10,10 +10,10 @@
 
 #if defined(__SPIR__) || defined(__SPIRV__)
 
-#include <CL/__spirv/spirv_ops.hpp>
-#include <CL/__spirv/spirv_types.hpp>
 #include <cassert>
 #include <cstdint>
+#include <sycl/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_types.hpp>
 
 DEVICE_EXTERN_C_INLINE
 uint16_t __devicelib_ConvertFToBF16INTEL(const float &x) {
diff --git a/libdevice/nativecpu_utils.cpp b/libdevice/nativecpu_utils.cpp
@@ -14,9 +14,9 @@
 
 #if defined(__SYCL_NATIVE_CPU__)
 
-#include "CL/__spirv/spirv_ops.hpp"
 #include "device.h"
 #include <cstdint>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/types.hpp>
 
 // including state definition from Native CPU UR adapter
diff --git a/sycl/include/sycl/__spirv/spirv_ops.hpp b/sycl/include/sycl/__spirv/spirv_ops.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp>         // for Scope, __ocl_event_t
+#include <sycl/__spirv/spirv_types.hpp>       // for Scope, __ocl_event_t
 #include <sycl/detail/defines_elementary.hpp> // for __DPCPP_SYCL_EXTERNAL
 #include <sycl/detail/export.hpp>             // for __SYCL_EXPORT
 
@@ -1159,7 +1159,7 @@ __spirv_ocl_prefetch(const __attribute__((opencl_global)) char *Ptr,
                      size_t NumBytes) noexcept;
 
 extern __DPCPP_SYCL_EXTERNAL float
-    __spirv_ConvertBF16ToFINTEL(uint16_t) noexcept;
+__spirv_ConvertBF16ToFINTEL(uint16_t) noexcept;
 extern __DPCPP_SYCL_EXTERNAL uint16_t
 __spirv_ConvertFToBF16INTEL(float) noexcept;
 template <int N>
diff --git a/sycl/include/sycl/__spirv/spirv_types.hpp b/sycl/include/sycl/__spirv/spirv_types.hpp
diff --git a/sycl/include/sycl/__spirv/spirv_vars.hpp b/sycl/include/sycl/__spirv/spirv_vars.hpp
@@ -10,7 +10,7 @@
 
 #ifdef __SYCL_DEVICE_ONLY__
 
-#include <CL/__spirv/spirv_types.hpp>         // for __ocl_vec_t
+#include <sycl/__spirv/spirv_types.hpp>       // for __ocl_vec_t
 #include <sycl/detail/defines_elementary.hpp> // for __DPCPP_SYCL_EXTERNAL
 
 #include <cstddef> // for size_t
@@ -172,7 +172,7 @@ namespace __spirv {
 // Helper function templates to initialize and get vector component from SPIR-V
 // built-in variables
 #define __SPIRV_DEFINE_INIT_AND_GET_HELPERS(POSTFIX)                           \
-  template <int ID> static size_t get##POSTFIX();                              \
+  template <int ID> size_t get##POSTFIX();                                     \
   template <> size_t get##POSTFIX<0>() { return __spirv_##POSTFIX##_x(); }     \
   template <> size_t get##POSTFIX<1>() { return __spirv_##POSTFIX##_y(); }     \
   template <> size_t get##POSTFIX<2>() { return __spirv_##POSTFIX##_z(); }     \
diff --git a/sycl/include/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp
@@ -11,7 +11,7 @@
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
 
 #ifdef __SYCL_DEVICE_ONLY__
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <type_traits>
 #endif
 
diff --git a/sycl/include/sycl/atomic.hpp b/sycl/include/sycl/atomic.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp>         // for Scope, MemorySemanticsMask
+#include <sycl/__spirv/spirv_types.hpp>       // for Scope, MemorySemanticsMask
 #include <sycl/access/access.hpp>             // for address_space, decorated
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
 #include <sycl/detail/helpers.hpp>            // for getSPIRVMemorySemanticsMask
diff --git a/sycl/include/sycl/detail/helpers.hpp b/sycl/include/sycl/detail/helpers.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp> // for MemorySemanticsMask
+#include <sycl/__spirv/spirv_types.hpp> // for MemorySemanticsMask
 #include <sycl/access/access.hpp>     // for fence_space
 #include <sycl/detail/export.hpp>     // for __SYCL_EXPORT
 #include <sycl/memory_enums.hpp>      // for memory_order
 
 #ifdef __SYCL_DEVICE_ONLY__
-#include <CL/__spirv/spirv_vars.hpp>
+#include <sycl/__spirv/spirv_vars.hpp>
 #endif
 
 #include <cstddef>     // for size_t
diff --git a/sycl/include/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp
@@ -31,7 +31,7 @@
 #include <sycl/access/access.hpp>
 #include <sycl/detail/generic_type_traits.hpp>
 
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 
 namespace sycl {
 inline namespace _V1 {
diff --git a/sycl/include/sycl/device_event.hpp b/sycl/include/sycl/device_event.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
-#include <CL/__spirv/spirv_types.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_types.hpp>
 
 namespace sycl {
 inline namespace _V1 {
diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/bit_cast.hpp>
 
 namespace sycl {
diff --git a/sycl/include/sycl/ext/intel/experimental/task_sequence.hpp b/sycl/include/sycl/ext/intel/experimental/task_sequence.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
-#include <CL/__spirv/spirv_types.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_types.hpp>
 #include <sycl/aspects.hpp>
 #include <sycl/exception.hpp>
 #include <sycl/ext/intel/experimental/fpga_kernel_properties.hpp>
diff --git a/sycl/include/sycl/ext/intel/pipes.hpp b/sycl/include/sycl/ext/intel/pipes.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp> // for ConstantPipeStorage
+#include <sycl/__spirv/spirv_types.hpp> // for ConstantPipeStorage
 #include <sycl/exception.hpp>         // for make_error_code, errc, exception
 
 #include <stddef.h> // for size_t
diff --git a/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp b/sycl/include/sycl/ext/oneapi/bf16_storage_builtins.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/builtins.hpp>
 #include <sycl/detail/builtins/builtins.hpp>
 #include <sycl/detail/generic_type_lists.hpp>
diff --git a/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp b/sycl/include/sycl/ext/oneapi/experimental/cuda/barrier.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp> // for __clc_BarrierInitialize
+#include <sycl/__spirv/spirv_ops.hpp> // for __clc_BarrierInitialize
 #include <sycl/exception.hpp>
 
 #include <stdint.h> // for int32_t, int64_t, uint32_t, uint64_t
diff --git a/sycl/include/sycl/ext/oneapi/experimental/prefetch.hpp b/sycl/include/sycl/ext/oneapi/experimental/prefetch.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/ext/oneapi/properties/properties.hpp>
 #include <sycl/types.hpp>
 
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
@@ -11,7 +11,7 @@
 #include "matrix-unified-utils.hpp" // for use, layout, tf32, matrix
 #include "utils.hpp"                // for getDecorated
 
-#include <CL/__spirv/spirv_types.hpp>         // for MatrixLayout, MatrixUse
+#include <sycl/__spirv/spirv_types.hpp>       // for MatrixLayout, MatrixUse
 #include <sycl/access/access.hpp>             // for address_space, decorated
 #include <sycl/builtins.hpp>                  // for fabs
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL_ALWAYS_INLINE
diff --git a/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp b/sycl/include/sycl/ext/oneapi/matrix/matrix-unified-utils.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp> // __spv namespace
-#include <optional>                   // std::optional
-#include <string_view>                // std::string_view
-#include <utility>                    // std::pair
+#include <optional>                     // std::optional
+#include <string_view>                  // std::string_view
+#include <sycl/__spirv/spirv_types.hpp> // __spv namespace
+#include <utility>                      // std::pair
 
 namespace sycl {
 inline namespace _V1 {
diff --git a/sycl/include/sycl/group.hpp b/sycl/include/sycl/group.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>            // for __spirv_MemoryBarrier
-#include <CL/__spirv/spirv_types.hpp>          // for Scope, __ocl_event_t
+#include <sycl/__spirv/spirv_ops.hpp>          // for __spirv_MemoryBarrier
+#include <sycl/__spirv/spirv_types.hpp>        // for Scope, __ocl_event_t
 #include <sycl/access/access.hpp>              // for decorated, mode, addr...
 #include <sycl/detail/common.hpp>              // for NDLoop, __SYCL_ASSERT
 #include <sycl/detail/defines.hpp>             // for __SYCL_TYPE
diff --git a/sycl/include/sycl/kernel_handler.hpp b/sycl/include/sycl/kernel_handler.hpp
@@ -13,7 +13,7 @@
 #include <sycl/exception.hpp>                 // for feature_not_supported
 
 #ifdef __SYCL_DEVICE_ONLY__
-#include <CL/__spirv/spirv_ops.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #endif
 
 #include <type_traits> // for remove_reference_t
diff --git a/sycl/include/sycl/multi_ptr.hpp b/sycl/include/sycl/multi_ptr.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>           // for __spirv_ocl_prefetch
+#include <sycl/__spirv/spirv_ops.hpp>         // for __spirv_ocl_prefetch
 #include <sycl/access/access.hpp>             // for address_space, decorated
 #include <sycl/aliases.hpp>                   // for half
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED
diff --git a/sycl/include/sycl/nd_item.hpp b/sycl/include/sycl/nd_item.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_ops.hpp>           // for __spirv_ControlBarrier
-#include <CL/__spirv/spirv_types.hpp>         // for Scope
-#include <CL/__spirv/spirv_vars.hpp>          // for initLocalInvocationId
+#include <sycl/__spirv/spirv_ops.hpp>         // for __spirv_ControlBarrier
+#include <sycl/__spirv/spirv_types.hpp>       // for Scope
+#include <sycl/__spirv/spirv_vars.hpp>        // for initLocalInvocationId
 #include <sycl/access/access.hpp>             // for mode, fence_space
 #include <sycl/detail/defines.hpp>            // for __SYCL_ASSUME_INT
 #include <sycl/detail/defines_elementary.hpp> // for __SYCL2020_DEPRECATED, __SY...
diff --git a/sycl/include/sycl/stl_wrappers/assert.h b/sycl/include/sycl/stl_wrappers/assert.h
@@ -18,7 +18,7 @@
 
 extern "C++" {
 #ifdef __SYCL_DEVICE_ONLY__
-#include <CL/__spirv/spirv_vars.hpp>
+#include <sycl/__spirv/spirv_vars.hpp>
 
 // Device assertions on Windows do not work properly so we define these wrappers
 // around the STL assertion headers cassert and assert.h where we redefine
diff --git a/sycl/include/sycl/stl_wrappers/cassert b/sycl/include/sycl/stl_wrappers/cassert
@@ -17,7 +17,7 @@
 #endif
 
 #ifdef __SYCL_DEVICE_ONLY__
-#include <CL/__spirv/spirv_vars.hpp>
+#include <sycl/__spirv/spirv_vars.hpp>
 
 // Device assertions on Windows do not work properly so we define these wrappers
 // around the STL assertion headers cassert and assert.h where we redefine
diff --git a/sycl/include/sycl/stl_wrappers/complex b/sycl/include/sycl/stl_wrappers/complex
@@ -34,7 +34,7 @@
 
 #include <type_traits>
 
-#include <CL/__spirv/spirv_ops.hpp> // for __SYCL_CONVERGENT__
+#include <sycl/__spirv/spirv_ops.hpp> // for __SYCL_CONVERGENT__
 #include <sycl/half_type.hpp>       // for half
 
 // We provide std::complex specializations here for the following:
diff --git a/sycl/source/detail/sampler_impl.hpp b/sycl/source/detail/sampler_impl.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <CL/__spirv/spirv_types.hpp>
+#include <sycl/__spirv/spirv_types.hpp>
 #include <sycl/context.hpp>
 #include <sycl/detail/export.hpp>
 #include <sycl/detail/ur.hpp>
diff --git a/sycl/source/spirv_ops.cpp b/sycl/source/spirv_ops.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <CL/__spirv/spirv_ops.hpp>
 #include <detail/platform_util.hpp>
+#include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/detail/iostream_proxy.hpp>
 #include <sycl/exception.hpp>
 
diff --git a/sycl/test/check_device_code/ap_fixed.cpp b/sycl/test/check_device_code/ap_fixed.cpp
@@ -8,7 +8,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "CL/__spirv/spirv_ops.hpp"
+#include "sycl/__spirv/spirv_ops.hpp"
 
 SYCL_EXTERNAL auto test_sqrt(sycl::detail::ap_int<13> a) {
   return __spirv_FixedSqrtINTEL<13, 5>(a, false, 2, 2);
diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp
@@ -7,14 +7,14 @@
 // CHECK-NEXT: accessor.hpp
 // CHECK-NEXT: access/access.hpp
 // CHECK-NEXT: detail/defines_elementary.hpp
-// CHECK-NEXT: CL/__spirv/spirv_ops.hpp
-// CHECK-NEXT: CL/__spirv/spirv_types.hpp
+// CHECK-NEXT: __spirv/spirv_ops.hpp
+// CHECK-NEXT: __spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: atomic.hpp
 // CHECK-NEXT: detail/helpers.hpp
 // CHECK-NEXT: memory_enums.hpp
-// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
+// CHECK-NEXT: __spirv/spirv_vars.hpp
 // CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
diff --git a/sycl/test/include_deps/sycl_buffer.hpp.cpp b/sycl/test/include_deps/sycl_buffer.hpp.cpp
@@ -7,8 +7,8 @@
 // CHECK-NEXT: buffer.hpp
 // CHECK-NEXT: access/access.hpp
 // CHECK-NEXT: detail/defines_elementary.hpp
-// CHECK-NEXT: CL/__spirv/spirv_ops.hpp
-// CHECK-NEXT: CL/__spirv/spirv_types.hpp
+// CHECK-NEXT: __spirv/spirv_ops.hpp
+// CHECK-NEXT: __spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: backend_types.hpp
@@ -18,7 +18,7 @@
 // CHECK-NEXT: detail/common.hpp
 // CHECK-NEXT: stl_wrappers/cassert
 // CHECK-NEXT: stl_wrappers/assert.h
-// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
+// CHECK-NEXT: __spirv/spirv_vars.hpp
 // CHECK-NEXT: detail/helpers.hpp
 // CHECK-NEXT: memory_enums.hpp
 // CHECK-NEXT: detail/iostream_proxy.hpp
diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -8,14 +8,14 @@
 // CHECK-NEXT: accessor.hpp
 // CHECK-NEXT: access/access.hpp
 // CHECK-NEXT: detail/defines_elementary.hpp
-// CHECK-NEXT: CL/__spirv/spirv_ops.hpp
-// CHECK-NEXT: CL/__spirv/spirv_types.hpp
+// CHECK-NEXT: __spirv/spirv_ops.hpp
+// CHECK-NEXT: __spirv/spirv_types.hpp
 // CHECK-NEXT: detail/defines.hpp
 // CHECK-NEXT: detail/export.hpp
 // CHECK-NEXT: atomic.hpp
 // CHECK-NEXT: detail/helpers.hpp
 // CHECK-NEXT: memory_enums.hpp
-// CHECK-NEXT: CL/__spirv/spirv_vars.hpp
+// CHECK-NEXT: __spirv/spirv_vars.hpp
 // CHECK-NEXT: multi_ptr.hpp
 // CHECK-NEXT: aliases.hpp
 // CHECK-NEXT: half_type.hpp
