Fix E2E tests

AlexeySachkov · AlexeySachkov · commit 860b2ecc8730 · 2024-11-22T02:45:13.000-08:00
diff --git a/sycl/include/syclcompat/util.hpp b/sycl/include/syclcompat/util.hpp
@@ -36,6 +36,7 @@
 
 #include <sycl/atomic_ref.hpp>
 #include <sycl/group_barrier.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 #include <syclcompat/math.hpp>
 #include <syclcompat/memory.hpp>
diff --git a/sycl/test-e2e/Basic/backend_info.cpp b/sycl/test-e2e/Basic/backend_info.cpp
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/Basic/kernel_info.cpp b/sycl/test-e2e/Basic/kernel_info.cpp
@@ -11,6 +11,8 @@
 
 #include <cassert>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
+
 #include <sycl/ext/oneapi/get_kernel_info.hpp>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/Basic/kernel_max_wg_size.cpp b/sycl/test-e2e/Basic/kernel_max_wg_size.cpp
@@ -9,11 +9,11 @@
 // for Intel GPU devices and only when using the Level Zero backend or OpenCL
 // backend.
 
-// clang-format off
 #include <sycl/detail/core.hpp>
-#include <sycl/usm.hpp>
+
 #include <sycl/ext/intel/experimental/grf_size_properties.hpp>
-// clang-format on
+#include <sycl/kernel_bundle.hpp>
+#include <sycl/usm.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/Basic/large-range.cpp b/sycl/test-e2e/Basic/large-range.cpp
@@ -5,6 +5,7 @@
 #include <numeric>
 #include <sycl/atomic_ref.hpp>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp b/sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp
@@ -2,6 +2,7 @@
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 #include <cassert>
 #include <cstdint>
diff --git a/sycl/test-e2e/DeviceCodeSplit/Inputs/split-per-source.h b/sycl/test-e2e/DeviceCodeSplit/Inputs/split-per-source.h
@@ -1,4 +1,5 @@
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class File1Kern1;
 class File1Kern2;
diff --git a/sycl/test-e2e/DeviceCodeSplit/split-per-kernel.cpp b/sycl/test-e2e/DeviceCodeSplit/split-per-kernel.cpp
@@ -5,6 +5,7 @@
 // XFAIL: hip_nvidia
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class Kern1;
 class Kern2;
diff --git a/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp b/sycl/test-e2e/ESIMD/histogram_256_slm_spec_2020.cpp
@@ -5,6 +5,7 @@
 
 #include "esimd_test_utils.hpp"
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 static constexpr int NUM_BINS = 256;
diff --git a/sycl/test-e2e/ESIMD/mandelbrot/mandelbrot_spec.cpp b/sycl/test-e2e/ESIMD/mandelbrot/mandelbrot_spec.cpp
@@ -15,6 +15,7 @@
 #include "../esimd_test_utils.hpp"
 
 #include <sycl/accessor_image.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 #include <array>
diff --git a/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp b/sycl/test-e2e/ESIMD/private_memory/private_memory.cpp
@@ -15,6 +15,7 @@
 
 #include "../esimd_test_utils.hpp"
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp b/sycl/test-e2e/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp
@@ -4,6 +4,7 @@
 
 #include "esimd_test_utils.hpp"
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp b/sycl/test-e2e/ESIMD/spec_const/spec_const_redefine.cpp
@@ -17,6 +17,7 @@
 
 #include "../esimd_test_utils.hpp"
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 #include <vector>
diff --git a/sycl/test-e2e/ESIMD/spec_const/unused_spec_const.cpp b/sycl/test-e2e/ESIMD/spec_const/unused_spec_const.cpp
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/intel/esimd.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/Graph/graph_common.hpp b/sycl/test-e2e/Graph/graph_common.hpp
@@ -1,4 +1,5 @@
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 #include <sycl/ext/oneapi/experimental/graph.hpp>
diff --git a/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp b/sycl/test-e2e/GroupAlgorithm/back_to_back_collectives.cpp
@@ -5,6 +5,7 @@
 #include <numeric>
 #include <sycl/detail/core.hpp>
 #include <sycl/group_algorithm.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <vector>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/GroupAlgorithm/root_group.cpp b/sycl/test-e2e/GroupAlgorithm/root_group.cpp
@@ -14,6 +14,7 @@
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/oneapi/experimental/root_group.hpp>
 #include <sycl/group_barrier.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 static constexpr int WorkGroupSize = 32;
 
