[SYCL][E2E] Use fine-grained includes in Basic/* tests (#13850)

Co-authored-by: Sergey Semenov <[email protected]>

Author: aelovikov-intel

sycl/test-e2e/Basic/accessor/Inputs/device_accessor.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include <cassert>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   // Non-placeholder accessors.

sycl/test-e2e/Basic/accessor/Inputs/host_accessor.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 #include <cassert>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
   {

sycl/test-e2e/Basic/accessor/Inputs/host_task_accessor.cpp

@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 #include <cassert>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/detail/host_task_impl.hpp>
 
 #if !defined(accessor_new_api_test) && !defined(buffer_new_api_test) &&        \
     !defined(accessor_placeholder_new_api_test) &&                             \

sycl/test-e2e/Basic/auto_local_range.cpp

@@ -2,7 +2,8 @@
 // RUN: %{run} %t.out
 
 #include <cstdlib>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/auto_local_range.hpp>
 
 template <size_t... Args> bool testAutoLocalRange() {
   constexpr int Dimensions = sizeof...(Args);

sycl/test-e2e/Basic/backend_info.cpp

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

sycl/test-e2e/Basic/built-ins.cpp

@@ -7,7 +7,8 @@
 // Hits an assertion with AMD:
 // XFAIL: hip_amd
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/builtins.hpp>
 
 #include <cassert>
 

sycl/test-e2e/Basic/built-ins/host_math.cpp

@@ -7,7 +7,8 @@
 #include <iomanip>
 #include <iostream>
 
-#include <sycl.hpp>
+#include <sycl/builtins.hpp>
+#include <sycl/detail/core.hpp>
 
 template <typename T> T get_ulp_std(T x) {
   const T inf = std::numeric_limits<T>::infinity();

sycl/test-e2e/Basic/context.cpp

@@ -4,7 +4,8 @@
 // This test performs basic check of the SYCL context class.
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/cuda_max_wgs_error.cpp

@@ -4,7 +4,7 @@
 // REQUIRES: cuda
 
 #include <numeric>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/diagnostics/non-uniform-wk-gp-test.cpp

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

sycl/test-e2e/Basic/event_creation.cpp

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

sycl/test-e2e/Basic/event_default_construction.cpp

@@ -1,7 +1,7 @@
 // RUN: %{build} -o %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR=bad %{run-unfiltered-devices} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main(void) {
   try {
@@ -18,4 +18,4 @@ int main(void) {
     assert(false && "we should not be here");
   }
   return 0;
-}
+}

sycl/test-e2e/Basic/event_profiling_info.cpp

@@ -15,7 +15,8 @@
 
 #include <cassert>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/properties/all_properties.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/exceptions-SYCL-2020.cpp

@@ -1,7 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/backend.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/fpga_tests/Inputs/fpga_device.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "sycl/sycl.hpp"
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/fpga_tests/Inputs/fpga_host.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "sycl/sycl.hpp"
 #include <cassert>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/fpga_tests/fpga_pipes_legacy_ns.cpp

@@ -9,7 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/pipes.hpp>
 
 class some_nb_pipe;
 

sycl/test-e2e/Basic/fpga_tests/fpga_queue.cpp

@@ -12,8 +12,9 @@
 //===----------------------------------------------------------------------===//
 #include <iostream>
 #include <set>
+#include <sycl/backend.hpp>
 #include <sycl/backend/opencl.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/free_function_queries/free_function_queries.cpp

@@ -14,7 +14,8 @@
 //
 //===------------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/free_function_queries.hpp>
 
 #include <cassert>
 #include <iostream>

sycl/test-e2e/Basic/free_function_queries/free_function_queries_sub_group.cpp

@@ -18,7 +18,7 @@
 //===------------------------------------------------------------------------===//
 
 #include "../../SubGroup/helper.hpp"
-#include <sycl/sycl.hpp>
+#include <sycl/ext/oneapi/free_function_queries.hpp>
 
 #include <cassert>
 #include <iostream>

sycl/test-e2e/Basic/group_local_memory.cpp

@@ -1,7 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/group_local_memory.hpp>
 
 constexpr int N = 5;
 

sycl/test-e2e/Basic/image/image.cpp

@@ -18,6 +18,9 @@
 
 #include "../../helpers.hpp"
 
+#include <sycl/accessor_image.hpp>
+#include <sycl/image.hpp>
+
 int main() {
   const sycl::image_channel_order ChanOrder = sycl::image_channel_order::rgba;
   const sycl::image_channel_type ChanType = sycl::image_channel_type::fp32;

sycl/test-e2e/Basic/image/image_accessor_range.cpp

@@ -9,8 +9,11 @@
 // RUN: %{run} %t.out
 
 #include <iostream>
-#include <sycl/accessor.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 #define N 4   // dimensin
 #define M 128 // dimension

sycl/test-e2e/Basic/image/image_accessor_readsampler.cpp

@@ -14,7 +14,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
 
 #include <cassert>
 #include <iomanip>

sycl/test-e2e/Basic/image/image_accessor_readwrite_half.cpp

@@ -18,7 +18,9 @@
 #include <cassert>
 #include <iomanip>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
 
 namespace s = sycl;
 

sycl/test-e2e/Basic/image/image_array.cpp

@@ -21,6 +21,9 @@
 
 #include "../../helpers.hpp"
 
+#include <sycl/accessor_image.hpp>
+#include <sycl/image.hpp>
+
 int main() {
   const sycl::image_channel_order ChanOrder = sycl::image_channel_order::rgba;
   const sycl::image_channel_type ChanType = sycl::image_channel_type::fp32;

sycl/test-e2e/Basic/image/image_read.h

@@ -8,7 +8,9 @@
  * https://www.khronos.org/registry/OpenCL/specs/opencl-1.2.pdf#page=329
  */
 
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
 
 #include <iostream>
 
@@ -230,4 +232,4 @@ bool test(s::queue myQueue) {
     passed = false;
 
   return passed;
-}
+}

sycl/test-e2e/Basic/image/image_write.h

@@ -8,7 +8,9 @@
  * https://www.khronos.org/registry/OpenCL/specs/opencl-1.2.pdf#page=329
  */
 
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
 
 #include <iostream>
 

sycl/test-e2e/Basic/image/srgba-read.cpp

@@ -3,7 +3,9 @@
 // RUN: %{run} %t.out | FileCheck %s
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/image.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/in_order_queue_status.cpp

@@ -4,8 +4,11 @@
 // Test checks that queue::ext_oneapi_empty() returns status of the in-order
 // queue.
 
+#include <sycl/detail/core.hpp>
+#include <sycl/properties/all_properties.hpp>
+#include <sycl/usm.hpp>
+
 #include <chrono>
-#include <sycl.hpp>
 #include <thread>
 
 static void CheckArray(int *x, size_t buffer_size, int expected) {

sycl/test-e2e/Basic/intel-ext-device.cpp

@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 #include <cassert>
 #include <iostream>

sycl/test-e2e/Basic/interop/check_carrying_real_kernel_IDs.cpp

@@ -3,8 +3,9 @@
 // RUN: %{run} %t.out
 
 #include <CL/opencl.h>
+#include <sycl/backend.hpp>
 #include <sycl/backend/opencl.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/Basic/interop/construction_ocl.cpp

@@ -3,9 +3,9 @@
 // RUN: env ONEAPI_DEVICE_SELECTOR="opencl:*" %t.ocl.out
 
 #include <CL/cl.h>
+#include <sycl/backend.hpp>
 #include <sycl/backend/opencl.hpp>
-
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 constexpr auto BE = sycl::backend::opencl;
 

sycl/test-e2e/Basic/interop/get_native_ocl.cpp

@@ -4,8 +4,9 @@
 
 #include <CL/cl.h>
 
+#include <sycl/backend.hpp>
 #include <sycl/backend/opencl.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 constexpr auto BE = sycl::backend::opencl;
 

sycl/test-e2e/Basic/interop/get_native_ze.cpp

@@ -7,8 +7,8 @@
 
 #include <level_zero/ze_api.h>
 
+#include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/backend/level_zero.hpp>
-#include <sycl/sycl.hpp>
 
 constexpr auto BE = sycl::backend::ext_oneapi_level_zero;
 

sycl/test-e2e/Basic/interop/interop_all_backends.cpp

@@ -1,7 +1,10 @@
 // REQUIRES: CUDA || HIP
 // RUN: %{build} %if hip %{ -DSYCL_EXT_ONEAPI_BACKEND_HIP %} %else %{ %if cuda %{ -DSYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL %} %else %{ %if level_zero %{ -DSYCL_EXT_ONEAPI_BACKEND_L0 %} %} %} -o %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/backend.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/properties/all_properties.hpp>
+#include <sycl/usm.hpp>
 using namespace sycl;
 
 #ifdef SYCL_EXT_ONEAPI_BACKEND_CUDA_EXPERIMENTAL

sycl/test-e2e/Basic/interop/make_kernel_subdevice_l0.cpp

@@ -5,8 +5,8 @@
 #include <cstdlib>
 #include <iostream>
 #include <level_zero/ze_api.h>
+#include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/backend/level_zero.hpp>
-#include <sycl/sycl.hpp>
 
 using namespace sycl;