[SYCL] Delay inclusion of sycl/types.hpp in core.hpp

Can't eliminate it completely until #13760 is merged, but this PR brings us closer to that goal.
intel · May 23, 2024 · 2e396bd · 2e396bd
1 parent f739a6d
commit 2e396bd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/sycl/include/sycl/ext/intel/experimental/task_sequence.hpp b/sycl/include/sycl/ext/intel/experimental/task_sequence.hpp
@@ -10,6 +10,7 @@
 
 #include <CL/__spirv/spirv_ops.hpp>
 #include <CL/__spirv/spirv_types.hpp>
+#include <sycl/aspects.hpp>
 #include <sycl/exception.hpp>
 #include <sycl/ext/intel/experimental/fpga_kernel_properties.hpp>
 #include <sycl/ext/intel/experimental/task_sequence_properties.hpp>

diff --git a/sycl/include/sycl/ext/oneapi/experimental/prefetch.hpp b/sycl/include/sycl/ext/oneapi/experimental/prefetch.hpp
@@ -10,6 +10,7 @@
 
 #include <CL/__spirv/spirv_ops.hpp>
 #include <sycl/ext/oneapi/properties/properties.hpp>
+#include <sycl/types.hpp>
 
 namespace sycl {
 inline namespace _V1 {

diff --git a/sycl/include/sycl/ext/oneapi/properties/properties.hpp b/sycl/include/sycl/ext/oneapi/properties/properties.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
+#include <sycl/detail/is_device_copyable.hpp>
 #include <sycl/ext/oneapi/properties/property.hpp>       // for IsRuntimePr...
 #include <sycl/ext/oneapi/properties/property_utils.hpp> // for Sorted, Mer...
 #include <sycl/ext/oneapi/properties/property_value.hpp> // for property_value
-#include <sycl/types.hpp>                                // for is_device_c...
 
 #include <tuple>       // for tuple, tupl...
 #include <type_traits> // for enable_if_t

diff --git a/sycl/include/sycl/sub_group.hpp b/sycl/include/sycl/sub_group.hpp
@@ -18,7 +18,6 @@
 #include <sycl/memory_enums.hpp>               // for memory_scope
 #include <sycl/multi_ptr.hpp>                  // for multi_ptr
 #include <sycl/range.hpp>                      // for range
-#include <sycl/types.hpp>                      // for vec
 
 #ifdef __SYCL_DEVICE_ONLY__
 #include <sycl/ext/oneapi/functional.hpp>
@@ -33,7 +32,7 @@ inline namespace _V1 {
 template <typename T, access::address_space Space,
           access::decorated DecorateAddress>
 class multi_ptr;
-
+template <typename Type, int NumElements> class vec;
 namespace detail {
 
 namespace sub_group {

diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp
@@ -133,12 +133,6 @@
 // CHECK-NEXT: nd_item.hpp
 // CHECK-NEXT: nd_range.hpp
 // CHECK-NEXT: sub_group.hpp
-// CHECK-NEXT: types.hpp
-// CHECK-NEXT: marray.hpp
-// CHECK-NEXT: vector.hpp
-// CHECK-NEXT: detail/memcpy.hpp
-// CHECK-NEXT: detail/vector_convert.hpp
-// CHECK-NEXT: swizzles.def
 // CHECK-NEXT: ext/oneapi/functional.hpp
 // CHECK-NEXT: detail/spirv.hpp
 // CHECK-NEXT: ext/oneapi/experimental/non_uniform_groups.hpp
@@ -148,6 +142,12 @@
 // CHECK-NEXT: builtins_utils_vec.hpp
 // CHECK-NEXT: builtins_utils_scalar.hpp
 // CHECK-NEXT: detail/boolean.hpp
+// CHECK-NEXT: marray.hpp
+// CHECK-NEXT: types.hpp
+// CHECK-NEXT: vector.hpp
+// CHECK-NEXT: detail/memcpy.hpp
+// CHECK-NEXT: detail/vector_convert.hpp
+// CHECK-NEXT: swizzles.def
 // CHECK-NEXT: detail/builtins/common_functions.inc
 // CHECK-NEXT: detail/builtins/helper_macros.hpp
 // CHECK-NEXT: detail/builtins/geometric_functions.inc