diff --git a/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp b/sycl/test-e2e/KernelAndProgram/cache_env_vars.hpp
@@ -65,6 +65,7 @@
 #include <chrono>
 #include <iostream>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class Inc;
 template <class Kernel> void check_build_time(sycl::queue &q) {
diff --git a/sycl/test-e2e/KernelAndProgram/disable-caching.cpp b/sycl/test-e2e/KernelAndProgram/disable-caching.cpp
@@ -9,6 +9,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-find-run.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-find-run.cpp
@@ -4,6 +4,7 @@
 // This test finds a known kernel and runs it.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-get-kernel.cpp
@@ -6,6 +6,7 @@
 // object retrieved via other methods.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class KernelA;
 
diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.hpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options.hpp
@@ -1,6 +1,7 @@
 #define SYCL2020_DISABLE_DEPRECATION_WARNINGS
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class KernelName;
 
diff --git a/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp b/sycl/test-e2e/KernelAndProgram/level-zero-link-flags.cpp
@@ -13,6 +13,7 @@
 //===--------------------------------------------------------------===//
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class MyKernel;
 
diff --git a/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp b/sycl/test-e2e/KernelAndProgram/level-zero-static-link-flow.cpp
@@ -26,6 +26,7 @@
 // CHECK: ZE ---> zeModuleCreate
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class MyKernel;
 
diff --git a/sycl/test-e2e/KernelAndProgram/multiple-kernel-linking.cpp b/sycl/test-e2e/KernelAndProgram/multiple-kernel-linking.cpp
@@ -14,6 +14,7 @@
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp b/sycl/test-e2e/KernelAndProgram/persistent-cache-multi-device.cpp
@@ -8,6 +8,7 @@
 // Test checks that persistent cache works correctly with multiple devices.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/KernelAndProgram/spec_constants_after_link.cpp b/sycl/test-e2e/KernelAndProgram/spec_constants_after_link.cpp
@@ -12,6 +12,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 #include <optional>
diff --git a/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp b/sycl/test-e2e/KernelAndProgram/trace_kernel_program_cache.cpp
@@ -15,6 +15,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 #include <sycl/usm.hpp>
 
diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_opencl.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_opencl.cpp
@@ -34,6 +34,7 @@
 // CHECK-READ-FROM-CACHE: [kernel_compiler Persistent Cache]: using cached binary
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 auto constexpr CLSource = R"===(
 __kernel void my_kernel(__global int *in, __global int *out) {
diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_spirv.cpp
@@ -19,6 +19,7 @@
 #include <fstream>
 #include <string>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 sycl::kernel_bundle<sycl::bundle_state::executable>
diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl.cpp
@@ -44,6 +44,7 @@
 // CHECK-READ-FROM-CACHE: [kernel_compiler Persistent Cache]: using cached binary
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 auto constexpr AddEmH = R"===(
diff --git a/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp b/sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp
@@ -34,6 +34,7 @@
 // CHECK-READ-FROM-CACHE: [kernel_compiler Persistent Cache]: using cached binary
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 auto constexpr AddEmH = R"===(
diff --git a/sycl/test-e2e/KernelCompiler/multi_device.cpp b/sycl/test-e2e/KernelCompiler/multi_device.cpp
@@ -5,6 +5,7 @@
 // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 %{run} %t.out
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 // Test to check that bundle is buildable from OpenCL source if there are
 // multiple devices in the context.
diff --git a/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp b/sycl/test-e2e/KernelCompiler/opencl_capabilities.cpp
@@ -25,6 +25,7 @@
 // successfully run and pass these tests.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 using namespace sycl;
 namespace syclex = sycl::ext::oneapi::experimental;
diff --git a/sycl/test-e2e/KernelCompiler/sycl_device_flags.cpp b/sycl/test-e2e/KernelCompiler/sycl_device_flags.cpp
@@ -29,6 +29,7 @@
 // clang-format on
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 // TODO: remove SYCL_EXTERNAL once it is no longer needed.
diff --git a/sycl/test-e2e/Matrix/common.hpp b/sycl/test-e2e/Matrix/common.hpp
@@ -9,6 +9,7 @@
 #include <iostream>
 #include <random>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/ext/oneapi/matrix/matrix.hpp>
 
 using namespace sycl;
diff --git a/sycl/test-e2e/NewOffloadDriver/Inputs/split-per-source.h b/sycl/test-e2e/NewOffloadDriver/Inputs/split-per-source.h
@@ -1,4 +1,5 @@
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class File1Kern1;
 class File1Kern2;
diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_with_aspects.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_with_aspects.cpp
@@ -5,6 +5,7 @@
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 [[sycl::device_has(sycl::aspect::cpu)]] void foo(){};
 [[sycl::device_has(sycl::aspect::gpu)]] void bar(){};
diff --git a/sycl/test-e2e/PrivateAlloca/ValidUsage/Inputs/private_alloca_test.hpp b/sycl/test-e2e/PrivateAlloca/ValidUsage/Inputs/private_alloca_test.hpp
@@ -5,6 +5,7 @@
 #include <sycl/detail/core.hpp>
 
 #include <sycl/ext/oneapi/experimental/alloca.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 template <typename ElementType, typename SizeType,
diff --git a/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp b/sycl/test-e2e/ProgramManager/multi_device_bundle/build_twice.cpp
@@ -7,6 +7,7 @@
 // RUN: env NEOReadDebugKeys=1 CreateMultipleRootDevices=3 SYCL_UR_TRACE=2 %{run} %t.out | FileCheck %s
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class Kernel;
 
diff --git a/sycl/test-e2e/ProgramManager/multi_device_bundle/compile_link.cpp b/sycl/test-e2e/ProgramManager/multi_device_bundle/compile_link.cpp
@@ -6,6 +6,7 @@
 // Test to check that we can compile and link a kernel bundle for multiple
 // devices and run the kernel on each device.
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 
 class Kernel;
 
diff --git a/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp b/sycl/test-e2e/ProgramManager/multi_device_bundle/device_libs_and_caching.cpp
@@ -32,6 +32,7 @@
 #include <complex>
 #include <sycl/detail/core.hpp>
 #include <sycl/ext/intel/math.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 class Kernel;
diff --git a/sycl/test-e2e/RawKernelArg/arg_combinations.cpp b/sycl/test-e2e/RawKernelArg/arg_combinations.cpp
@@ -7,6 +7,7 @@
 // Tests raw_kernel_arg in different combinations.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 constexpr size_t NumArgs = 4;
diff --git a/sycl/test-e2e/RawKernelArg/arg_struct.cpp b/sycl/test-e2e/RawKernelArg/arg_struct.cpp
@@ -7,6 +7,7 @@
 // Tests raw_kernel_arg which is used to pass user-defined data types
 // (structures) as kernel arguments.
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 constexpr size_t NumArgs = 2;
diff --git a/sycl/test-e2e/RawKernelArg/arg_vector.cpp b/sycl/test-e2e/RawKernelArg/arg_vector.cpp
@@ -7,9 +7,10 @@
 // Tests raw_kernel_arg which is used to pass OpenCL vector types as a special
 // case of struct data types.
 
+#include <CL/cl.h>
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
-#include <CL/cl.h>
 
 constexpr size_t NumArgs = 4;
 
diff --git a/sycl/test-e2e/RawKernelArg/diff_size.cpp b/sycl/test-e2e/RawKernelArg/diff_size.cpp
@@ -8,6 +8,7 @@
 // different sizes.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 auto constexpr CLSource = R"===(
diff --git a/sycl/test-e2e/RawKernelArg/same_size_pointer.cpp b/sycl/test-e2e/RawKernelArg/same_size_pointer.cpp
@@ -7,6 +7,7 @@
 // Tests raw_kernel_arg with pointers and scalars to different 32-bit types.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 auto constexpr CLSource = R"===(
diff --git a/sycl/test-e2e/RawKernelArg/same_size_scalar_arg_only.cpp b/sycl/test-e2e/RawKernelArg/same_size_scalar_arg_only.cpp
@@ -7,6 +7,7 @@
 // Tests raw_kernel_arg with 32-bit sized scalars.
 
 #include <sycl/detail/core.hpp>
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/usm.hpp>
 
 auto constexpr CLSource = R"===(
diff --git a/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp b/sycl/test-e2e/Regression/2020-spec-constants-debug-info.cpp
@@ -8,6 +8,7 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
 constexpr sycl::specialization_id<int> test_id_1{42};
diff --git a/sycl/test-e2e/Regression/get_spec_const_vec16.cpp b/sycl/test-e2e/Regression/get_spec_const_vec16.cpp
diff --git a/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp b/sycl/test-e2e/Regression/implicit_kernel_bundle_image_filtering.cpp
diff --git a/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp b/sycl/test-e2e/Regression/kernel_bundle_ignore_sycl_external.cpp
diff --git a/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp b/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/handler-api.cpp b/sycl/test-e2e/SpecConstants/2020/handler-api.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/host_apis.cpp b/sycl/test-e2e/SpecConstants/2020/host_apis.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/image_selection.cpp b/sycl/test-e2e/SpecConstants/2020/image_selection.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp b/sycl/test-e2e/SpecConstants/2020/kernel-bundle-api.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/nested-non-packed-struct.cpp b/sycl/test-e2e/SpecConstants/2020/nested-non-packed-struct.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/non-packed-struct-2.cpp b/sycl/test-e2e/SpecConstants/2020/non-packed-struct-2.cpp
diff --git a/sycl/test-e2e/SpecConstants/2020/vector-convolution-demo.cpp b/sycl/test-e2e/SpecConstants/2020/vector-convolution-demo.cpp
diff --git a/sycl/test-e2e/SubGroup/helper.hpp b/sycl/test-e2e/SubGroup/helper.hpp
diff --git a/sycl/test-e2e/WeakObject/weak_object_owner_less.cpp b/sycl/test-e2e/WeakObject/weak_object_owner_less.cpp
diff --git a/sycl/test-e2e/WeakObject/weak_object_utils.hpp b/sycl/test-e2e/WeakObject/weak_object_utils.hpp
diff --git a/sycl/test-e2e/syclcompat/math/math_compare.cpp b/sycl/test-e2e/syclcompat/math/math_compare.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <sycl/detail/core.hpp>`
	`2`	`+#include <sycl/kernel_bundle.hpp>`
`2`	`3`
`3`	`4`	`class File1Kern1;`
`4`	`5`	`class File1Kern2;`