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

Author: aelovikov-intel

sycl/test-e2e/SpecConstants/2020/handler-api.cpp

@@ -15,7 +15,9 @@
 
 #include <cstdlib>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include "common.hpp"
 

sycl/test-e2e/SpecConstants/2020/host_apis.cpp

@@ -1,7 +1,9 @@
 // RUN: %{build} -o %t.out -fsycl-dead-args-optimization
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <cmath>
 

sycl/test-e2e/SpecConstants/2020/image_selection.cpp

@@ -42,7 +42,10 @@
 // RUN: env SYCL_PI_TRACE=-1 %{run} %t3.out | FileCheck --match-full-lines --check-prefix=CHECK-DEFAULT-BACK-TO-DEFAULT %s
 // clang-format on
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
+#include <sycl/usm.hpp>
 
 constexpr sycl::specialization_id<int> int_id(3);
 

sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp

@@ -15,7 +15,9 @@
 
 #include <cstdlib>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include "common.hpp"
 

sycl/test-e2e/SpecConstants/2020/kernel_lambda_with_kernel_handler_arg.cpp

@@ -6,7 +6,9 @@
 // and parallel_for_work_group to verify that this code compiles and runs
 // correctly with user's lambda with and without sycl::kernel_handler argument
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 int main() {
   sycl::queue q;

sycl/test-e2e/SpecConstants/2020/native_specialization_constant.cpp

@@ -11,7 +11,9 @@
 // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen %gpu_aot_target_opts %s -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 constexpr sycl::specialization_id<float> float_id(3.14f);
 

sycl/test-e2e/SpecConstants/2020/nested-non-packed-struct.cpp

@@ -1,7 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <iostream>
 

sycl/test-e2e/SpecConstants/2020/non-packed-struct-2.cpp

@@ -1,7 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <iostream>
 

sycl/test-e2e/SpecConstants/2020/non-packed-struct.cpp

@@ -1,7 +1,9 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 //
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 struct user_defined_type {
   float a;

sycl/test-e2e/SpecConstants/2020/non_native/Inputs/common.cpp

@@ -1,4 +1,6 @@
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <cmath>
 

sycl/test-e2e/SpecConstants/2020/non_native/SpecConstBuffer.cpp

@@ -4,7 +4,9 @@
 // RUN:          -fsycl-dead-args-optimization
 // RUN: env SYCL_PI_TRACE=-1 %{run} %t.out | FileCheck %s
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 const static sycl::specialization_id<int> SpecConst{42};
 

sycl/test-e2e/SpecConstants/2020/non_native/aot_w_kernel_handler_wo_spec_consts.cpp

@@ -6,7 +6,9 @@
 // kernel lambdas containing kernel_handler arguments and w/o usage of
 // specialization constants in AOT mode
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 int main() {
   sycl::queue q;

sycl/test-e2e/SpecConstants/2020/vector-convolution-demo.cpp

@@ -9,7 +9,9 @@
 // constants of the SYCL 2020 specification:
 // https://www.khronos.org/registry/SYCL/specs/sycl-2020/html/sycl-2020.html#_example_usage
 
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+
+#include <sycl/specialization_id.hpp>
 
 #include <array>
 #include <cmath>