[SYCL][E2E] Switch some of Regression/* tests to use <sycl/detail/core.hpp> (#13125)

Author: aelovikov-intel

sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp

@@ -6,7 +6,9 @@
 // simple example without crashes/assertions firing at llvm-spirv step due to
 // debug info corrupted by sycl-post-link
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 constexpr sycl::specialization_id<int> test_id_1{42};
 

sycl/test-e2e/Regression/barrier_with_work.cpp

@@ -8,7 +8,9 @@
 // SYCL_PI_LEVEL_ZERO_USE_MULTIPLE_COMMANDLIST_BARRIERS to enable fix on certain
 // hardware.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/usm.hpp>
 
 constexpr size_t NElemsPerSplit = 1000;
 constexpr size_t Splits = 8;

sycl/test-e2e/Regression/complex_global_object.cpp

@@ -8,7 +8,8 @@
 
 // REQUIRES: TEMPORARY_DISABLED
 // Disable test due to flacky failures
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 class ComplexClass {
 public:

sycl/test-e2e/Regression/context_is_destroyed_after_exception.cpp

@@ -5,7 +5,7 @@
 //
 // XFAIL: hip_nvidia
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   const auto GlobalRange = 1;

sycl/test-e2e/Regression/dummy_event_info.cpp

@@ -2,7 +2,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/properties/all_properties.hpp>
 
 #include <cassert>
 

sycl/test-e2e/Regression/event_destruction.cpp

@@ -11,14 +11,15 @@
 //
 //===----------------------------------------------------------------------===//
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 const size_t ITERS = 100000;
 
 // The test checks that that event destruction does not lead to stack overflow
 
 int main() {
-  sycl::queue Q(sycl::default_selector_v);
+  sycl::queue Q;
   sycl::buffer<int, 1> Buf(3000);
   for (size_t Idx = 0; Idx < ITERS; ++Idx) {
     auto Event = Q.submit([&](sycl::handler &cgh) {

sycl/test-e2e/Regression/exclusive-scan-char-short.cpp

@@ -6,6 +6,7 @@
 // the maximum or minimum operator is computed correctly.
 #include "../helpers.hpp"
 #include <numeric>
+
 #include <sycl/sycl.hpp>
 
 using namespace sycl;

sycl/test-e2e/Regression/ext_oneapi_barrier_opt.cpp

@@ -6,9 +6,12 @@
 
 #include <iostream>
 #include <mutex>
-#include <sycl/sycl.hpp>
 #include <thread>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/properties/all_properties.hpp>
+
 static constexpr int niter = 1024;
 static constexpr int nthreads = 2;
 

sycl/test-e2e/Regression/fsycl-host-compiler-win.cpp

@@ -12,7 +12,9 @@
 //
 // Uses -fsycl-host-compiler=<compiler> on a simple test, requires 'cl'
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/properties/all_properties.hpp>
 
 #ifndef DEFINE_CHECK
 #error predefined macro not set

sycl/test-e2e/Regression/get_spec_const_vec16.cpp

@@ -4,7 +4,9 @@
 // Tests that the right value returned after setting a specialization constant
 // of sycl::vec<char, 16> type is correct.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <algorithm>
 

sycl/test-e2e/Regression/group_local_linear_id.cpp

@@ -5,7 +5,8 @@
 // corresponding group.
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 int main() {
   const sycl::range<3> GlobalRange(2, 8, 16);

sycl/test-e2e/Regression/half_operators.cpp

@@ -2,9 +2,10 @@
 // RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
 // RUN: %{run} %t.out
 #include <iostream>
-#include <sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
 using namespace sycl;
 
 template <typename T> bool are_bitwise_equal(T lhs, T rhs) {

sycl/test-e2e/Regression/image_access.cpp

@@ -14,7 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 int main() {
   try {

sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp

@@ -5,7 +5,9 @@
 // setting a specialization ID from host) only builds the device image
 // containing the kernel it launches.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <iostream>
 

sycl/test-e2e/Regression/implicit_offset_debug_info.cpp

@@ -4,7 +4,8 @@
 
 // NOTE: Tests that the implicit global offset pass copies debug information
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
 using namespace sycl;
 
 int main() {

sycl/test-e2e/Regression/invalid_reqd_wg_size_correct_exception.cpp

@@ -3,7 +3,7 @@
 
 // UNSUPPORTED: hip
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   try {

sycl/test-e2e/Regression/local-arg-align.cpp

@@ -14,7 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Regression/local_accessor_3d_subscript.cpp

@@ -12,7 +12,8 @@
 // compiles and runs.
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
 
 int main() {
   size_t Result = 0;

sycl/test-e2e/Regression/msvc_crt.cpp

@@ -14,7 +14,9 @@
 // MSVC provides two different incompatible variants of CRT: debug and release.
 // This test checks if clang driver is able to handle this properly.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Regression/multiple-targets.cpp

@@ -18,7 +18,7 @@
 // XFAIL: hip_nvidia
 //
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   sycl::queue Q;

sycl/test-e2e/Regression/nop_event_profiling.cpp

@@ -4,7 +4,9 @@
 // Test to check that it is possible to get profiling info from the event
 // returned by barrier which turns into NOP.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/properties/all_properties.hpp>
 
 int main() {
   sycl::event start;

sycl/test-e2e/Regression/pf-wg-atomic64.cpp

@@ -2,7 +2,10 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+
 using namespace sycl;
 
 using AtomicRefT =

sycl/test-e2e/Regression/reduction_64bit_atomic64.cpp

@@ -9,7 +9,9 @@
 //       test is run. However, it should work on devices that support atomic64
 //       as well.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/reduction.hpp>
 
 #include <iostream>
 

sycl/test-e2e/Regression/reduction_resource_leak_dw.cpp

@@ -9,7 +9,9 @@
 // Tests that additional resources required by discard_write reductions do not
 // leak.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/reduction.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Regression/reduction_resource_leak_usm.cpp

@@ -9,7 +9,9 @@
 
 // Tests that additional resources required by USM reductions do not leak.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/reduction.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Regression/unoptimized_stream.cpp

@@ -6,7 +6,9 @@
 
 // UNSUPPORTED: accelerator
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/stream.hpp>
 
 int main() {
   sycl::queue q;

sycl/test-e2e/Regression/usm_malloc_shared.cpp

@@ -9,7 +9,11 @@
 
 #include <iostream>
 #include <stdlib.h>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
+
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 int main(int argc, char *argv[]) {

sycl/test-e2e/Regression/void_global_ptr_conversion.cpp

@@ -11,7 +11,10 @@
 // CHECK: 9
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
+
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 using namespace sycl::access;

sycl/test-e2e/Regression/zero_size_local_accessor.cpp

@@ -9,7 +9,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   sycl::queue Q;