[SYCL][E2E] Use fine-grained includes in miscellaneous tests

sycl/test-e2e/AbiNeutral/catch-exception.cpp

@@ -7,7 +7,7 @@
 // This test case tests if compiling works with or without
 // _GLIBCXX_USE_CXX11_ABI=0.
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 int main() {
 #ifdef _GLIBCXX_USE_CXX11_ABI

sycl/test-e2e/AbiNeutral/device-info.cpp

@@ -9,7 +9,7 @@
 #include <deque>
 #include <iostream>
 #include <mutex>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 #include <vector>
 
 template <typename T> using dpcpp_info_t = typename T::return_type;

sycl/test-e2e/AbiNeutral/submit-kernel.cpp

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

sycl/test-e2e/Annotated_arg_ptr/annotated_arg.cpp

@@ -2,7 +2,9 @@
 // RUN: %{run} %t.out
 // REQUIRES: aspect-usm_shared_allocations
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_arg/annotated_arg.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental;

sycl/test-e2e/Annotated_arg_ptr/annotated_ptr.cpp

@@ -2,8 +2,10 @@
 // RUN: %{run} %t.out
 // REQUIRES: aspect-usm_shared_allocations
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
+#include <sycl/ext/oneapi/experimental/annotated_ptr/annotated_ptr.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/dealloc.hpp>
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental;
 using namespace sycl::ext::intel::experimental;

sycl/test-e2e/Annotated_usm/annotated_usm_align.cpp

@@ -6,13 +6,13 @@
 // This e2e test checks the alignment of the annotated USM allocation (host &
 // device) in various cases
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_device.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_host.hpp>
 
 #include <complex>
 #include <numeric>
 
-// clang-format on
-
 using namespace sycl::ext::oneapi::experimental;
 using namespace sycl::ext::intel::experimental;
 using alloc = sycl::usm::alloc;
@@ -424,4 +424,4 @@ int main() {
   testAlign<std::complex<double>>(q, 4);
   testAlign<MyStruct>(q, 4);
   return 0;
-}
+}

sycl/test-e2e/Annotated_usm/annotated_usm_kind.cpp

@@ -4,13 +4,15 @@
 // This e2e test checks the usm kind of the pointer returned by annotated USM
 // allocation
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_device.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_host.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_shared.hpp>
 
 #include <complex>
 #include <numeric>
 
-// clang-format on
-
 using namespace sycl::ext::oneapi::experimental;
 using namespace sycl::ext::intel::experimental;
 using alloc = sycl::usm::alloc;

sycl/test-e2e/Annotated_usm/annotated_usm_negative.cpp

@@ -9,13 +9,13 @@
 // not have the corresponding aspect, while the gpu runtime has different
 // behavior
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_shared.hpp>
 
 #include <complex>
 #include <iostream>
 
-// clang-format on
-
 using namespace sycl::ext::oneapi::experimental;
 using namespace sycl::ext::intel::experimental;
 

sycl/test-e2e/Annotated_usm/annotated_usm_shared_align.cpp

@@ -7,7 +7,9 @@
 // This e2e test checks the alignment of the annotated shared USM allocation in
 // various cases
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/annotated_usm/alloc_shared.hpp>
+#include <sycl/usm.hpp>
 
 #include <complex>
 #include <numeric>
@@ -251,4 +253,4 @@ int main() {
   testAlign<int>(q, 128);
   testAlign<std::complex<double>>(q, 4);
   return 0;
-}
+}

sycl/test-e2e/AtomicRef/device_has_aspect_atomic64_cuda_and_hip.cpp

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

sycl/test-e2e/AtomicRef/device_has_aspect_atomic64_level_zero.cpp

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

sycl/test-e2e/AtomicRef/device_has_aspect_atomic64_opencl.cpp

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

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

@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 
 #include <iostream>

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

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

sycl/test-e2e/Complex/sycl_complex_helper.hpp

@@ -2,8 +2,8 @@
 #include <iomanip>
 
 #define SYCL_EXT_ONEAPI_COMPLEX
+#include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/complex/complex.hpp>
-#include <sycl/sycl.hpp>
 
 using namespace sycl::ext::oneapi;
 

sycl/test-e2e/CompositeDevice/composite_device.cpp

@@ -4,7 +4,8 @@
 // RUN: env ZE_FLAT_DEVICE_HIERARCHY=FLAT %{run} %t.out
 // UNSUPPORTED: (windows && level_zero)
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/composite_device.hpp>
 
 #ifdef SYCL_EXT_ONEAPI_COMPOSITE_DEVICE
 

sycl/test-e2e/CompositeDevice/device_selector_test.cpp

@@ -2,7 +2,8 @@
 // RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:0 ZE_FLAT_DEVICE_HIERARCHY=COMBINED %t.out
 // REQUIRES: level_zero
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/composite_device.hpp>
 
 #ifdef SYCL_EXT_ONEAPI_COMPOSITE_DEVICE
 

sycl/test-e2e/CompositeDevice/run_on_composite_device.cpp

