[SYCL][E2E] Switch KernelFusion/* tests to use <sycl/detail/core.hpp>

sycl/test-e2e/KernelFusion/GroupAlgorithm/all_of.cpp

@@ -7,7 +7,10 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/group_algorithm.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 // COM: Check all_of works with kernel fusion.
 

sycl/test-e2e/KernelFusion/GroupAlgorithm/exclusive_scan.cpp

@@ -9,7 +9,9 @@
 #include <iostream>
 #include <limits>
 #include <numeric>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 #include <vector>
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/GroupAlgorithm/permute.cpp

@@ -3,7 +3,9 @@
 
 // Test fusion works with permute and remapping.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include "../helpers.hpp"
 #include "sycl/group_algorithm.hpp"

sycl/test-e2e/KernelFusion/GroupAlgorithm/support.h

@@ -1,5 +1,7 @@
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::oneapi;

sycl/test-e2e/KernelFusion/GroupFunctions/group_barrier.cpp

@@ -4,7 +4,10 @@
 // Test complete_fusion preserves barriers by launching a kernel that requires a
 // barrier for correctness.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/group_barrier.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include "../helpers.hpp"
 

sycl/test-e2e/KernelFusion/GroupFunctions/group_broadcast.cpp

@@ -3,7 +3,10 @@
 
 // Test fusion works with group_broadcast.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/group_algorithm.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include "../helpers.hpp"
 

sycl/test-e2e/KernelFusion/GroupFunctions/group_broadcast_remapping.cpp

@@ -3,7 +3,10 @@
 
 // Test fusion works with group_broadcast and remapping.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/group_algorithm.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include "../helpers.hpp"
 

sycl/test-e2e/KernelFusion/Reduction/reduction.hpp

@@ -1,10 +1,12 @@
 // Test fusion works with reductions. Only algorithms automatically selected by
 // `sycl::reduction` are supported.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include "../helpers.hpp"
-#include "sycl/detail/reduction_forward.hpp"
+#include "sycl/reduction.hpp"
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/abort_fusion.cpp

@@ -5,7 +5,10 @@
 // to abort fusion due to constraint violations for fusion. Also check that
 // warnings are printed when SYCL_RT_WARNING_LEVEL=1.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/abort_internalization.cpp

@@ -5,7 +5,9 @@
 // to abort internalization due to target or parameter mismatch. Also check that
 // warnings are printed when SYCL_RT_WARNING_LEVEL=1.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/abort_internalization_stored_ptr.cpp

@@ -10,7 +10,9 @@
 // it just fails for a slightly different reason.
 // CHECK-HIP-NEXT: Failed to promote argument 0 of function {{.*}}: Do not know how to handle value to promote
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include <array>
 

sycl/test-e2e/KernelFusion/barrier_local_internalization.cpp

@@ -4,7 +4,9 @@
 // Test complete fusion with local internalization and a combination of kernels
 // that require a work-group barrier to be inserted by fusion.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/buffer_internalization.cpp

@@ -4,7 +4,9 @@
 // Test complete fusion with private internalization specified on the
 // buffer.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/cached_ndrange.cpp

@@ -6,7 +6,9 @@
 // printed when SYCL_RT_WARNING_LEVEL=1.
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/cancel_fusion.cpp

@@ -3,7 +3,9 @@
 
 // Test cancel fusion
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/complete_fusion.cpp

@@ -3,7 +3,9 @@
 
 // Test complete fusion without any internalization
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/cooperative_kernel.cpp

@@ -8,7 +8,9 @@
 // fusion enabled.
 // XFAIL: hip_amd
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/device_info_descriptor.cpp

@@ -3,7 +3,9 @@
 
 // Test correct return from device information descriptor.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/diamond_shape.cpp

@@ -5,7 +5,9 @@
 // accessors for a combination of four kernels, forming a diamond-like shape and
 // repeating one of the kernels.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/diamond_shape_local.cpp

@@ -5,7 +5,9 @@
 // accessors for a combination of four kernels, forming a diamond-like shape and
 // repeating one of the kernels.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/different_nd_ranges.cpp

@@ -7,7 +7,11 @@
 // Kernels with different ND-ranges should be fused.
 // CHECK-NOT: Cannot fuse kernels with different offsets or local sizes
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/builtins.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 #include <algorithm>
 

sycl/test-e2e/KernelFusion/event_wait_cancel.cpp

@@ -6,7 +6,10 @@
 
 #include "fusion_event_test_common.h"
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/event_wait_complete.cpp

@@ -6,7 +6,10 @@
 
 #include "fusion_event_test_common.h"
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/existing_local_accessor.cpp

@@ -4,7 +4,9 @@
 // Test complete fusion with local internalization and an local accessor that
 // already exists in one of the input kernels.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/fusion_event_test_common.h

@@ -1,4 +1,6 @@
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/helpers.hpp

@@ -1,4 +1,6 @@
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::codeplay;

sycl/test-e2e/KernelFusion/internal_explicit_dependency.cpp

@@ -7,7 +7,10 @@
 
 #include "fusion_event_test_common.h"
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_array_wrapper.cpp

@@ -5,7 +5,11 @@
 
 #include <array>
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/builtins.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_array_wrapper_local.cpp

@@ -5,7 +5,11 @@
 
 #include <array>
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/builtins.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_deep.cpp

@@ -5,7 +5,11 @@
 
 #include <type_traits>
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/builtins.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_multi_ptr.cpp

@@ -4,7 +4,9 @@
 // Test complete fusion with private internalization specified on the
 // accessors for a device kernel using multi_ptr to global address space.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_non_unit_localsize.cpp

@@ -12,7 +12,9 @@
 // - `tmp2` is an `i8` buffer. The corresponding `i8`-typed GEPs must be
 //   remapped during internalization.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_vec.cpp

@@ -3,7 +3,11 @@
 
 // Test complete fusion with internalization of a struct type.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/builtins.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/internalize_vfunc.cpp

@@ -6,7 +6,9 @@
 
 #define VEC 4
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/KernelFusion/jit_caching.cpp

@@ -5,7 +5,9 @@
 // printed when SYCL_RT_WARNING_LEVEL=1.
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;