From 4289c946addbc27cd0365389c309e0f1c469b337 Mon Sep 17 00:00:00 2001 From: Alexey Sachkov Date: Mon, 27 Oct 2025 15:46:52 +0100 Subject: [PATCH] [SYCL] Make include_deps tests more robust Dropped checking for includes under `stl_wrappers`. Standard C++ headers may include other standard headers. Whether or not they do that, what headers are included and in which order is unspecified, making tests depend on specific standard C++ headers available on a machine and thus non-portable. --- sycl/test/include_deps/deps_known.sh | 1 + sycl/test/include_deps/sycl_accessor.hpp.cpp | 3 --- sycl/test/include_deps/sycl_buffer.hpp.cpp | 3 --- sycl/test/include_deps/sycl_detail_core.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp | 1 - sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp | 1 - sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp | 1 - .../include_deps/sycl_khr_includes_group_algorithms.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp | 3 --- .../sycl_khr_includes_hierarchical_parallelism.hpp.cpp | 2 -- sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp | 2 -- .../test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp | 3 --- .../test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp | 1 - sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp | 2 -- sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp | 1 - sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp | 1 - sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp | 3 --- sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp | 3 --- 32 files changed, 1 insertion(+), 78 deletions(-) diff --git a/sycl/test/include_deps/deps_known.sh b/sycl/test/include_deps/deps_known.sh index d4b33541b0205..e01b8f381ee37 100644 --- a/sycl/test/include_deps/deps_known.sh +++ b/sycl/test/include_deps/deps_known.sh @@ -14,6 +14,7 @@ function deps() { clang++ -fsycl -fsycl-device-only -include "$HEADER" -c -x c++ /dev/null -o /dev/null -MD -MF - \ | sed 's@: /dev/null@: /dev/null\n@' \ | grep 'include/sycl\|/dev/null\|CL/\|ur_\|:' \ + | grep -v 'stl_wrappers' \ | sed 's@.*/include/sycl/@@' \ | sed 's@.*/include/CL/@CL/@' \ | sed 's@.*/include/ur_@ur_@' \ diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp index ac2e85ac20cd5..37e3edd2fe52d 100644 --- a/sycl/test/include_deps/sycl_accessor.hpp.cpp +++ b/sycl/test/include_deps/sycl_accessor.hpp.cpp @@ -9,12 +9,9 @@ // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_buffer.hpp.cpp b/sycl/test/include_deps/sycl_buffer.hpp.cpp index 4b0d735321b6b..12d211f8d4c78 100644 --- a/sycl/test/include_deps/sycl_buffer.hpp.cpp +++ b/sycl/test/include_deps/sycl_buffer.hpp.cpp @@ -8,12 +8,9 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_detail_core.hpp.cpp b/sycl/test/include_deps/sycl_detail_core.hpp.cpp index cf98e8708254a..2e04faa3febac 100644 --- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp +++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp @@ -10,12 +10,9 @@ // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp index 80e875ea10bed..89e2f957017b3 100644 --- a/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp @@ -12,12 +12,9 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp index 834f5ab3cd479..3b79a3a80a093 100644 --- a/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp @@ -29,7 +29,6 @@ // CHECK-NEXT: multi_ptr.hpp // CHECK-NEXT: detail/address_space_cast.hpp // CHECK-NEXT: detail/fwd/accessor.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/memcpy.hpp // CHECK-NEXT: atomic_ref.hpp // CHECK-NEXT: aspects.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp index 75940ddcfd5aa..dfc7660cef8a6 100644 --- a/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp @@ -11,12 +11,9 @@ // CHECK-NEXT: buffer.hpp // CHECK-NEXT: access/access.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp index ddaf62e33ae82..8ae714d144574 100644 --- a/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp @@ -10,7 +10,6 @@ // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: context.hpp // CHECK-NEXT: async_handler.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: backend_types.hpp // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp @@ -56,8 +55,6 @@ // CHECK-NEXT: info/sycl_backend_traits.def // CHECK-NEXT: detail/owner_less_base.hpp // CHECK-NEXT: detail/impl_utils.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: ext/oneapi/weak_object_base.hpp // CHECK-NEXT: property_list.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp index 50af4752c8837..bc4788036c650 100644 --- a/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp @@ -14,7 +14,6 @@ // CHECK-NEXT: info/aspects_deprecated.def // CHECK-NEXT: device.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp // CHECK-NEXT: id.hpp @@ -55,8 +54,6 @@ // CHECK-NEXT: info/sycl_backend_traits.def // CHECK-NEXT: detail/owner_less_base.hpp // CHECK-NEXT: detail/impl_utils.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: ext/oneapi/weak_object_base.hpp // CHECK-NEXT: detail/string.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp index 2e2db9ccc221a..e26d3c6d844f2 100644 --- a/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp @@ -10,7 +10,6 @@ // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: event.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp // CHECK-NEXT: aspects.hpp @@ -55,8 +54,6 @@ // CHECK-NEXT: info/sycl_backend_traits.def // CHECK-NEXT: detail/owner_less_base.hpp // CHECK-NEXT: detail/impl_utils.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: ext/oneapi/weak_object_base.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp index cffad7c652484..50a068d4ce790 100644 --- a/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp @@ -11,7 +11,6 @@ // CHECK-NEXT: exception.hpp // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/string.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: exception_list.hpp // CHECK-NEXT: detail/iostream_proxy.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp index 692e49c927e57..8b19443974f66 100644 --- a/sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp @@ -9,5 +9,4 @@ // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: functional.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp index e1a20d28f6246..a327578d847c2 100644 --- a/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp @@ -25,12 +25,9 @@ // CHECK-NEXT: detail/fwd/multi_ptr.hpp // CHECK-NEXT: exception.hpp // CHECK-NEXT: detail/string.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: functional.hpp // CHECK-NEXT: group.hpp // CHECK-NEXT: detail/common.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: detail/generic_type_traits.hpp // CHECK-NEXT: aliases.hpp // CHECK-NEXT: bit_cast.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp index bef233a3cca27..f336c2acf15ac 100644 --- a/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp @@ -14,8 +14,6 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/multi_ptr.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -36,7 +34,6 @@ // CHECK-NEXT: group_algorithm.hpp // CHECK-NEXT: exception.hpp // CHECK-NEXT: detail/string.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: functional.hpp // CHECK-NEXT: half_type.hpp // CHECK-NEXT: aspects.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp index 9d5f05f24d95d..2386618065e52 100644 --- a/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp @@ -13,12 +13,9 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp index 57ec281201378..847cb50eb59aa 100644 --- a/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp @@ -14,8 +14,6 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/multi_ptr.hpp // CHECK-NEXT: detail/generic_type_traits.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp index f55af841a1749..8c84070f0dd68 100644 --- a/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp @@ -13,12 +13,9 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp index 64e674f6161ea..bf385c372b3bd 100644 --- a/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp @@ -31,8 +31,6 @@ // CHECK-NEXT: device_event.hpp // CHECK-NEXT: group.hpp // CHECK-NEXT: detail/common.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: pointers.hpp // CHECK-NEXT: nd_range.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp index c052e141e9b7b..a0cf91ea47638 100644 --- a/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp @@ -13,12 +13,9 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp index 3c05eb6715259..5e81364e594d3 100644 --- a/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp @@ -10,7 +10,6 @@ // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: kernel.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp // CHECK-NEXT: aspects.hpp @@ -55,8 +54,6 @@ // CHECK-NEXT: info/sycl_backend_traits.def // CHECK-NEXT: detail/owner_less_base.hpp // CHECK-NEXT: detail/impl_utils.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: ext/oneapi/weak_object_base.hpp // CHECK-NEXT: detail/util.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp index 6eeb1d2371270..c244673d9c90a 100644 --- a/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp @@ -13,5 +13,4 @@ // CHECK-NEXT: exception.hpp // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/string.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp index 560470e683294..25d627fc86f2d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp @@ -12,8 +12,6 @@ // CHECK-NEXT: aliases.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/half.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp index ea5a9c8b7f049..6b0b4af4e44f1 100644 --- a/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp @@ -34,10 +34,7 @@ // CHECK-NEXT: vector.hpp // CHECK-NEXT: detail/named_swizzles_mixin.hpp // CHECK-NEXT: detail/vector_arith.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/common.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: marray.hpp // CHECK-NEXT: multi_ptr.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp index b7dd0b52aa569..6810734f941ca 100644 --- a/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp @@ -18,5 +18,4 @@ // CHECK-NEXT: detail/fwd/multi_ptr.hpp // CHECK-NEXT: detail/type_traits.hpp // CHECK-NEXT: detail/type_traits/vec_marray_traits.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp index 9184350e25d8a..73e641b6f2c3d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp @@ -10,7 +10,6 @@ // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: platform.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp // CHECK-NEXT: aspects.hpp @@ -55,8 +54,6 @@ // CHECK-NEXT: info/sycl_backend_traits.def // CHECK-NEXT: detail/owner_less_base.hpp // CHECK-NEXT: detail/impl_utils.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: ext/oneapi/weak_object_base.hpp // CHECK-NEXT: detail/string.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp index e87666fbcfcf6..27bb46ce8dd22 100644 --- a/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp @@ -14,6 +14,5 @@ // CHECK-NEXT: exception.hpp // CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/string.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: properties/property_traits.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp index a37e63c0cc7de..f943b9c634120 100644 --- a/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp @@ -17,12 +17,9 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp index d233d264267ac..a755bb1c9b923 100644 --- a/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp @@ -16,12 +16,9 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp index a8942ff7f3f99..a967332f8da1e 100644 --- a/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp @@ -9,8 +9,5 @@ // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: sycl_span.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp index 0be5245e52157..705347fb64104 100644 --- a/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp @@ -13,12 +13,9 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: buffer.hpp // CHECK-NEXT: backend_types.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp index 87de587378f40..ae058ca697c17 100644 --- a/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp @@ -35,10 +35,7 @@ // CHECK-NEXT: vector.hpp // CHECK-NEXT: detail/named_swizzles_mixin.hpp // CHECK-NEXT: detail/vector_arith.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/common.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: marray.hpp // CHECK-NEXT: multi_ptr.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp index 6de63c741a4c3..3504007d0f2f7 100644 --- a/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp @@ -19,11 +19,8 @@ // CHECK-NEXT: detail/type_traits.hpp // CHECK-NEXT: detail/type_traits/vec_marray_traits.hpp // CHECK-NEXT: detail/fwd/multi_ptr.hpp -// CHECK-NEXT: stl_wrappers/cstdlib // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/export.hpp -// CHECK-NEXT: stl_wrappers/cassert -// CHECK-NEXT: stl_wrappers/assert.h // CHECK-NEXT: __spirv/spirv_vars.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp