From 6ba54e70c62d9bc95bfca305ce55190d8cd85e1c Mon Sep 17 00:00:00 2001 From: y Date: Wed, 27 May 2026 18:30:23 -0700 Subject: [PATCH 1/2] [SYCL] Clean up handler.hpp transitive include chain Drop dead/unnecessary includes from handler.hpp and its dependency chain to reduce compile-time overhead and improve header hygiene. No ABI or API changes. Changes: * Split tls_code_loc_t and code_location into a new sycl/detail/code_location.hpp; common.hpp no longer carries them. Files that relied on the transitive pull now include code_location.hpp directly (accessor.hpp, buffer.hpp, buffer_impl.{hpp,cpp}, common.cpp, usm_impl.hpp, layout_tls_code_loc_t.cpp). * Drop 14 unused includes from cg_types.hpp; kept only kernel_handler.hpp plus required std headers. * Drop unused graph.hpp and compile_time_kernel_info.hpp from kernel_launch_helper.hpp. * Replace device.hpp with class fwd-decl in range_rounding.hpp; only const device& is used. * Drop unused includes from handler.hpp: cluster_group_prop.hpp, use_root_sync_prop.hpp, detail/ur.hpp, detail/string.hpp, . * Replace common.hpp with code_location.hpp in handler.hpp. * Add explicit host_profiling_info.hpp to host_task.hpp (was transitive). E2E test fixes: * Tests using parallel_for_work_item relied on cg_types.hpp transitively pulling h_item.hpp. Add explicit to: HierPar/hier_par_basic.cpp, HierPar/hier_par_indirect.cpp, HierPar/Inputs/hier_par_wgscope_impl.hpp, InorderQueue/in_order_kernels.cpp, Properties/cache_config.cpp, MemorySanitizer/local/parallel_for_work_group.cpp. --- sycl/include/sycl/accessor.hpp | 3 +- sycl/include/sycl/buffer.hpp | 1 + sycl/include/sycl/detail/cg_types.hpp | 19 +-- sycl/include/sycl/detail/code_location.hpp | 147 ++++++++++++++++++ sycl/include/sycl/detail/common.hpp | 139 +---------------- .../sycl/detail/kernel_launch_helper.hpp | 2 - sycl/include/sycl/detail/range_rounding.hpp | 3 +- sycl/include/sycl/detail/usm_impl.hpp | 4 +- sycl/include/sycl/handler.hpp | 7 +- sycl/source/detail/buffer_impl.cpp | 1 + sycl/source/detail/buffer_impl.hpp | 1 + sycl/source/detail/common.cpp | 1 + sycl/source/detail/host_task.hpp | 1 + .../HierPar/Inputs/hier_par_wgscope_impl.hpp | 1 + sycl/test-e2e/HierPar/hier_par_basic.cpp | 1 + sycl/test-e2e/HierPar/hier_par_indirect.cpp | 1 + .../InorderQueue/in_order_kernels.cpp | 1 + .../local/parallel_for_work_group.cpp | 1 + sycl/test-e2e/Properties/cache_config.cpp | 1 + sycl/test/abi/layout_tls_code_loc_t.cpp | 2 +- sycl/test/include_deps/sycl_accessor.hpp.cpp | 3 +- sycl/test/include_deps/sycl_buffer.hpp.cpp | 3 +- .../include_deps/sycl_detail_core.hpp.cpp | 33 ++-- .../sycl_khr_split_headers_accessor.hpp.cpp | 3 +- .../sycl_khr_split_headers_buffer.hpp.cpp | 3 +- .../sycl_khr_split_headers_handler.hpp.cpp | 48 +++--- .../sycl_khr_split_headers_images.hpp.cpp | 3 +- ...l_khr_split_headers_interop_handle.hpp.cpp | 3 +- ...cl_khr_split_headers_kernel_bundle.hpp.cpp | 41 +++-- .../sycl_khr_split_headers_queue.hpp.cpp | 33 ++-- .../sycl_khr_split_headers_reduction.hpp.cpp | 29 ++-- .../sycl_khr_split_headers_stream.hpp.cpp | 35 ++--- .../sycl_khr_split_headers_usm.hpp.cpp | 21 ++- 33 files changed, 292 insertions(+), 303 deletions(-) create mode 100644 sycl/include/sycl/detail/code_location.hpp diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp index 92a7cce39d647..0d8ea29488948 100644 --- a/sycl/include/sycl/accessor.hpp +++ b/sycl/include/sycl/accessor.hpp @@ -10,7 +10,8 @@ #include // for target, mode #include // for accessor_iterator -#include // for code_location +#include // for code_location +#include #include // for __SYCL_SPECIAL... #include // for __SYCL2020_DEP... #include // for __SYCL_EXPORT diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp index 907b6ab256bdf..fb1c0166d3fb5 100644 --- a/sycl/include/sycl/buffer.hpp +++ b/sycl/include/sycl/buffer.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/sycl/include/sycl/detail/cg_types.hpp b/sycl/include/sycl/detail/cg_types.hpp index 3cb3d81ca166e..cf317fb895ba4 100644 --- a/sycl/include/sycl/detail/cg_types.hpp +++ b/sycl/include/sycl/detail/cg_types.hpp @@ -8,26 +8,11 @@ #pragma once -#include // for array -#include // for Builder -#include // for HostProfilingInfo -#include // for id -#include // for kernel_param_kind_t -#include // for InitializedVal, NDLoop -#include -#include // for group -#include // for h_item -#include // for id -#include // for item #include // for kernel_handler -#include // for nd_item -#include // for nd_range -#include // for range, operator* -#include // for function -#include // for size_t +#include // for unique_ptr #include // for enable_if_t, false_type -#include // for declval +#include // for declval, move namespace sycl { inline namespace _V1 { diff --git a/sycl/include/sycl/detail/code_location.hpp b/sycl/include/sycl/detail/code_location.hpp new file mode 100644 index 0000000000000..9e27225e1a4a6 --- /dev/null +++ b/sycl/include/sycl/detail/code_location.hpp @@ -0,0 +1,147 @@ +//==---------- code_location.hpp ----- code_location utilities ------------==// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#pragma once + +#include // for __SYCL_EXPORT + +#include + +namespace sycl { +inline namespace _V1 { +namespace detail { + +#if !defined(NDEBUG) && (_MSC_VER > 1929 || __has_builtin(__builtin_FILE)) +#define __CODELOC_FILE_NAME __builtin_FILE() +#else +#define __CODELOC_FILE_NAME nullptr +#endif + +#if _MSC_VER > 1929 || __has_builtin(__builtin_FUNCTION) +#define __CODELOC_FUNCTION __builtin_FUNCTION() +#else +#define __CODELOC_FUNCTION nullptr +#endif + +#if _MSC_VER > 1929 || __has_builtin(__builtin_LINE) +#define __CODELOC_LINE __builtin_LINE() +#else +#define __CODELOC_LINE 0 +#endif + +#if _MSC_VER > 1929 || __has_builtin(__builtin_COLUMN) +#define __CODELOC_COLUMN __builtin_COLUMN() +#else +#define __CODELOC_COLUMN 0 +#endif + +// Data structure that captures the user code location information using the +// builtin capabilities of the compiler +struct code_location { + static constexpr code_location + current(const char *fileName = __CODELOC_FILE_NAME, + const char *funcName = __CODELOC_FUNCTION, + uint32_t lineNo = __CODELOC_LINE, + uint32_t columnNo = __CODELOC_COLUMN) noexcept { + return code_location(fileName, funcName, lineNo, columnNo); + } + +#undef __CODELOC_FILE_NAME +#undef __CODELOC_FUNCTION +#undef __CODELOC_LINE +#undef __CODELOC_COLUMN + + constexpr code_location(const char *file, const char *func, uint32_t line, + uint32_t col) noexcept + : MFileName(file), MFunctionName(func), MLineNo(line), MColumnNo(col) {} + + constexpr code_location() noexcept + : MFileName(nullptr), MFunctionName(nullptr), MLineNo(0u), MColumnNo(0u) { + } + + constexpr uint32_t lineNumber() const noexcept { + return static_cast(MLineNo); + } + constexpr uint32_t columnNumber() const noexcept { + return static_cast(MColumnNo); + } + constexpr const char *fileName() const noexcept { return MFileName; } + constexpr const char *functionName() const noexcept { return MFunctionName; } + +private: + const char *MFileName; + const char *MFunctionName; + uint32_t MLineNo; + uint32_t MColumnNo; +}; + +/// @brief Data type that manages the code_location information in TLS +/// @details As new SYCL features are added, they all enable the propagation of +/// the code location information where the SYCL API was called by the +/// application layer. In order to facilitate this, the tls_code_loc_t object +/// assists in managing the data in TLS : +/// (1) Populate the information when you at the top level function in the +/// call chain. This is usually the end-user entry point function into SYCL. +/// (2) Remove the information when the object goes out of scope in the top +/// level function. +/// +/// Usage:- +/// void bar() { +/// tls_code_loc_t p; +/// // Print the source information of where foo() was called in main() +/// std::cout << p.query().fileName() << ":" << p.query().lineNumber() << +/// std::endl; +/// } +/// // Will work for arbitrary call chain lengths. +/// void bar1() {bar();} +/// +/// // Foo() is equivalent to a SYCL end user entry point such as +/// // queue.memcpy() or queue.copy() +/// void foo(const code_location &loc) { +/// tls_code_loc_t tp(loc); +/// bar1(); +/// } +/// +/// void main() { +/// foo(const code_location &loc = code_location::current()); +/// } +class __SYCL_EXPORT tls_code_loc_t { +public: + /// @brief Consructor that checks to see if a TLS entry already exists + /// @details If a previous populated TLS entry exists, this constructor will + /// capture the informationa and allow you to query the information later. + tls_code_loc_t(); + /// @brief Iniitializes TLS with CodeLoc if a TLS entry not present + /// @param CodeLoc The code location information to set up the TLS slot with. + tls_code_loc_t(const detail::code_location &CodeLoc); + + // Used to maintain global state (GCodeLocTLS), so we do not want to copy + tls_code_loc_t(const tls_code_loc_t &) = delete; + tls_code_loc_t &operator=(const tls_code_loc_t &) = delete; + + /// If the code location is set up by this instance, reset it. + ~tls_code_loc_t(); + /// @brief Query the information in the TLS slot + /// @return The code location information saved in the TLS slot. If not TLS + /// entry has been set up, a default coe location is returned. + const detail::code_location &query(); + /// @brief Returns true if the TLS slot was cleared when this object was + /// constructed. + bool isToplevel() const { return !MLocalScope; } + +private: + // Cache the TLS location to decrease amount of TLS accesses. + detail::code_location &CodeLocTLSRef; + // The flag that is used to determine if the object is in a local scope or in + // the top level scope. + bool MLocalScope = true; +}; + +} // namespace detail +} // namespace _V1 +} // namespace sycl diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp index 100d64309cc00..41065888e3f46 100644 --- a/sycl/include/sycl/detail/common.hpp +++ b/sycl/include/sycl/detail/common.hpp @@ -9,17 +9,14 @@ #pragma once #include -#include // for __SYCL_EXPORT +#include // for __SYCL_EXPORT #include #include // for array #include // for size_t -#include #include // for enable_if_t #include // for index_sequence, make_i... -// Default signature enables the passing of user code location information to -// public methods as a default argument. namespace sycl { inline namespace _V1 { namespace detail { @@ -36,140 +33,6 @@ template using EnableIfOutputIteratorT = std::enable_if_t< /*is_output_iterator::value &&*/ !std::is_pointer_v>; -#if !defined(NDEBUG) && (_MSC_VER > 1929 || __has_builtin(__builtin_FILE)) -#define __CODELOC_FILE_NAME __builtin_FILE() -#else -#define __CODELOC_FILE_NAME nullptr -#endif - -#if _MSC_VER > 1929 || __has_builtin(__builtin_FUNCTION) -#define __CODELOC_FUNCTION __builtin_FUNCTION() -#else -#define __CODELOC_FUNCTION nullptr -#endif - -#if _MSC_VER > 1929 || __has_builtin(__builtin_LINE) -#define __CODELOC_LINE __builtin_LINE() -#else -#define __CODELOC_LINE 0 -#endif - -#if _MSC_VER > 1929 || __has_builtin(__builtin_COLUMN) -#define __CODELOC_COLUMN __builtin_COLUMN() -#else -#define __CODELOC_COLUMN 0 -#endif - -// Data structure that captures the user code location information using the -// builtin capabilities of the compiler -struct code_location { - static constexpr code_location - current(const char *fileName = __CODELOC_FILE_NAME, - const char *funcName = __CODELOC_FUNCTION, - uint32_t lineNo = __CODELOC_LINE, - uint32_t columnNo = __CODELOC_COLUMN) noexcept { - return code_location(fileName, funcName, lineNo, columnNo); - } - -#undef __CODELOC_FILE_NAME -#undef __CODELOC_FUNCTION -#undef __CODELOC_LINE -#undef __CODELOC_COLUMN - - constexpr code_location(const char *file, const char *func, uint32_t line, - uint32_t col) noexcept - : MFileName(file), MFunctionName(func), MLineNo(line), MColumnNo(col) {} - - constexpr code_location() noexcept - : MFileName(nullptr), MFunctionName(nullptr), MLineNo(0u), MColumnNo(0u) { - } - - constexpr uint32_t lineNumber() const noexcept { - return static_cast(MLineNo); - } - constexpr uint32_t columnNumber() const noexcept { - return static_cast(MColumnNo); - } - constexpr const char *fileName() const noexcept { return MFileName; } - constexpr const char *functionName() const noexcept { return MFunctionName; } - -private: - const char *MFileName; - const char *MFunctionName; - uint32_t MLineNo; - uint32_t MColumnNo; -}; - -/// @brief Data type that manages the code_location information in TLS -/// @details As new SYCL features are added, they all enable the propagation of -/// the code location information where the SYCL API was called by the -/// application layer. In order to facilitate this, the tls_code_loc_t object -/// assists in managing the data in TLS : -/// (1) Populate the information when you at the top level function in the -/// call chain. This is usually the end-user entry point function into SYCL. -/// (2) Remove the information when the object goes out of scope in the top -/// level function. -/// -/// Usage:- -/// void bar() { -/// tls_code_loc_t p; -/// // Print the source information of where foo() was called in main() -/// std::cout << p.query().fileName() << ":" << p.query().lineNumber() << -/// std::endl; -/// } -/// // Will work for arbitrary call chain lengths. -/// void bar1() {bar();} -/// -/// // Foo() is equivalent to a SYCL end user entry point such as -/// // queue.memcpy() or queue.copy() -/// void foo(const code_location &loc) { -/// tls_code_loc_t tp(loc); -/// bar1(); -/// } -/// -/// void main() { -/// foo(const code_location &loc = code_location::current()); -/// } -class __SYCL_EXPORT tls_code_loc_t { -public: - /// @brief Consructor that checks to see if a TLS entry already exists - /// @details If a previous populated TLS entry exists, this constructor will - /// capture the informationa and allow you to query the information later. - tls_code_loc_t(); - /// @brief Iniitializes TLS with CodeLoc if a TLS entry not present - /// @param CodeLoc The code location information to set up the TLS slot with. - tls_code_loc_t(const detail::code_location &CodeLoc); - - // Used to maintain global state (GCodeLocTLS), so we do not want to copy - tls_code_loc_t(const tls_code_loc_t &) = delete; - tls_code_loc_t &operator=(const tls_code_loc_t &) = delete; - - /// If the code location is set up by this instance, reset it. - ~tls_code_loc_t(); - /// @brief Query the information in the TLS slot - /// @return The code location information saved in the TLS slot. If not TLS - /// entry has been set up, a default coe location is returned. - const detail::code_location &query(); - /// @brief Returns true if the TLS slot was cleared when this object was - /// constructed. - bool isToplevel() const { return !MLocalScope; } - -private: - // Cache the TLS location to decrease amount of TLS accesses. - detail::code_location &CodeLocTLSRef; - // The flag that is used to determine if the object is in a local scope or in - // the top level scope. - bool MLocalScope = true; -}; - -} // namespace detail -} // namespace _V1 -} // namespace sycl - -namespace sycl { -inline namespace _V1 { -namespace detail { - constexpr size_t getNextPowerOfTwoHelper(size_t Var, size_t Offset) { return Offset != 64 ? getNextPowerOfTwoHelper(Var | (Var >> Offset), Offset * 2) diff --git a/sycl/include/sycl/detail/kernel_launch_helper.hpp b/sycl/include/sycl/detail/kernel_launch_helper.hpp index f9f1f31462bee..a535b741ff830 100644 --- a/sycl/include/sycl/detail/kernel_launch_helper.hpp +++ b/sycl/include/sycl/detail/kernel_launch_helper.hpp @@ -9,14 +9,12 @@ #pragma once #include -#include #include #include #include #include #include #include -#include #include #include #include diff --git a/sycl/include/sycl/detail/range_rounding.hpp b/sycl/include/sycl/detail/range_rounding.hpp index 7dcc381b75fdb..ffe725c1efd74 100644 --- a/sycl/include/sycl/detail/range_rounding.hpp +++ b/sycl/include/sycl/detail/range_rounding.hpp @@ -12,13 +12,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -26,6 +26,7 @@ namespace sycl { inline namespace _V1 { +class device; namespace detail { diff --git a/sycl/include/sycl/detail/usm_impl.hpp b/sycl/include/sycl/detail/usm_impl.hpp index a37e7b3e19c2a..142e6908152ca 100644 --- a/sycl/include/sycl/detail/usm_impl.hpp +++ b/sycl/include/sycl/detail/usm_impl.hpp @@ -7,10 +7,12 @@ // ===--------------------------------------------------------------------=== // #pragma once -#include +#include #include #include +#include + namespace sycl { inline namespace _V1 { class device; diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp index fc8044c4dc7f5..4df1d03cd71c7 100644 --- a/sycl/include/sycl/handler.hpp +++ b/sycl/include/sycl/handler.hpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,9 +21,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -31,11 +29,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -56,7 +52,6 @@ #include #include #include -#include #include #include #include diff --git a/sycl/source/detail/buffer_impl.cpp b/sycl/source/detail/buffer_impl.cpp index 0db81e3f02129..3012be5dd01b6 100644 --- a/sycl/source/detail/buffer_impl.cpp +++ b/sycl/source/detail/buffer_impl.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/sycl/source/detail/buffer_impl.hpp b/sycl/source/detail/buffer_impl.hpp index 11a8bd26c740b..0a7ec2569a4e4 100644 --- a/sycl/source/detail/buffer_impl.hpp +++ b/sycl/source/detail/buffer_impl.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/sycl/source/detail/common.cpp b/sycl/source/detail/common.cpp index 0cbc56e089806..d2f3dfbece473 100644 --- a/sycl/source/detail/common.cpp +++ b/sycl/source/detail/common.cpp @@ -6,6 +6,7 @@ // //===----------------------------------------------------------------------===// +#include #include #include diff --git a/sycl/source/detail/host_task.hpp b/sycl/source/detail/host_task.hpp index 83c9c503a5d3e..e340606b14d0f 100644 --- a/sycl/source/detail/host_task.hpp +++ b/sycl/source/detail/host_task.hpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp b/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp index 1cd91b1ac5554..987af01a12361 100644 --- a/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp +++ b/sycl/test-e2e/HierPar/Inputs/hier_par_wgscope_impl.hpp @@ -11,6 +11,7 @@ #include #include #include +#include using namespace sycl; diff --git a/sycl/test-e2e/HierPar/hier_par_basic.cpp b/sycl/test-e2e/HierPar/hier_par_basic.cpp index a51a582b2e00f..406ab94121f44 100644 --- a/sycl/test-e2e/HierPar/hier_par_basic.cpp +++ b/sycl/test-e2e/HierPar/hier_par_basic.cpp @@ -15,6 +15,7 @@ #include #include #include +#include using namespace sycl; diff --git a/sycl/test-e2e/HierPar/hier_par_indirect.cpp b/sycl/test-e2e/HierPar/hier_par_indirect.cpp index ae9dee5a25381..9c3ba69eb59b2 100644 --- a/sycl/test-e2e/HierPar/hier_par_indirect.cpp +++ b/sycl/test-e2e/HierPar/hier_par_indirect.cpp @@ -14,6 +14,7 @@ #include #include +#include void __attribute__((noinline)) foo(sycl::group<1> work_group) { work_group.parallel_for_work_item([&](sycl::h_item<1> index) {}); diff --git a/sycl/test-e2e/InorderQueue/in_order_kernels.cpp b/sycl/test-e2e/InorderQueue/in_order_kernels.cpp index b21d22064a558..76de31632cc36 100644 --- a/sycl/test-e2e/InorderQueue/in_order_kernels.cpp +++ b/sycl/test-e2e/InorderQueue/in_order_kernels.cpp @@ -14,6 +14,7 @@ #include #include +#include #include #include diff --git a/sycl/test-e2e/MemorySanitizer/local/parallel_for_work_group.cpp b/sycl/test-e2e/MemorySanitizer/local/parallel_for_work_group.cpp index 7ed5d28b77de4..b6508d8119fc3 100644 --- a/sycl/test-e2e/MemorySanitizer/local/parallel_for_work_group.cpp +++ b/sycl/test-e2e/MemorySanitizer/local/parallel_for_work_group.cpp @@ -10,6 +10,7 @@ // XFAIL-TRACKER: https://github.com/llvm/llvm-project/issues/122075 #include +#include #include using namespace sycl; diff --git a/sycl/test-e2e/Properties/cache_config.cpp b/sycl/test-e2e/Properties/cache_config.cpp index 62745dd26ec01..1f68487e624c7 100644 --- a/sycl/test-e2e/Properties/cache_config.cpp +++ b/sycl/test-e2e/Properties/cache_config.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/sycl/test/abi/layout_tls_code_loc_t.cpp b/sycl/test/abi/layout_tls_code_loc_t.cpp index 0c5dfd8f6ee8e..02e6c71f0faf1 100644 --- a/sycl/test/abi/layout_tls_code_loc_t.cpp +++ b/sycl/test/abi/layout_tls_code_loc_t.cpp @@ -4,7 +4,7 @@ // clang-format off -#include +#include void foo(sycl::detail::tls_code_loc_t) {} diff --git a/sycl/test/include_deps/sycl_accessor.hpp.cpp b/sycl/test/include_deps/sycl_accessor.hpp.cpp index bb827667c2bea..ac222e28a048d 100644 --- a/sycl/test/include_deps/sycl_accessor.hpp.cpp +++ b/sycl/test/include_deps/sycl_accessor.hpp.cpp @@ -13,10 +13,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp diff --git a/sycl/test/include_deps/sycl_buffer.hpp.cpp b/sycl/test/include_deps/sycl_buffer.hpp.cpp index 1d0cd43009dd0..eaf9f46e983ad 100644 --- a/sycl/test/include_deps/sycl_buffer.hpp.cpp +++ b/sycl/test/include_deps/sycl_buffer.hpp.cpp @@ -9,10 +9,11 @@ // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: backend_types.hpp // CHECK-NEXT: detail/array.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.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 0df9e57fdd2a6..0053856ec05e9 100644 --- a/sycl/test/include_deps/sycl_detail_core.hpp.cpp +++ b/sycl/test/include_deps/sycl_detail_core.hpp.cpp @@ -14,10 +14,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -95,31 +96,25 @@ // CHECK-NEXT: detail/backend_types_io.hpp // CHECK-NEXT: queue.hpp // CHECK-NEXT: detail/cg_types.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: detail/item_base.hpp -// CHECK-NEXT: detail/kernel_desc.hpp -// CHECK-NEXT: group.hpp -// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp -// CHECK-NEXT: device_event.hpp -// CHECK-NEXT: h_item.hpp -// CHECK-NEXT: item.hpp // CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp +// CHECK-NEXT: detail/kernel_desc.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/optional.hpp // CHECK-NEXT: detail/range_rounding.hpp -// CHECK-NEXT: device.hpp -// CHECK-NEXT: detail/string_view.hpp -// CHECK-NEXT: detail/util.hpp -// CHECK-NEXT: device_selector.hpp -// CHECK-NEXT: kernel_bundle_enums.hpp // CHECK-NEXT: ext/oneapi/kernel_properties.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_value.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp +// CHECK-NEXT: item.hpp +// CHECK-NEXT: detail/item_base.hpp +// CHECK-NEXT: device.hpp +// CHECK-NEXT: detail/string_view.hpp +// CHECK-NEXT: detail/util.hpp +// CHECK-NEXT: device_selector.hpp +// CHECK-NEXT: kernel_bundle_enums.hpp // CHECK-NEXT: event.hpp // CHECK-NEXT: exception_list.hpp // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp @@ -153,14 +148,16 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/reduction_forward.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp // CHECK-NEXT: ext/oneapi/bindless_images_mem_handle.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp +// CHECK-NEXT: group.hpp +// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp +// CHECK-NEXT: device_event.hpp // CHECK-NEXT: kernel.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: sycl_span.hpp // CHECK-NEXT: feature_test.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp index 88ff0837181b6..267c56c1eec4a 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp @@ -16,10 +16,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp index 8f6cc6117a10d..49c957eb71386 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp @@ -12,10 +12,11 @@ // CHECK-NEXT: access/access.hpp // CHECK-NEXT: backend_types.hpp // CHECK-NEXT: detail/array.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/accessor.hpp // CHECK-NEXT: detail/defines.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp index a2a2e6dee77af..74eb12a2d7ba8 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp @@ -17,10 +17,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -61,18 +62,9 @@ // CHECK-NEXT: detail/string_view.hpp // CHECK-NEXT: detail/kernel_launch_helper.hpp // CHECK-NEXT: detail/cg_types.hpp +// CHECK-NEXT: kernel_handler.hpp // CHECK-NEXT: detail/helpers.hpp // CHECK-NEXT: memory_enums.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: detail/item_base.hpp -// CHECK-NEXT: group.hpp -// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp -// CHECK-NEXT: device_event.hpp -// CHECK-NEXT: h_item.hpp -// CHECK-NEXT: item.hpp -// CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/is_device_copyable.hpp // CHECK-NEXT: ext/intel/experimental/fp_control_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp @@ -81,17 +73,6 @@ // CHECK-NEXT: ext/oneapi/experimental/cluster_group_prop.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def -// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp -// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/use_root_sync_prop.hpp // CHECK-NEXT: ext/oneapi/experimental/virtual_functions.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp @@ -103,8 +84,12 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/range_rounding.hpp // CHECK-NEXT: detail/iostream_proxy.hpp +// CHECK-NEXT: item.hpp +// CHECK-NEXT: detail/item_base.hpp +// CHECK-NEXT: detail/reduction_forward.hpp // CHECK-NEXT: device.hpp // CHECK-NEXT: backend_types.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp @@ -136,10 +121,6 @@ // CHECK-NEXT: detail/util.hpp // CHECK-NEXT: device_selector.hpp // CHECK-NEXT: kernel_bundle_enums.hpp -// CHECK-NEXT: detail/reduction_forward.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: detail/os_util.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: event.hpp // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp @@ -147,8 +128,23 @@ // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp // CHECK-NEXT: ext/oneapi/device_global/properties.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def +// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp +// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp +// CHECK-NEXT: group.hpp +// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp +// CHECK-NEXT: device_event.hpp // CHECK-NEXT: kernel.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: usm/usm_enums.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp index 4874fba9e43d9..3c33528e587b5 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp @@ -17,10 +17,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp index 31e65fe2186a9..69e9a99e96082 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp @@ -17,10 +17,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp index 6a0d1347cabdc..8e08d91ed0e3f 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp @@ -81,6 +81,7 @@ // CHECK-NEXT: accessor.hpp // CHECK-NEXT: detail/accessor_iterator.hpp // CHECK-NEXT: detail/fwd/accessor.hpp +// CHECK-NEXT: detail/code_location.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: detail/nd_loop.hpp @@ -104,18 +105,9 @@ // CHECK-NEXT: detail/compile_time_kernel_info.hpp // CHECK-NEXT: detail/kernel_launch_helper.hpp // CHECK-NEXT: detail/cg_types.hpp +// CHECK-NEXT: kernel_handler.hpp // CHECK-NEXT: detail/helpers.hpp // CHECK-NEXT: memory_enums.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: detail/item_base.hpp -// CHECK-NEXT: group.hpp -// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp -// CHECK-NEXT: device_event.hpp -// CHECK-NEXT: h_item.hpp -// CHECK-NEXT: item.hpp -// CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/is_device_copyable.hpp // CHECK-NEXT: ext/intel/experimental/fp_control_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp @@ -124,17 +116,6 @@ // CHECK-NEXT: ext/oneapi/experimental/cluster_group_prop.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def -// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp -// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/use_root_sync_prop.hpp // CHECK-NEXT: ext/oneapi/experimental/virtual_functions.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp @@ -142,8 +123,11 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/range_rounding.hpp // CHECK-NEXT: detail/iostream_proxy.hpp +// CHECK-NEXT: item.hpp +// CHECK-NEXT: detail/item_base.hpp // CHECK-NEXT: detail/reduction_forward.hpp // CHECK-NEXT: event.hpp // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp @@ -152,7 +136,22 @@ // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp // CHECK-NEXT: ext/oneapi/device_global/properties.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def +// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp +// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp +// CHECK-NEXT: group.hpp +// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp +// CHECK-NEXT: device_event.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: sycl_span.hpp // CHECK-NEXT: specialization_id.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp index 85d2233286d61..7eaa4ad5f0c77 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp @@ -21,10 +21,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -98,31 +99,25 @@ // CHECK-NEXT: usm/usm_enums.hpp // CHECK-NEXT: properties/buffer_properties.def // CHECK-NEXT: detail/cg_types.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: detail/item_base.hpp -// CHECK-NEXT: detail/kernel_desc.hpp -// CHECK-NEXT: group.hpp -// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp -// CHECK-NEXT: device_event.hpp -// CHECK-NEXT: h_item.hpp -// CHECK-NEXT: item.hpp // CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp +// CHECK-NEXT: detail/kernel_desc.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/optional.hpp // CHECK-NEXT: detail/range_rounding.hpp -// CHECK-NEXT: device.hpp -// CHECK-NEXT: detail/string_view.hpp -// CHECK-NEXT: detail/util.hpp -// CHECK-NEXT: device_selector.hpp -// CHECK-NEXT: kernel_bundle_enums.hpp // CHECK-NEXT: ext/oneapi/kernel_properties.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_value.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp +// CHECK-NEXT: item.hpp +// CHECK-NEXT: detail/item_base.hpp +// CHECK-NEXT: device.hpp +// CHECK-NEXT: detail/string_view.hpp +// CHECK-NEXT: detail/util.hpp +// CHECK-NEXT: device_selector.hpp +// CHECK-NEXT: kernel_bundle_enums.hpp // CHECK-NEXT: event.hpp // CHECK-NEXT: exception_list.hpp // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp @@ -156,14 +151,16 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/reduction_forward.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp // CHECK-NEXT: ext/oneapi/bindless_images_mem_handle.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp +// CHECK-NEXT: group.hpp +// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp +// CHECK-NEXT: device_event.hpp // CHECK-NEXT: kernel.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: sycl_span.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp index bf7698794c8b2..a5572cebd6454 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp @@ -20,10 +20,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -153,8 +154,6 @@ // CHECK-NEXT: detail/kernel_desc.hpp // CHECK-NEXT: detail/kernel_launch_helper.hpp // CHECK-NEXT: detail/cg_types.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: h_item.hpp // CHECK-NEXT: kernel_handler.hpp // CHECK-NEXT: ext/intel/experimental/fp_control_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp @@ -163,17 +162,6 @@ // CHECK-NEXT: ext/oneapi/experimental/cluster_group_prop.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def -// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp -// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/use_root_sync_prop.hpp // CHECK-NEXT: ext/oneapi/experimental/virtual_functions.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp @@ -182,14 +170,23 @@ // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/nd_range_view.hpp // CHECK-NEXT: detail/range_rounding.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp // CHECK-NEXT: ext/oneapi/bindless_images_mem_handle.hpp // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp // CHECK-NEXT: ext/oneapi/device_global/properties.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def +// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp +// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp // CHECK-NEXT: kernel.hpp // CHECK-NEXT: sampler.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp index 3c82fa63e775d..05b36a87f45f2 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp @@ -17,10 +17,11 @@ // CHECK-NEXT: id.hpp // CHECK-NEXT: detail/array.hpp // CHECK-NEXT: range.hpp +// CHECK-NEXT: detail/code_location.hpp +// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/common.hpp // CHECK-NEXT: detail/assert.hpp // CHECK-NEXT: __spirv/spirv_vars.hpp -// CHECK-NEXT: detail/export.hpp // CHECK-NEXT: detail/nd_loop.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/generic_type_traits.hpp @@ -96,10 +97,7 @@ // CHECK-NEXT: detail/string_view.hpp // CHECK-NEXT: detail/kernel_launch_helper.hpp // CHECK-NEXT: detail/cg_types.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp // CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/is_device_copyable.hpp // CHECK-NEXT: ext/intel/experimental/fp_control_kernel_properties.hpp // CHECK-NEXT: ext/oneapi/properties/property.hpp @@ -108,17 +106,6 @@ // CHECK-NEXT: ext/oneapi/experimental/cluster_group_prop.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def -// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def -// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp -// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp -// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/use_root_sync_prop.hpp // CHECK-NEXT: ext/oneapi/experimental/virtual_functions.hpp // CHECK-NEXT: ext/oneapi/free_function_kernel_properties.hpp @@ -127,8 +114,10 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/range_rounding.hpp // CHECK-NEXT: detail/iostream_proxy.hpp +// CHECK-NEXT: detail/reduction_forward.hpp // CHECK-NEXT: device.hpp // CHECK-NEXT: backend_types.hpp // CHECK-NEXT: detail/info_desc_helpers.hpp @@ -157,10 +146,6 @@ // CHECK-NEXT: detail/util.hpp // CHECK-NEXT: device_selector.hpp // CHECK-NEXT: kernel_bundle_enums.hpp -// CHECK-NEXT: detail/reduction_forward.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: detail/os_util.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: event.hpp // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp @@ -168,8 +153,20 @@ // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp // CHECK-NEXT: ext/oneapi/device_global/properties.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/command_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/common.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/executable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/node.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.hpp +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/graph_properties.def +// CHECK-NEXT: ext/oneapi/experimental/detail/properties/node_properties.def +// CHECK-NEXT: ext/oneapi/experimental/graph/modifiable_graph.hpp +// CHECK-NEXT: ext/oneapi/experimental/graph/dynamic.hpp +// CHECK-NEXT: ext/oneapi/experimental/work_group_memory.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp // CHECK-NEXT: kernel.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: usm/usm_enums.hpp // CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp index eba6488996deb..a7df19ab30b44 100644 --- a/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp @@ -96,6 +96,7 @@ // CHECK-NEXT: queue.hpp // CHECK-NEXT: accessor.hpp // CHECK-NEXT: detail/accessor_iterator.hpp +// CHECK-NEXT: detail/code_location.hpp // CHECK-NEXT: detail/fwd/buffer.hpp // CHECK-NEXT: detail/handler_proxy.hpp // CHECK-NEXT: ext/oneapi/accessor_property_list.hpp @@ -119,18 +120,10 @@ // CHECK-NEXT: usm/usm_enums.hpp // CHECK-NEXT: properties/buffer_properties.def // CHECK-NEXT: detail/cg_types.hpp -// CHECK-NEXT: detail/host_profiling_info.hpp -// CHECK-NEXT: detail/item_base.hpp -// CHECK-NEXT: detail/kernel_desc.hpp -// CHECK-NEXT: group.hpp -// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp -// CHECK-NEXT: device_event.hpp -// CHECK-NEXT: h_item.hpp -// CHECK-NEXT: item.hpp // CHECK-NEXT: kernel_handler.hpp -// CHECK-NEXT: nd_item.hpp -// CHECK-NEXT: nd_range.hpp +// CHECK-NEXT: detail/kernel_desc.hpp // CHECK-NEXT: detail/nd_range_view.hpp +// CHECK-NEXT: nd_range.hpp // CHECK-NEXT: detail/optional.hpp // CHECK-NEXT: detail/range_rounding.hpp // CHECK-NEXT: ext/oneapi/kernel_properties.hpp @@ -139,6 +132,8 @@ // CHECK-NEXT: ext/oneapi/properties/property.hpp // CHECK-NEXT: ext/oneapi/properties.hpp // CHECK-NEXT: ext/oneapi/properties/property_utils.hpp +// CHECK-NEXT: item.hpp +// CHECK-NEXT: detail/item_base.hpp // CHECK-NEXT: event.hpp // CHECK-NEXT: exception_list.hpp // CHECK-NEXT: ext/oneapi/device_global/device_global.hpp @@ -172,14 +167,16 @@ // CHECK-NEXT: ext/oneapi/work_group_scratch_memory.hpp // CHECK-NEXT: detail/sycl_local_mem_builtins.hpp // CHECK-NEXT: detail/reduction_forward.hpp -// CHECK-NEXT: detail/ur.hpp -// CHECK-NEXT: ur_api_funcs.def // CHECK-NEXT: ext/oneapi/bindless_images_interop.hpp // CHECK-NEXT: ext/oneapi/interop_common.hpp // CHECK-NEXT: ext/oneapi/bindless_images_mem_handle.hpp // CHECK-NEXT: ext/oneapi/experimental/free_function_traits.hpp // CHECK-NEXT: ext/oneapi/experimental/raw_kernel_arg.hpp +// CHECK-NEXT: group.hpp +// CHECK-NEXT: detail/async_work_group_copy_ptr.hpp +// CHECK-NEXT: device_event.hpp // CHECK-NEXT: kernel.hpp +// CHECK-NEXT: nd_item.hpp // CHECK-NEXT: sampler.hpp // CHECK-NEXT: sycl_span.hpp // CHECK-NEXT: usm/usm_pointer_info.hpp From 44ba0582c15d9f1ff8998c9c4ecf61596df7eaf6 Mon Sep 17 00:00:00 2001 From: y Date: Thu, 28 May 2026 06:51:38 -0700 Subject: [PATCH 2/2] Format --- sycl/test-e2e/Properties/cache_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/Properties/cache_config.cpp b/sycl/test-e2e/Properties/cache_config.cpp index 1f68487e624c7..8248c1847bd1e 100644 --- a/sycl/test-e2e/Properties/cache_config.cpp +++ b/sycl/test-e2e/Properties/cache_config.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include