@@ -1,7 +1,8 @@
 // RUN: %{build} -o %t.out
 // RUN: env ZE_FLAT_DEVICE_HIERARCHY=COMBINED %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/composite_device.hpp>
 
 #ifdef SYCL_EXT_ONEAPI_COMPOSITE_DEVICE
 

sycl/test-e2e/Config/allowlist.cpp

@@ -17,7 +17,7 @@
 #include <exception>
 #include <iostream>
 #include <string>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 static void replaceSpecialCharacters(std::string &Str) {
   // Replace common special symbols with '.' which matches to any character

sycl/test-e2e/DeprecatedFeatures/deprecated_intel_ext_device.cpp

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

sycl/test-e2e/DeprecatedFeatures/device_platform_interop.cpp

@@ -11,11 +11,11 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-
 #include <iostream>
 #include <memory>
+#include <sycl/backend.hpp>
 #include <sycl/backend/opencl.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 #include <unordered_map>
 using namespace sycl;
 

sycl/test-e2e/DeprecatedFeatures/kernel_interop.cpp

@@ -10,7 +10,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 #include <cassert>
 

sycl/test-e2e/DeprecatedFeatures/opencl_interop.cpp

@@ -5,7 +5,7 @@
 
 #include <cassert>
 #include <exception>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 #include <vector>
 
 #define CL_CHECK_ERRORS(ERR)                                                   \

sycl/test-e2e/DeprecatedFeatures/sampler_ocl.cpp

@@ -13,7 +13,7 @@
 
 #include <cassert>
 #include <sycl/context.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 namespace sycl {
 using namespace sycl;

sycl/test-e2e/DeprecatedFeatures/set_arg_interop.cpp

@@ -3,7 +3,8 @@
 // RUN: %{build} -D__SYCL_INTERNAL_API -o %t.out %opencl_lib -O3
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/usm.hpp>
 
 #include <cassert>
 

sycl/test-e2e/DeprecatedFeatures/subbuffer_interop.cpp

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

sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_device_aot.cpp

@@ -2,8 +2,9 @@
 // RUN: %clangxx -fsycl -fsycl-targets=intel_gpu_pvc %s -o %t.out
 // RUN: %{run} %t.out
 
+#include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/device_architecture.hpp>
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental;

sycl/test-e2e/DeviceArchitecture/device_architecture_comparison_on_host.cpp

@@ -8,7 +8,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 namespace syclex = sycl::ext::oneapi::experimental;
 

sycl/test-e2e/DeviceArchitecture/device_architecture_on_device_aot.cpp

@@ -2,8 +2,8 @@
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %s -o %t.out
 // RUN: %{run} %t.out
 
+#include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/device_architecture.hpp>
-#include <sycl/sycl.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental;

sycl/test-e2e/DeviceGlobal/common.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 using namespace sycl::ext::oneapi::experimental;

sycl/test-e2e/DeviceGlobal/device_global_arrow.hpp

@@ -2,6 +2,8 @@
 
 #include "common.hpp"
 
+#include <sycl/usm.hpp>
+
 struct StructWithMember {
   int x;
   int getX() { return x; }

sycl/test-e2e/DeviceLib/ITTAnnotations/atomic.cpp

@@ -1,7 +1,8 @@
 // RUN: %{build} -fsycl-instrument-device-code -o %t.out
 // RUN: %{run} %t.out
 
-#include "sycl/sycl.hpp"
+#include "sycl/atomic_ref.hpp"
+#include "sycl/detail/core.hpp"
 
 using namespace sycl;
 

sycl/test-e2e/DeviceLib/ITTAnnotations/barrier.cpp

@@ -1,7 +1,7 @@
 // RUN: %{build} -fsycl-instrument-device-code -o %t.out
 // RUN: %{run} %t.out
 
-#include "sycl/sycl.hpp"
+#include "sycl/detail/core.hpp"
 #include <vector>
 
 using namespace sycl;

sycl/test-e2e/DeviceLib/assert-windows.cpp

@@ -25,7 +25,7 @@
 #include <array>
 #include <assert.h>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 
 using namespace sycl;
 

sycl/test-e2e/DeviceLib/assert.cpp

@@ -95,7 +95,7 @@
 #include <assert.h>
 #include <iostream>
 #include <stdlib.h>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

sycl/test-e2e/DeviceLib/built-ins/ext_native_math_common.hpp

@@ -1,5 +1,6 @@
 #include <cassert>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/builtins.hpp>
 
 template <typename T, size_t N>
 void assert_out_of_bound(sycl::marray<T, N> val, sycl::marray<T, N> lower,

sycl/test-e2e/DeviceLib/built-ins/printf.cpp

@@ -8,7 +8,8 @@
 // RUN: %{build} -fsycl-device-code-split=per_kernel -D__SYCL_USE_VARIADIC_SPIRV_OCL_PRINTF__ -o %t_var.out
 // RUN: %{run} %t_var.out | FileCheck %s
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/experimental/builtins.hpp>
 
 #include <cstdint>
 #include <iostream>