From db60790dd253d827aea41ab4f2367815155f6a85 Mon Sep 17 00:00:00 2001 From: y Date: Mon, 18 May 2026 08:58:28 -0700 Subject: [PATCH 1/2] Rename headers to match KHR --- .../khr/{includes => split_headers}/accessor.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/atomic.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/backend.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/bit.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/buffer.hpp | 6 +++--- .../{includes => split_headers}/builtins_common.hpp | 6 +++--- .../builtins_geometric.hpp | 6 +++--- .../{includes => split_headers}/builtins_integer.hpp | 6 +++--- .../{includes => split_headers}/builtins_math.hpp | 6 +++--- .../builtins_relational.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/byte.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/context.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/device.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/event.hpp | 6 +++--- .../khr/{includes => split_headers}/exception.hpp | 6 +++--- .../khr/{includes => split_headers}/functional.hpp | 6 +++--- .../{includes => split_headers}/group_algorithms.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/groups.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/half.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/handler.hpp | 6 +++--- .../hierarchical_parallelism.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/images.hpp | 6 +++--- .../khr/{includes => split_headers}/index_space.hpp | 6 +++--- .../{includes => split_headers}/interop_handle.hpp | 6 +++--- .../{includes => split_headers}/kernel_bundle.hpp | 6 +++--- .../{includes => split_headers}/kernel_handler.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/marray.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/math.hpp | 6 +++--- .../khr/{includes => split_headers}/multi_ptr.hpp | 6 +++--- .../khr/{includes => split_headers}/platform.hpp | 6 +++--- .../{includes => split_headers}/property_list.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/queue.hpp | 6 +++--- .../khr/{includes => split_headers}/reduction.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/span.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/stream.hpp | 6 +++--- .../khr/{includes => split_headers}/type_traits.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/usm.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/vec.hpp | 6 +++--- .../sycl/khr/{includes => split_headers}/version.hpp | 6 +++--- sycl/include/sycl/sycl.hpp | 2 +- sycl/test/include_deps/sycl_khr_includes_bit.hpp.cpp | 12 ------------ .../test/include_deps/sycl_khr_includes_byte.hpp.cpp | 12 ------------ .../sycl_khr_includes_functional.hpp.cpp | 12 ------------ ...p.cpp => sycl_khr_split_headers_accessor.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_atomic.hpp.cpp} | 8 ++++---- .../include_deps/sycl_khr_split_headers_bit.hpp.cpp | 12 ++++++++++++ ...hpp.cpp => sycl_khr_split_headers_buffer.hpp.cpp} | 8 ++++---- ...> sycl_khr_split_headers_builtins_common.hpp.cpp} | 8 ++++---- ...ycl_khr_split_headers_builtins_geometric.hpp.cpp} | 8 ++++---- ... sycl_khr_split_headers_builtins_integer.hpp.cpp} | 8 ++++---- ... => sycl_khr_split_headers_builtins_math.hpp.cpp} | 8 ++++---- ...cl_khr_split_headers_builtins_relational.hpp.cpp} | 8 ++++---- .../include_deps/sycl_khr_split_headers_byte.hpp.cpp | 12 ++++++++++++ ...pp.cpp => sycl_khr_split_headers_context.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_device.hpp.cpp} | 8 ++++---- ....hpp.cpp => sycl_khr_split_headers_event.hpp.cpp} | 8 ++++---- ....cpp => sycl_khr_split_headers_exception.hpp.cpp} | 8 ++++---- .../sycl_khr_split_headers_functional.hpp.cpp | 12 ++++++++++++ ... sycl_khr_split_headers_group_algorithms.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_groups.hpp.cpp} | 8 ++++---- ...f.hpp.cpp => sycl_khr_split_headers_half.hpp.cpp} | 8 ++++---- ...pp.cpp => sycl_khr_split_headers_handler.hpp.cpp} | 8 ++++---- ...r_split_headers_hierarchical_parallelism.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_images.hpp.cpp} | 8 ++++---- ...pp => sycl_khr_split_headers_index_space.hpp.cpp} | 8 ++++---- ...=> sycl_khr_split_headers_interop_handle.hpp.cpp} | 8 ++++---- ... => sycl_khr_split_headers_kernel_bundle.hpp.cpp} | 8 ++++---- ...=> sycl_khr_split_headers_kernel_handler.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_marray.hpp.cpp} | 8 ++++---- ...h.hpp.cpp => sycl_khr_split_headers_math.hpp.cpp} | 8 ++++---- ....cpp => sycl_khr_split_headers_multi_ptr.hpp.cpp} | 8 ++++---- ...p.cpp => sycl_khr_split_headers_platform.hpp.cpp} | 8 ++++---- ... => sycl_khr_split_headers_property_list.hpp.cpp} | 8 ++++---- ....hpp.cpp => sycl_khr_split_headers_queue.hpp.cpp} | 8 ++++---- ....cpp => sycl_khr_split_headers_reduction.hpp.cpp} | 8 ++++---- ...n.hpp.cpp => sycl_khr_split_headers_span.hpp.cpp} | 8 ++++---- ...hpp.cpp => sycl_khr_split_headers_stream.hpp.cpp} | 8 ++++---- ...pp => sycl_khr_split_headers_type_traits.hpp.cpp} | 8 ++++---- ...sm.hpp.cpp => sycl_khr_split_headers_usm.hpp.cpp} | 8 ++++---- ...ec.hpp.cpp => sycl_khr_split_headers_vec.hpp.cpp} | 8 ++++---- ...pp.cpp => sycl_khr_split_headers_version.hpp.cpp} | 6 +++--- .../test/regression/khr_includes_builtins_common.cpp | 6 +++--- .../regression/khr_includes_builtins_geometric.cpp | 6 +++--- .../regression/khr_includes_builtins_integer.cpp | 6 +++--- sycl/test/regression/khr_includes_builtins_math.cpp | 8 ++++---- .../regression/khr_includes_builtins_relational.cpp | 6 +++--- 86 files changed, 309 insertions(+), 309 deletions(-) rename sycl/include/sycl/khr/{includes => split_headers}/accessor.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/atomic.hpp (79%) rename sycl/include/sycl/khr/{includes => split_headers}/backend.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/bit.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/buffer.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/builtins_common.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/builtins_geometric.hpp (75%) rename sycl/include/sycl/khr/{includes => split_headers}/builtins_integer.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/builtins_math.hpp (81%) rename sycl/include/sycl/khr/{includes => split_headers}/builtins_relational.hpp (75%) rename sycl/include/sycl/khr/{includes => split_headers}/byte.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/context.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/device.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/event.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/exception.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/functional.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/group_algorithms.hpp (73%) rename sycl/include/sycl/khr/{includes => split_headers}/groups.hpp (81%) rename sycl/include/sycl/khr/{includes => split_headers}/half.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/handler.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/hierarchical_parallelism.hpp (71%) rename sycl/include/sycl/khr/{includes => split_headers}/images.hpp (80%) rename sycl/include/sycl/khr/{includes => split_headers}/index_space.hpp (79%) rename sycl/include/sycl/khr/{includes => split_headers}/interop_handle.hpp (74%) rename sycl/include/sycl/khr/{includes => split_headers}/kernel_bundle.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/kernel_handler.hpp (74%) rename sycl/include/sycl/khr/{includes => split_headers}/marray.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/math.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/multi_ptr.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/platform.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/property_list.hpp (75%) rename sycl/include/sycl/khr/{includes => split_headers}/queue.hpp (79%) rename sycl/include/sycl/khr/{includes => split_headers}/reduction.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/span.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/stream.hpp (77%) rename sycl/include/sycl/khr/{includes => split_headers}/type_traits.hpp (76%) rename sycl/include/sycl/khr/{includes => split_headers}/usm.hpp (80%) rename sycl/include/sycl/khr/{includes => split_headers}/vec.hpp (78%) rename sycl/include/sycl/khr/{includes => split_headers}/version.hpp (91%) delete mode 100644 sycl/test/include_deps/sycl_khr_includes_bit.hpp.cpp delete mode 100644 sycl/test/include_deps/sycl_khr_includes_byte.hpp.cpp delete mode 100644 sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp rename sycl/test/include_deps/{sycl_khr_includes_accessor.hpp.cpp => sycl_khr_split_headers_accessor.hpp.cpp} (93%) rename sycl/test/include_deps/{sycl_khr_includes_atomic.hpp.cpp => sycl_khr_split_headers_atomic.hpp.cpp} (85%) create mode 100644 sycl/test/include_deps/sycl_khr_split_headers_bit.hpp.cpp rename sycl/test/include_deps/{sycl_khr_includes_buffer.hpp.cpp => sycl_khr_split_headers_buffer.hpp.cpp} (85%) rename sycl/test/include_deps/{sycl_khr_includes_builtins_common.hpp.cpp => sycl_khr_split_headers_builtins_common.hpp.cpp} (83%) rename sycl/test/include_deps/{sycl_khr_includes_builtins_geometric.hpp.cpp => sycl_khr_split_headers_builtins_geometric.hpp.cpp} (83%) rename sycl/test/include_deps/{sycl_khr_includes_builtins_integer.hpp.cpp => sycl_khr_split_headers_builtins_integer.hpp.cpp} (83%) rename sycl/test/include_deps/{sycl_khr_includes_builtins_math.hpp.cpp => sycl_khr_split_headers_builtins_math.hpp.cpp} (85%) rename sycl/test/include_deps/{sycl_khr_includes_builtins_relational.hpp.cpp => sycl_khr_split_headers_builtins_relational.hpp.cpp} (83%) create mode 100644 sycl/test/include_deps/sycl_khr_split_headers_byte.hpp.cpp rename sycl/test/include_deps/{sycl_khr_includes_context.hpp.cpp => sycl_khr_split_headers_context.hpp.cpp} (91%) rename sycl/test/include_deps/{sycl_khr_includes_device.hpp.cpp => sycl_khr_split_headers_device.hpp.cpp} (91%) rename sycl/test/include_deps/{sycl_khr_includes_event.hpp.cpp => sycl_khr_split_headers_event.hpp.cpp} (90%) rename sycl/test/include_deps/{sycl_khr_includes_exception.hpp.cpp => sycl_khr_split_headers_exception.hpp.cpp} (59%) create mode 100644 sycl/test/include_deps/sycl_khr_split_headers_functional.hpp.cpp rename sycl/test/include_deps/{sycl_khr_includes_group_algorithms.hpp.cpp => sycl_khr_split_headers_group_algorithms.hpp.cpp} (89%) rename sycl/test/include_deps/{sycl_khr_includes_groups.hpp.cpp => sycl_khr_split_headers_groups.hpp.cpp} (90%) rename sycl/test/include_deps/{sycl_khr_includes_half.hpp.cpp => sycl_khr_split_headers_half.hpp.cpp} (66%) rename sycl/test/include_deps/{sycl_khr_includes_handler.hpp.cpp => sycl_khr_split_headers_handler.hpp.cpp} (96%) rename sycl/test/include_deps/{sycl_khr_includes_hierarchical_parallelism.hpp.cpp => sycl_khr_split_headers_hierarchical_parallelism.hpp.cpp} (78%) rename sycl/test/include_deps/{sycl_khr_includes_images.hpp.cpp => sycl_khr_split_headers_images.hpp.cpp} (94%) rename sycl/test/include_deps/{sycl_khr_includes_index_space.hpp.cpp => sycl_khr_split_headers_index_space.hpp.cpp} (81%) rename sycl/test/include_deps/{sycl_khr_includes_interop_handle.hpp.cpp => sycl_khr_split_headers_interop_handle.hpp.cpp} (95%) rename sycl/test/include_deps/{sycl_khr_includes_kernel_bundle.hpp.cpp => sycl_khr_split_headers_kernel_bundle.hpp.cpp} (96%) rename sycl/test/include_deps/{sycl_khr_includes_kernel_handler.hpp.cpp => sycl_khr_split_headers_kernel_handler.hpp.cpp} (58%) rename sycl/test/include_deps/{sycl_khr_includes_marray.hpp.cpp => sycl_khr_split_headers_marray.hpp.cpp} (65%) rename sycl/test/include_deps/{sycl_khr_includes_math.hpp.cpp => sycl_khr_split_headers_math.hpp.cpp} (88%) rename sycl/test/include_deps/{sycl_khr_includes_multi_ptr.hpp.cpp => sycl_khr_split_headers_multi_ptr.hpp.cpp} (72%) rename sycl/test/include_deps/{sycl_khr_includes_platform.hpp.cpp => sycl_khr_split_headers_platform.hpp.cpp} (90%) rename sycl/test/include_deps/{sycl_khr_includes_property_list.hpp.cpp => sycl_khr_split_headers_property_list.hpp.cpp} (63%) rename sycl/test/include_deps/{sycl_khr_includes_queue.hpp.cpp => sycl_khr_split_headers_queue.hpp.cpp} (96%) rename sycl/test/include_deps/{sycl_khr_includes_reduction.hpp.cpp => sycl_khr_split_headers_reduction.hpp.cpp} (97%) rename sycl/test/include_deps/{sycl_khr_includes_span.hpp.cpp => sycl_khr_split_headers_span.hpp.cpp} (53%) rename sycl/test/include_deps/{sycl_khr_includes_stream.hpp.cpp => sycl_khr_split_headers_stream.hpp.cpp} (96%) rename sycl/test/include_deps/{sycl_khr_includes_type_traits.hpp.cpp => sycl_khr_split_headers_type_traits.hpp.cpp} (62%) rename sycl/test/include_deps/{sycl_khr_includes_usm.hpp.cpp => sycl_khr_split_headers_usm.hpp.cpp} (97%) rename sycl/test/include_deps/{sycl_khr_includes_vec.hpp.cpp => sycl_khr_split_headers_vec.hpp.cpp} (82%) rename sycl/test/include_deps/{sycl_khr_includes_version.hpp.cpp => sycl_khr_split_headers_version.hpp.cpp} (50%) diff --git a/sycl/include/sycl/khr/includes/accessor.hpp b/sycl/include/sycl/khr/split_headers/accessor.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/accessor.hpp rename to sycl/include/sycl/khr/split_headers/accessor.hpp index 15c4bdd8aec83..e898a0688cb18 100644 --- a/sycl/include/sycl/khr/includes/accessor.hpp +++ b/sycl/include/sycl/khr/split_headers/accessor.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_ACCESSOR -#define __SYCL_KHR_INCLUDES_ACCESSOR +#ifndef __SYCL_KHR_SPLIT_HEADERS_ACCESSOR +#define __SYCL_KHR_SPLIT_HEADERS_ACCESSOR #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_ACCESSOR +#endif // __SYCL_KHR_SPLIT_HEADERS_ACCESSOR diff --git a/sycl/include/sycl/khr/includes/atomic.hpp b/sycl/include/sycl/khr/split_headers/atomic.hpp similarity index 79% rename from sycl/include/sycl/khr/includes/atomic.hpp rename to sycl/include/sycl/khr/split_headers/atomic.hpp index 31d229a964253..f9506459b41c1 100644 --- a/sycl/include/sycl/khr/includes/atomic.hpp +++ b/sycl/include/sycl/khr/split_headers/atomic.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_ATOMIC -#define __SYCL_KHR_INCLUDES_ATOMIC +#ifndef __SYCL_KHR_SPLIT_HEADERS_ATOMIC +#define __SYCL_KHR_SPLIT_HEADERS_ATOMIC #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_ATOMIC +#endif // __SYCL_KHR_SPLIT_HEADERS_ATOMIC diff --git a/sycl/include/sycl/khr/includes/backend.hpp b/sycl/include/sycl/khr/split_headers/backend.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/backend.hpp rename to sycl/include/sycl/khr/split_headers/backend.hpp index 631871ec859bb..08b3ef4f4f2af 100644 --- a/sycl/include/sycl/khr/includes/backend.hpp +++ b/sycl/include/sycl/khr/split_headers/backend.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BACKEND -#define __SYCL_KHR_INCLUDES_BACKEND +#ifndef __SYCL_KHR_SPLIT_HEADERS_BACKEND +#define __SYCL_KHR_SPLIT_HEADERS_BACKEND #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_BACKEND +#endif // __SYCL_KHR_SPLIT_HEADERS_BACKEND diff --git a/sycl/include/sycl/khr/includes/bit.hpp b/sycl/include/sycl/khr/split_headers/bit.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/bit.hpp rename to sycl/include/sycl/khr/split_headers/bit.hpp index a7e59760eb05d..9ea3f5f42f745 100644 --- a/sycl/include/sycl/khr/includes/bit.hpp +++ b/sycl/include/sycl/khr/split_headers/bit.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BIT -#define __SYCL_KHR_INCLUDES_BIT +#ifndef __SYCL_KHR_SPLIT_HEADERS_BIT +#define __SYCL_KHR_SPLIT_HEADERS_BIT #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_BIT +#endif // __SYCL_KHR_SPLIT_HEADERS_BIT diff --git a/sycl/include/sycl/khr/includes/buffer.hpp b/sycl/include/sycl/khr/split_headers/buffer.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/buffer.hpp rename to sycl/include/sycl/khr/split_headers/buffer.hpp index 75ba709096429..5edf09f2f60a9 100644 --- a/sycl/include/sycl/khr/includes/buffer.hpp +++ b/sycl/include/sycl/khr/split_headers/buffer.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUFFER -#define __SYCL_KHR_INCLUDES_BUFFER +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUFFER +#define __SYCL_KHR_SPLIT_HEADERS_BUFFER #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_BUFFER +#endif // __SYCL_KHR_SPLIT_HEADERS_BUFFER diff --git a/sycl/include/sycl/khr/includes/builtins_common.hpp b/sycl/include/sycl/khr/split_headers/builtins_common.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/builtins_common.hpp rename to sycl/include/sycl/khr/split_headers/builtins_common.hpp index e048b9c08034c..c1714540abeff 100644 --- a/sycl/include/sycl/khr/includes/builtins_common.hpp +++ b/sycl/include/sycl/khr/split_headers/builtins_common.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUILTINS_COMMON -#define __SYCL_KHR_INCLUDES_BUILTINS_COMMON +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUILTINS_COMMON +#define __SYCL_KHR_SPLIT_HEADERS_BUILTINS_COMMON #include "version.hpp" @@ -15,4 +15,4 @@ #include -#endif // __SYCL_KHR_INCLUDES_BUILTINS_COMMON +#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_COMMON diff --git a/sycl/include/sycl/khr/includes/builtins_geometric.hpp b/sycl/include/sycl/khr/split_headers/builtins_geometric.hpp similarity index 75% rename from sycl/include/sycl/khr/includes/builtins_geometric.hpp rename to sycl/include/sycl/khr/split_headers/builtins_geometric.hpp index d0814faa605a0..8f8a8f88e734a 100644 --- a/sycl/include/sycl/khr/includes/builtins_geometric.hpp +++ b/sycl/include/sycl/khr/split_headers/builtins_geometric.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUILTINS_GEOMETRIC -#define __SYCL_KHR_INCLUDES_BUILTINS_GEOMETRIC +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUILTINS_GEOMETRIC +#define __SYCL_KHR_SPLIT_HEADERS_BUILTINS_GEOMETRIC #include "version.hpp" @@ -15,4 +15,4 @@ #include -#endif // __SYCL_KHR_INCLUDES_BUILTINS_GEOMETRIC +#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_GEOMETRIC diff --git a/sycl/include/sycl/khr/includes/builtins_integer.hpp b/sycl/include/sycl/khr/split_headers/builtins_integer.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/builtins_integer.hpp rename to sycl/include/sycl/khr/split_headers/builtins_integer.hpp index 50dad8ce8cd80..4b1941632d185 100644 --- a/sycl/include/sycl/khr/includes/builtins_integer.hpp +++ b/sycl/include/sycl/khr/split_headers/builtins_integer.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUILTINS_INTEGER -#define __SYCL_KHR_INCLUDES_BUILTINS_INTEGER +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUILTINS_INTEGER +#define __SYCL_KHR_SPLIT_HEADERS_BUILTINS_INTEGER #include "version.hpp" @@ -15,4 +15,4 @@ #include -#endif // __SYCL_KHR_INCLUDES_BUILTINS_INTEGER +#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_INTEGER diff --git a/sycl/include/sycl/khr/includes/builtins_math.hpp b/sycl/include/sycl/khr/split_headers/builtins_math.hpp similarity index 81% rename from sycl/include/sycl/khr/includes/builtins_math.hpp rename to sycl/include/sycl/khr/split_headers/builtins_math.hpp index c1b130eaa40d0..bbeadbfc17615 100644 --- a/sycl/include/sycl/khr/includes/builtins_math.hpp +++ b/sycl/include/sycl/khr/split_headers/builtins_math.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUILTINS_MATH -#define __SYCL_KHR_INCLUDES_BUILTINS_MATH +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUILTINS_MATH +#define __SYCL_KHR_SPLIT_HEADERS_BUILTINS_MATH #include "version.hpp" @@ -17,4 +17,4 @@ #include #include -#endif // __SYCL_KHR_INCLUDES_BUILTINS_MATH +#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_MATH diff --git a/sycl/include/sycl/khr/includes/builtins_relational.hpp b/sycl/include/sycl/khr/split_headers/builtins_relational.hpp similarity index 75% rename from sycl/include/sycl/khr/includes/builtins_relational.hpp rename to sycl/include/sycl/khr/split_headers/builtins_relational.hpp index ba659f50f787f..9e19cc7a6fa49 100644 --- a/sycl/include/sycl/khr/includes/builtins_relational.hpp +++ b/sycl/include/sycl/khr/split_headers/builtins_relational.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BUILTINS_RELATIONAL -#define __SYCL_KHR_INCLUDES_BUILTINS_RELATIONAL +#ifndef __SYCL_KHR_SPLIT_HEADERS_BUILTINS_RELATIONAL +#define __SYCL_KHR_SPLIT_HEADERS_BUILTINS_RELATIONAL #include "version.hpp" @@ -15,4 +15,4 @@ #include -#endif // __SYCL_KHR_INCLUDES_BUILTINS_RELATIONAL +#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_RELATIONAL diff --git a/sycl/include/sycl/khr/includes/byte.hpp b/sycl/include/sycl/khr/split_headers/byte.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/byte.hpp rename to sycl/include/sycl/khr/split_headers/byte.hpp index d5e2ef98973f6..96bdb6746153e 100644 --- a/sycl/include/sycl/khr/includes/byte.hpp +++ b/sycl/include/sycl/khr/split_headers/byte.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_BYTE -#define __SYCL_KHR_INCLUDES_BYTE +#ifndef __SYCL_KHR_SPLIT_HEADERS_BYTE +#define __SYCL_KHR_SPLIT_HEADERS_BYTE #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_BYTE +#endif // __SYCL_KHR_SPLIT_HEADERS_BYTE diff --git a/sycl/include/sycl/khr/includes/context.hpp b/sycl/include/sycl/khr/split_headers/context.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/context.hpp rename to sycl/include/sycl/khr/split_headers/context.hpp index 5c7493b41c063..e21db2604786c 100644 --- a/sycl/include/sycl/khr/includes/context.hpp +++ b/sycl/include/sycl/khr/split_headers/context.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_CONTEXT -#define __SYCL_KHR_INCLUDES_CONTEXT +#ifndef __SYCL_KHR_SPLIT_HEADERS_CONTEXT +#define __SYCL_KHR_SPLIT_HEADERS_CONTEXT #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_CONTEXT +#endif // __SYCL_KHR_SPLIT_HEADERS_CONTEXT diff --git a/sycl/include/sycl/khr/includes/device.hpp b/sycl/include/sycl/khr/split_headers/device.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/device.hpp rename to sycl/include/sycl/khr/split_headers/device.hpp index 7c7f3cd78b8cb..1a93b89251123 100644 --- a/sycl/include/sycl/khr/includes/device.hpp +++ b/sycl/include/sycl/khr/split_headers/device.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_DEVICE -#define __SYCL_KHR_INCLUDES_DEVICE +#ifndef __SYCL_KHR_SPLIT_HEADERS_DEVICE +#define __SYCL_KHR_SPLIT_HEADERS_DEVICE #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_DEVICE +#endif // __SYCL_KHR_SPLIT_HEADERS_DEVICE diff --git a/sycl/include/sycl/khr/includes/event.hpp b/sycl/include/sycl/khr/split_headers/event.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/event.hpp rename to sycl/include/sycl/khr/split_headers/event.hpp index cc16e288c4d5d..594ec98edc792 100644 --- a/sycl/include/sycl/khr/includes/event.hpp +++ b/sycl/include/sycl/khr/split_headers/event.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_EVENT -#define __SYCL_KHR_INCLUDES_EVENT +#ifndef __SYCL_KHR_SPLIT_HEADERS_EVENT +#define __SYCL_KHR_SPLIT_HEADERS_EVENT #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_EVENT +#endif // __SYCL_KHR_SPLIT_HEADERS_EVENT diff --git a/sycl/include/sycl/khr/includes/exception.hpp b/sycl/include/sycl/khr/split_headers/exception.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/exception.hpp rename to sycl/include/sycl/khr/split_headers/exception.hpp index 2134b93547783..bcb909ad5994b 100644 --- a/sycl/include/sycl/khr/includes/exception.hpp +++ b/sycl/include/sycl/khr/split_headers/exception.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_EXCEPTION -#define __SYCL_KHR_INCLUDES_EXCEPTION +#ifndef __SYCL_KHR_SPLIT_HEADERS_EXCEPTION +#define __SYCL_KHR_SPLIT_HEADERS_EXCEPTION #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_EXCEPTION +#endif // __SYCL_KHR_SPLIT_HEADERS_EXCEPTION diff --git a/sycl/include/sycl/khr/includes/functional.hpp b/sycl/include/sycl/khr/split_headers/functional.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/functional.hpp rename to sycl/include/sycl/khr/split_headers/functional.hpp index 6e25ddb3c1843..0a145e4c5c568 100644 --- a/sycl/include/sycl/khr/includes/functional.hpp +++ b/sycl/include/sycl/khr/split_headers/functional.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_FUNCTIONAL -#define __SYCL_KHR_INCLUDES_FUNCTIONAL +#ifndef __SYCL_KHR_SPLIT_HEADERS_FUNCTIONAL +#define __SYCL_KHR_SPLIT_HEADERS_FUNCTIONAL #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_FUNCTIONAL +#endif // __SYCL_KHR_SPLIT_HEADERS_FUNCTIONAL diff --git a/sycl/include/sycl/khr/includes/group_algorithms.hpp b/sycl/include/sycl/khr/split_headers/group_algorithms.hpp similarity index 73% rename from sycl/include/sycl/khr/includes/group_algorithms.hpp rename to sycl/include/sycl/khr/split_headers/group_algorithms.hpp index bf9f972b73bd7..deb155faaf378 100644 --- a/sycl/include/sycl/khr/includes/group_algorithms.hpp +++ b/sycl/include/sycl/khr/split_headers/group_algorithms.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS -#define __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS +#ifndef __SYCL_KHR_SPLIT_HEADERS_GROUP_ALGORITHMS +#define __SYCL_KHR_SPLIT_HEADERS_GROUP_ALGORITHMS #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS +#endif // __SYCL_KHR_SPLIT_HEADERS_GROUP_ALGORITHMS diff --git a/sycl/include/sycl/khr/includes/groups.hpp b/sycl/include/sycl/khr/split_headers/groups.hpp similarity index 81% rename from sycl/include/sycl/khr/includes/groups.hpp rename to sycl/include/sycl/khr/split_headers/groups.hpp index 033d3e3c40edf..7c62151e2a4e9 100644 --- a/sycl/include/sycl/khr/includes/groups.hpp +++ b/sycl/include/sycl/khr/split_headers/groups.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_GROUPS -#define __SYCL_KHR_INCLUDES_GROUPS +#ifndef __SYCL_KHR_SPLIT_HEADERS_GROUPS +#define __SYCL_KHR_SPLIT_HEADERS_GROUPS #include "version.hpp" @@ -16,4 +16,4 @@ #include #include -#endif // __SYCL_KHR_INCLUDES_GROUPS +#endif // __SYCL_KHR_SPLIT_HEADERS_GROUPS diff --git a/sycl/include/sycl/khr/includes/half.hpp b/sycl/include/sycl/khr/split_headers/half.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/half.hpp rename to sycl/include/sycl/khr/split_headers/half.hpp index bc591cca93bda..41d637ea5b627 100644 --- a/sycl/include/sycl/khr/includes/half.hpp +++ b/sycl/include/sycl/khr/split_headers/half.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_HALF -#define __SYCL_KHR_INCLUDES_HALF +#ifndef __SYCL_KHR_SPLIT_HEADERS_HALF +#define __SYCL_KHR_SPLIT_HEADERS_HALF #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_HALF +#endif // __SYCL_KHR_SPLIT_HEADERS_HALF diff --git a/sycl/include/sycl/khr/includes/handler.hpp b/sycl/include/sycl/khr/split_headers/handler.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/handler.hpp rename to sycl/include/sycl/khr/split_headers/handler.hpp index 0558dd388ff43..967c8d45aac5b 100644 --- a/sycl/include/sycl/khr/includes/handler.hpp +++ b/sycl/include/sycl/khr/split_headers/handler.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_HANDLER -#define __SYCL_KHR_INCLUDES_HANDLER +#ifndef __SYCL_KHR_SPLIT_HEADERS_HANDLER +#define __SYCL_KHR_SPLIT_HEADERS_HANDLER #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_HANDLER +#endif // __SYCL_KHR_SPLIT_HEADERS_HANDLER diff --git a/sycl/include/sycl/khr/includes/hierarchical_parallelism.hpp b/sycl/include/sycl/khr/split_headers/hierarchical_parallelism.hpp similarity index 71% rename from sycl/include/sycl/khr/includes/hierarchical_parallelism.hpp rename to sycl/include/sycl/khr/split_headers/hierarchical_parallelism.hpp index 017f7f7b4e4bb..3762d9555b56d 100644 --- a/sycl/include/sycl/khr/includes/hierarchical_parallelism.hpp +++ b/sycl/include/sycl/khr/split_headers/hierarchical_parallelism.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM -#define __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM +#ifndef __SYCL_KHR_SPLIT_HEADERS_HIERARCHICAL_PARALLELISM +#define __SYCL_KHR_SPLIT_HEADERS_HIERARCHICAL_PARALLELISM #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM +#endif // __SYCL_KHR_SPLIT_HEADERS_HIERARCHICAL_PARALLELISM diff --git a/sycl/include/sycl/khr/includes/images.hpp b/sycl/include/sycl/khr/split_headers/images.hpp similarity index 80% rename from sycl/include/sycl/khr/includes/images.hpp rename to sycl/include/sycl/khr/split_headers/images.hpp index f7d49b0e4cbdc..788f53db0f9f4 100644 --- a/sycl/include/sycl/khr/includes/images.hpp +++ b/sycl/include/sycl/khr/split_headers/images.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_IMAGE -#define __SYCL_KHR_INCLUDES_IMAGE +#ifndef __SYCL_KHR_SPLIT_HEADERS_IMAGE +#define __SYCL_KHR_SPLIT_HEADERS_IMAGE #include "version.hpp" @@ -15,4 +15,4 @@ #include #include -#endif // __SYCL_KHR_INCLUDES_IMAGE +#endif // __SYCL_KHR_SPLIT_HEADERS_IMAGE diff --git a/sycl/include/sycl/khr/includes/index_space.hpp b/sycl/include/sycl/khr/split_headers/index_space.hpp similarity index 79% rename from sycl/include/sycl/khr/includes/index_space.hpp rename to sycl/include/sycl/khr/split_headers/index_space.hpp index b1210110a561c..e30e91d6164ce 100644 --- a/sycl/include/sycl/khr/includes/index_space.hpp +++ b/sycl/include/sycl/khr/split_headers/index_space.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_INDEX_SPACE -#define __SYCL_KHR_INCLUDES_INDEX_SPACE +#ifndef __SYCL_KHR_SPLIT_HEADERS_INDEX_SPACE +#define __SYCL_KHR_SPLIT_HEADERS_INDEX_SPACE #include "version.hpp" @@ -17,4 +17,4 @@ #include #include -#endif // __SYCL_KHR_INCLUDES_INDEX_SPACE +#endif // __SYCL_KHR_SPLIT_HEADERS_INDEX_SPACE diff --git a/sycl/include/sycl/khr/includes/interop_handle.hpp b/sycl/include/sycl/khr/split_headers/interop_handle.hpp similarity index 74% rename from sycl/include/sycl/khr/includes/interop_handle.hpp rename to sycl/include/sycl/khr/split_headers/interop_handle.hpp index e94f9ec50f3a1..db90e338a05b8 100644 --- a/sycl/include/sycl/khr/includes/interop_handle.hpp +++ b/sycl/include/sycl/khr/split_headers/interop_handle.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_INTEROP_HANDLE -#define __SYCL_KHR_INCLUDES_INTEROP_HANDLE +#ifndef __SYCL_KHR_SPLIT_HEADERS_INTEROP_HANDLE +#define __SYCL_KHR_SPLIT_HEADERS_INTEROP_HANDLE #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_INTEROP_HANDLE +#endif // __SYCL_KHR_SPLIT_HEADERS_INTEROP_HANDLE diff --git a/sycl/include/sycl/khr/includes/kernel_bundle.hpp b/sycl/include/sycl/khr/split_headers/kernel_bundle.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/kernel_bundle.hpp rename to sycl/include/sycl/khr/split_headers/kernel_bundle.hpp index 1938c5a2015a5..7d2a03b6a1283 100644 --- a/sycl/include/sycl/khr/includes/kernel_bundle.hpp +++ b/sycl/include/sycl/khr/split_headers/kernel_bundle.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_KERNEL_BUNDLE -#define __SYCL_KHR_INCLUDES_KERNEL_BUNDLE +#ifndef __SYCL_KHR_SPLIT_HEADERS_KERNEL_BUNDLE +#define __SYCL_KHR_SPLIT_HEADERS_KERNEL_BUNDLE #include "version.hpp" @@ -15,4 +15,4 @@ #include #include -#endif // __SYCL_KHR_INCLUDES_KERNEL_BUNDLE +#endif // __SYCL_KHR_SPLIT_HEADERS_KERNEL_BUNDLE diff --git a/sycl/include/sycl/khr/includes/kernel_handler.hpp b/sycl/include/sycl/khr/split_headers/kernel_handler.hpp similarity index 74% rename from sycl/include/sycl/khr/includes/kernel_handler.hpp rename to sycl/include/sycl/khr/split_headers/kernel_handler.hpp index c55436577dda8..0d350066136dd 100644 --- a/sycl/include/sycl/khr/includes/kernel_handler.hpp +++ b/sycl/include/sycl/khr/split_headers/kernel_handler.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_KERNEL_HANDLER -#define __SYCL_KHR_INCLUDES_KERNEL_HANDLER +#ifndef __SYCL_KHR_SPLIT_HEADERS_KERNEL_HANDLER +#define __SYCL_KHR_SPLIT_HEADERS_KERNEL_HANDLER #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_KERNEL_HANDLER +#endif // __SYCL_KHR_SPLIT_HEADERS_KERNEL_HANDLER diff --git a/sycl/include/sycl/khr/includes/marray.hpp b/sycl/include/sycl/khr/split_headers/marray.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/marray.hpp rename to sycl/include/sycl/khr/split_headers/marray.hpp index 0c4f3549cade5..a28537bf66b4b 100644 --- a/sycl/include/sycl/khr/includes/marray.hpp +++ b/sycl/include/sycl/khr/split_headers/marray.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_MARRAY -#define __SYCL_KHR_INCLUDES_MARRAY +#ifndef __SYCL_KHR_SPLIT_HEADERS_MARRAY +#define __SYCL_KHR_SPLIT_HEADERS_MARRAY #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_MARRAY +#endif // __SYCL_KHR_SPLIT_HEADERS_MARRAY diff --git a/sycl/include/sycl/khr/includes/math.hpp b/sycl/include/sycl/khr/split_headers/math.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/math.hpp rename to sycl/include/sycl/khr/split_headers/math.hpp index 411765cd5d6a9..ef500380fbc0c 100644 --- a/sycl/include/sycl/khr/includes/math.hpp +++ b/sycl/include/sycl/khr/split_headers/math.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_MATH -#define __SYCL_KHR_INCLUDES_MATH +#ifndef __SYCL_KHR_SPLIT_HEADERS_MATH +#define __SYCL_KHR_SPLIT_HEADERS_MATH #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_MATH +#endif // __SYCL_KHR_SPLIT_HEADERS_MATH diff --git a/sycl/include/sycl/khr/includes/multi_ptr.hpp b/sycl/include/sycl/khr/split_headers/multi_ptr.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/multi_ptr.hpp rename to sycl/include/sycl/khr/split_headers/multi_ptr.hpp index fc25d487156a7..8d7d1cb5e9c27 100644 --- a/sycl/include/sycl/khr/includes/multi_ptr.hpp +++ b/sycl/include/sycl/khr/split_headers/multi_ptr.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_MULTI_PTR -#define __SYCL_KHR_INCLUDES_MULTI_PTR +#ifndef __SYCL_KHR_SPLIT_HEADERS_MULTI_PTR +#define __SYCL_KHR_SPLIT_HEADERS_MULTI_PTR #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_MULTI_PTR +#endif // __SYCL_KHR_SPLIT_HEADERS_MULTI_PTR diff --git a/sycl/include/sycl/khr/includes/platform.hpp b/sycl/include/sycl/khr/split_headers/platform.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/platform.hpp rename to sycl/include/sycl/khr/split_headers/platform.hpp index a8902795916f5..77066ca0d4db8 100644 --- a/sycl/include/sycl/khr/includes/platform.hpp +++ b/sycl/include/sycl/khr/split_headers/platform.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_PLATFORM -#define __SYCL_KHR_INCLUDES_PLATFORM +#ifndef __SYCL_KHR_SPLIT_HEADERS_PLATFORM +#define __SYCL_KHR_SPLIT_HEADERS_PLATFORM #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_PLATFORM +#endif // __SYCL_KHR_SPLIT_HEADERS_PLATFORM diff --git a/sycl/include/sycl/khr/includes/property_list.hpp b/sycl/include/sycl/khr/split_headers/property_list.hpp similarity index 75% rename from sycl/include/sycl/khr/includes/property_list.hpp rename to sycl/include/sycl/khr/split_headers/property_list.hpp index e21e5f9de7c2d..874af17abaec2 100644 --- a/sycl/include/sycl/khr/includes/property_list.hpp +++ b/sycl/include/sycl/khr/split_headers/property_list.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_PROPERTY_LIST -#define __SYCL_KHR_INCLUDES_PROPERTY_LIST +#ifndef __SYCL_KHR_SPLIT_HEADERS_PROPERTY_LIST +#define __SYCL_KHR_SPLIT_HEADERS_PROPERTY_LIST #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_PROPERTY_LIST +#endif // __SYCL_KHR_SPLIT_HEADERS_PROPERTY_LIST diff --git a/sycl/include/sycl/khr/includes/queue.hpp b/sycl/include/sycl/khr/split_headers/queue.hpp similarity index 79% rename from sycl/include/sycl/khr/includes/queue.hpp rename to sycl/include/sycl/khr/split_headers/queue.hpp index 10a70465a2871..eb574d7355d61 100644 --- a/sycl/include/sycl/khr/includes/queue.hpp +++ b/sycl/include/sycl/khr/split_headers/queue.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_QUEUE -#define __SYCL_KHR_INCLUDES_QUEUE +#ifndef __SYCL_KHR_SPLIT_HEADERS_QUEUE +#define __SYCL_KHR_SPLIT_HEADERS_QUEUE #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_QUEUE +#endif // __SYCL_KHR_SPLIT_HEADERS_QUEUE diff --git a/sycl/include/sycl/khr/includes/reduction.hpp b/sycl/include/sycl/khr/split_headers/reduction.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/reduction.hpp rename to sycl/include/sycl/khr/split_headers/reduction.hpp index 80d9c37c2f73a..a4e64dac328d2 100644 --- a/sycl/include/sycl/khr/includes/reduction.hpp +++ b/sycl/include/sycl/khr/split_headers/reduction.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_REDUCTION -#define __SYCL_KHR_INCLUDES_REDUCTION +#ifndef __SYCL_KHR_SPLIT_HEADERS_REDUCTION +#define __SYCL_KHR_SPLIT_HEADERS_REDUCTION #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_REDUCTION +#endif // __SYCL_KHR_SPLIT_HEADERS_REDUCTION diff --git a/sycl/include/sycl/khr/includes/span.hpp b/sycl/include/sycl/khr/split_headers/span.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/span.hpp rename to sycl/include/sycl/khr/split_headers/span.hpp index d54b29d32336b..8eb6ddf0c94ec 100644 --- a/sycl/include/sycl/khr/includes/span.hpp +++ b/sycl/include/sycl/khr/split_headers/span.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_SPAN -#define __SYCL_KHR_INCLUDES_SPAN +#ifndef __SYCL_KHR_SPLIT_HEADERS_SPAN +#define __SYCL_KHR_SPLIT_HEADERS_SPAN #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_SPAN +#endif // __SYCL_KHR_SPLIT_HEADERS_SPAN diff --git a/sycl/include/sycl/khr/includes/stream.hpp b/sycl/include/sycl/khr/split_headers/stream.hpp similarity index 77% rename from sycl/include/sycl/khr/includes/stream.hpp rename to sycl/include/sycl/khr/split_headers/stream.hpp index b8bd74758120d..f3de59d090ae9 100644 --- a/sycl/include/sycl/khr/includes/stream.hpp +++ b/sycl/include/sycl/khr/split_headers/stream.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_STREAM -#define __SYCL_KHR_INCLUDES_STREAM +#ifndef __SYCL_KHR_SPLIT_HEADERS_STREAM +#define __SYCL_KHR_SPLIT_HEADERS_STREAM #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_STREAM +#endif // __SYCL_KHR_SPLIT_HEADERS_STREAM diff --git a/sycl/include/sycl/khr/includes/type_traits.hpp b/sycl/include/sycl/khr/split_headers/type_traits.hpp similarity index 76% rename from sycl/include/sycl/khr/includes/type_traits.hpp rename to sycl/include/sycl/khr/split_headers/type_traits.hpp index b3e6edcae736b..9593232493d5c 100644 --- a/sycl/include/sycl/khr/includes/type_traits.hpp +++ b/sycl/include/sycl/khr/split_headers/type_traits.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_TYPE_TRAITS -#define __SYCL_KHR_INCLUDES_TYPE_TRAITS +#ifndef __SYCL_KHR_SPLIT_HEADERS_TYPE_TRAITS +#define __SYCL_KHR_SPLIT_HEADERS_TYPE_TRAITS #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_TYPE_TRAITS +#endif // __SYCL_KHR_SPLIT_HEADERS_TYPE_TRAITS diff --git a/sycl/include/sycl/khr/includes/usm.hpp b/sycl/include/sycl/khr/split_headers/usm.hpp similarity index 80% rename from sycl/include/sycl/khr/includes/usm.hpp rename to sycl/include/sycl/khr/split_headers/usm.hpp index 64ab00c8151c2..78777e101aaa8 100644 --- a/sycl/include/sycl/khr/includes/usm.hpp +++ b/sycl/include/sycl/khr/split_headers/usm.hpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_USM -#define __SYCL_KHR_INCLUDES_USM +#ifndef __SYCL_KHR_SPLIT_HEADERS_USM +#define __SYCL_KHR_SPLIT_HEADERS_USM #include "version.hpp" #include #include -#endif // __SYCL_KHR_INCLUDES_USM +#endif // __SYCL_KHR_SPLIT_HEADERS_USM diff --git a/sycl/include/sycl/khr/includes/vec.hpp b/sycl/include/sycl/khr/split_headers/vec.hpp similarity index 78% rename from sycl/include/sycl/khr/includes/vec.hpp rename to sycl/include/sycl/khr/split_headers/vec.hpp index 6dda5243b73ea..90a3470bcbeb4 100644 --- a/sycl/include/sycl/khr/includes/vec.hpp +++ b/sycl/include/sycl/khr/split_headers/vec.hpp @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_VEC -#define __SYCL_KHR_INCLUDES_VEC +#ifndef __SYCL_KHR_SPLIT_HEADERS_VEC +#define __SYCL_KHR_SPLIT_HEADERS_VEC #include "version.hpp" #include -#endif // __SYCL_KHR_INCLUDES_VEC +#endif // __SYCL_KHR_SPLIT_HEADERS_VEC diff --git a/sycl/include/sycl/khr/includes/version.hpp b/sycl/include/sycl/khr/split_headers/version.hpp similarity index 91% rename from sycl/include/sycl/khr/includes/version.hpp rename to sycl/include/sycl/khr/split_headers/version.hpp index 07fc79ba15140..437a66a1c945f 100644 --- a/sycl/include/sycl/khr/includes/version.hpp +++ b/sycl/include/sycl/khr/split_headers/version.hpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef __SYCL_KHR_INCLUDES_VERSION -#define __SYCL_KHR_INCLUDES_VERSION +#ifndef __SYCL_KHR_SPLIT_HEADERS_VERSION +#define __SYCL_KHR_SPLIT_HEADERS_VERSION // SYCL_LANGUAGE_VERSION is currently defined by the compiler. // We emit a warning if is used without -fsycl flag, i.e. no @@ -31,4 +31,4 @@ // Extension-provided macro #include -#endif // __SYCL_KHR_INCLUDES_VERSION +#endif // __SYCL_KHR_SPLIT_HEADERS_VERSION diff --git a/sycl/include/sycl/sycl.hpp b/sycl/include/sycl/sycl.hpp index 5fa296a108be7..1c43d60ea23c0 100644 --- a/sycl/include/sycl/sycl.hpp +++ b/sycl/include/sycl/sycl.hpp @@ -33,7 +33,7 @@ can be disabled by setting SYCL_DISABLE_FSYCL_SYCLHPP_WARNING macro.") #undef __SYCL_STRINGIFY // All SYCL macro are provided through this header -#include +#include #include diff --git a/sycl/test/include_deps/sycl_khr_includes_bit.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_bit.hpp.cpp deleted file mode 100644 index bf8697a593020..0000000000000 --- a/sycl/test/include_deps/sycl_khr_includes_bit.hpp.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Use update_test.sh to (re-)generate the checks -// REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/bit.hpp | FileCheck %s - -// CHECK-LABEL: Dependencies for : -// CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/bit.hpp -// CHECK-NEXT: khr/includes/version.hpp -// CHECK-NEXT: detail/defines_elementary.hpp -// CHECK-NEXT: feature_test.hpp -// CHECK-NEXT: bit_cast.hpp -// CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_byte.hpp.cpp b/sycl/test/include_deps/sycl_khr_includes_byte.hpp.cpp deleted file mode 100644 index a399cd9d18b1d..0000000000000 --- a/sycl/test/include_deps/sycl_khr_includes_byte.hpp.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Use update_test.sh to (re-)generate the checks -// REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/byte.hpp | FileCheck %s - -// CHECK-LABEL: Dependencies for : -// CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/byte.hpp -// CHECK-NEXT: khr/includes/version.hpp -// CHECK-NEXT: detail/defines_elementary.hpp -// CHECK-NEXT: feature_test.hpp -// CHECK-NEXT: aliases.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 deleted file mode 100644 index 8b19443974f66..0000000000000 --- a/sycl/test/include_deps/sycl_khr_includes_functional.hpp.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// Use update_test.sh to (re-)generate the checks -// REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/functional.hpp | FileCheck %s - -// CHECK-LABEL: Dependencies for : -// CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/functional.hpp -// CHECK-NEXT: khr/includes/version.hpp -// CHECK-NEXT: detail/defines_elementary.hpp -// CHECK-NEXT: feature_test.hpp -// CHECK-NEXT: functional.hpp -// CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp similarity index 93% rename from sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp index adf21e5518287..2132b990a4f6d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_accessor.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_accessor.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/accessor.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/accessor.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/accessor.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/accessor.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: accessor.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_atomic.hpp.cpp similarity index 85% rename from sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_atomic.hpp.cpp index 3d062b3cd5365..a079b6c58fc51 100644 --- a/sycl/test/include_deps/sycl_khr_includes_atomic.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_atomic.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/atomic.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/atomic.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/atomic.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/atomic.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: atomic_fence.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_bit.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_bit.hpp.cpp new file mode 100644 index 0000000000000..5aba64de649c4 --- /dev/null +++ b/sycl/test/include_deps/sycl_khr_split_headers_bit.hpp.cpp @@ -0,0 +1,12 @@ +// Use update_test.sh to (re-)generate the checks +// REQUIRES: linux +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/bit.hpp | FileCheck %s + +// CHECK-LABEL: Dependencies for : +// CHECK-NEXT: /dev/null: /dev/null +// CHECK-NEXT: khr/split_headers/bit.hpp +// CHECK-NEXT: khr/split_headers/version.hpp +// CHECK-NEXT: detail/defines_elementary.hpp +// CHECK-NEXT: feature_test.hpp +// CHECK-NEXT: bit_cast.hpp +// CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp similarity index 85% rename from sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp index 2a32626b5964b..75b26bc319564 100644 --- a/sycl/test/include_deps/sycl_khr_includes_buffer.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_buffer.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/buffer.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/buffer.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/buffer.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/buffer.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: buffer.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_builtins_common.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_builtins_common.hpp.cpp similarity index 83% rename from sycl/test/include_deps/sycl_khr_includes_builtins_common.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_builtins_common.hpp.cpp index ebaa87f7bcc97..7e425ded55171 100644 --- a/sycl/test/include_deps/sycl_khr_includes_builtins_common.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_builtins_common.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/builtins_common.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/builtins_common.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/builtins_common.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/builtins_common.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: detail/builtins/common_functions.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_builtins_geometric.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_builtins_geometric.hpp.cpp similarity index 83% rename from sycl/test/include_deps/sycl_khr_includes_builtins_geometric.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_builtins_geometric.hpp.cpp index 6b8eb94290b6e..c56d719782c78 100644 --- a/sycl/test/include_deps/sycl_khr_includes_builtins_geometric.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_builtins_geometric.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/builtins_geometric.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/builtins_geometric.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/builtins_geometric.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/builtins_geometric.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: detail/builtins/geometric_functions.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_builtins_integer.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_builtins_integer.hpp.cpp similarity index 83% rename from sycl/test/include_deps/sycl_khr_includes_builtins_integer.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_builtins_integer.hpp.cpp index 3a2c94ed82d36..00830522fc6d5 100644 --- a/sycl/test/include_deps/sycl_khr_includes_builtins_integer.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_builtins_integer.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/builtins_integer.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/builtins_integer.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/builtins_integer.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/builtins_integer.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: detail/builtins/integer_functions.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_builtins_math.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_builtins_math.hpp.cpp similarity index 85% rename from sycl/test/include_deps/sycl_khr_includes_builtins_math.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_builtins_math.hpp.cpp index d8acbe0f90cce..286c6cd4909ea 100644 --- a/sycl/test/include_deps/sycl_khr_includes_builtins_math.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_builtins_math.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/builtins_math.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/builtins_math.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/builtins_math.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/builtins_math.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: detail/builtins/half_precision_math_functions.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_builtins_relational.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_builtins_relational.hpp.cpp similarity index 83% rename from sycl/test/include_deps/sycl_khr_includes_builtins_relational.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_builtins_relational.hpp.cpp index 22b9779717e46..6875e20dc8c35 100644 --- a/sycl/test/include_deps/sycl_khr_includes_builtins_relational.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_builtins_relational.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/builtins_relational.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/builtins_relational.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/builtins_relational.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/builtins_relational.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: detail/builtins/relational_functions.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_byte.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_byte.hpp.cpp new file mode 100644 index 0000000000000..8c7d2bf1a268e --- /dev/null +++ b/sycl/test/include_deps/sycl_khr_split_headers_byte.hpp.cpp @@ -0,0 +1,12 @@ +// Use update_test.sh to (re-)generate the checks +// REQUIRES: linux +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/byte.hpp | FileCheck %s + +// CHECK-LABEL: Dependencies for : +// CHECK-NEXT: /dev/null: /dev/null +// CHECK-NEXT: khr/split_headers/byte.hpp +// CHECK-NEXT: khr/split_headers/version.hpp +// CHECK-NEXT: detail/defines_elementary.hpp +// CHECK-NEXT: feature_test.hpp +// CHECK-NEXT: aliases.hpp +// CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_context.hpp.cpp similarity index 91% rename from sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_context.hpp.cpp index 9231c65b08d09..b5e04e9cd1b50 100644 --- a/sycl/test/include_deps/sycl_khr_includes_context.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_context.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/context.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/context.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/context.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/context.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: context.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_device.hpp.cpp similarity index 91% rename from sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_device.hpp.cpp index e5a91c198eb36..2747183c65e1b 100644 --- a/sycl/test/include_deps/sycl_khr_includes_device.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_device.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/device.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/device.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/device.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/device.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: aspects.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_event.hpp.cpp similarity index 90% rename from sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_event.hpp.cpp index 16453f24326bc..71606e6b9f65b 100644 --- a/sycl/test/include_deps/sycl_khr_includes_event.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_event.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/event.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/event.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/event.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/event.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: event.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_exception.hpp.cpp similarity index 59% rename from sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_exception.hpp.cpp index 50a068d4ce790..b4aab8b2b04f3 100644 --- a/sycl/test/include_deps/sycl_khr_includes_exception.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_exception.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/exception.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/exception.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/exception.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/exception.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: exception.hpp diff --git a/sycl/test/include_deps/sycl_khr_split_headers_functional.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_functional.hpp.cpp new file mode 100644 index 0000000000000..3eb8d79a870f6 --- /dev/null +++ b/sycl/test/include_deps/sycl_khr_split_headers_functional.hpp.cpp @@ -0,0 +1,12 @@ +// Use update_test.sh to (re-)generate the checks +// REQUIRES: linux +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/functional.hpp | FileCheck %s + +// CHECK-LABEL: Dependencies for : +// CHECK-NEXT: /dev/null: /dev/null +// CHECK-NEXT: khr/split_headers/functional.hpp +// CHECK-NEXT: khr/split_headers/version.hpp +// CHECK-NEXT: detail/defines_elementary.hpp +// CHECK-NEXT: feature_test.hpp +// CHECK-NEXT: functional.hpp +// CHECK-EMPTY: diff --git a/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_group_algorithms.hpp.cpp similarity index 89% rename from sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_group_algorithms.hpp.cpp index a129c1695e396..3cdbaa72e6c7d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_group_algorithms.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_group_algorithms.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/group_algorithms.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/group_algorithms.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/group_algorithms.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/group_algorithms.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: group_algorithm.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_groups.hpp.cpp similarity index 90% rename from sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_groups.hpp.cpp index 479ae302741dd..42db0d19e3dce 100644 --- a/sycl/test/include_deps/sycl_khr_includes_groups.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_groups.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/groups.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/groups.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/groups.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/groups.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: group.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_half.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_half.hpp.cpp similarity index 66% rename from sycl/test/include_deps/sycl_khr_includes_half.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_half.hpp.cpp index 5e96570a1abf8..c16c29bb03778 100644 --- a/sycl/test/include_deps/sycl_khr_includes_half.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_half.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/half.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/half.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/half.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/half.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: half_type.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp similarity index 96% rename from sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp index 056efa36f9f9d..74c1351320d4c 100644 --- a/sycl/test/include_deps/sycl_khr_includes_handler.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_handler.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/handler.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/handler.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/handler.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/handler.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: handler.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_hierarchical_parallelism.hpp.cpp similarity index 78% rename from sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_hierarchical_parallelism.hpp.cpp index 0f0b3dc999faa..27f60417ac251 100644 --- a/sycl/test/include_deps/sycl_khr_includes_hierarchical_parallelism.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_hierarchical_parallelism.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/hierarchical_parallelism.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/hierarchical_parallelism.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/hierarchical_parallelism.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/hierarchical_parallelism.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: group.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp similarity index 94% rename from sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp index 93c268a4839fe..f1bc5dfc0b374 100644 --- a/sycl/test/include_deps/sycl_khr_includes_images.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_images.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/images.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/images.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/images.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/images.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: accessor_image.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_index_space.hpp.cpp similarity index 81% rename from sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_index_space.hpp.cpp index ead6708f8bbd7..a9d924df408a7 100644 --- a/sycl/test/include_deps/sycl_khr_includes_index_space.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_index_space.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/index_space.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/index_space.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/index_space.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/index_space.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: id.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp similarity index 95% rename from sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp index 131eed485f774..1ed86cb9233d6 100644 --- a/sycl/test/include_deps/sycl_khr_includes_interop_handle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_interop_handle.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/interop_handle.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/interop_handle.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/interop_handle.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/interop_handle.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: interop_handle.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp similarity index 96% rename from sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp index 177654b969c04..b05b95aa61517 100644 --- a/sycl/test/include_deps/sycl_khr_includes_kernel_bundle.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_kernel_bundle.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/kernel_bundle.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/kernel_bundle.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/kernel_bundle.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/kernel_bundle.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: kernel.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_kernel_handler.hpp.cpp similarity index 58% rename from sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_kernel_handler.hpp.cpp index c244673d9c90a..8d1eefeca6d55 100644 --- a/sycl/test/include_deps/sycl_khr_includes_kernel_handler.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_kernel_handler.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/kernel_handler.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/kernel_handler.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/kernel_handler.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/kernel_handler.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: kernel_handler.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_marray.hpp.cpp similarity index 65% rename from sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_marray.hpp.cpp index 16c75e83649fc..50bdc1b8fa69d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_marray.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_marray.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/marray.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/marray.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/marray.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/marray.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: marray.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_math.hpp.cpp similarity index 88% rename from sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_math.hpp.cpp index 3004a8bf9d69b..43b64d8265ebe 100644 --- a/sycl/test/include_deps/sycl_khr_includes_math.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_math.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/math.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/math.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/math.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/math.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: builtins.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_multi_ptr.hpp.cpp similarity index 72% rename from sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_multi_ptr.hpp.cpp index 7e19c11cc8eb7..65f6dec370482 100644 --- a/sycl/test/include_deps/sycl_khr_includes_multi_ptr.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_multi_ptr.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/multi_ptr.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/multi_ptr.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/multi_ptr.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/multi_ptr.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: multi_ptr.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_platform.hpp.cpp similarity index 90% rename from sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_platform.hpp.cpp index 40c2e129fb113..bdee99c41ec4d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_platform.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_platform.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/platform.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/platform.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/platform.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/platform.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: platform.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_property_list.hpp.cpp similarity index 63% rename from sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_property_list.hpp.cpp index 27bb46ce8dd22..175a775731549 100644 --- a/sycl/test/include_deps/sycl_khr_includes_property_list.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_property_list.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/property_list.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/property_list.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/property_list.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/property_list.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: property_list.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp similarity index 96% rename from sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp index 83b4b262febff..dd1e0cf1a8369 100644 --- a/sycl/test/include_deps/sycl_khr_includes_queue.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_queue.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/queue.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/queue.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/queue.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/queue.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: properties/queue_properties.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp similarity index 97% rename from sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp index bf77fb2a9ccf6..b8e18fd95a5c8 100644 --- a/sycl/test/include_deps/sycl_khr_includes_reduction.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_reduction.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/reduction.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/reduction.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/reduction.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/reduction.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: properties/reduction_properties.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_span.hpp.cpp similarity index 53% rename from sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_span.hpp.cpp index a967332f8da1e..885eafdfddc36 100644 --- a/sycl/test/include_deps/sycl_khr_includes_span.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_span.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/span.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/span.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/span.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/span.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: sycl_span.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp similarity index 96% rename from sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp index 95382a355ade0..442dc12d38b82 100644 --- a/sycl/test/include_deps/sycl_khr_includes_stream.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_stream.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/stream.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/stream.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/stream.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/stream.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: stream.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_type_traits.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_type_traits.hpp.cpp similarity index 62% rename from sycl/test/include_deps/sycl_khr_includes_type_traits.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_type_traits.hpp.cpp index 6a6664f6babc0..a161e80055c6d 100644 --- a/sycl/test/include_deps/sycl_khr_includes_type_traits.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_type_traits.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/type_traits.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/type_traits.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/type_traits.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/type_traits.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: device_aspect_traits.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp similarity index 97% rename from sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp index b30819b20f7f2..e2d0c3c6aa7ae 100644 --- a/sycl/test/include_deps/sycl_khr_includes_usm.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_usm.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/usm.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/usm.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/usm.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/usm.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: usm.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_vec.hpp.cpp similarity index 82% rename from sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_vec.hpp.cpp index a1ae15861b480..ac5112175bc83 100644 --- a/sycl/test/include_deps/sycl_khr_includes_vec.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_vec.hpp.cpp @@ -1,11 +1,11 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/vec.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/vec.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/vec.hpp -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/vec.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-NEXT: vector.hpp diff --git a/sycl/test/include_deps/sycl_khr_includes_version.hpp.cpp b/sycl/test/include_deps/sycl_khr_split_headers_version.hpp.cpp similarity index 50% rename from sycl/test/include_deps/sycl_khr_includes_version.hpp.cpp rename to sycl/test/include_deps/sycl_khr_split_headers_version.hpp.cpp index ee44fc03bdc2c..e2252d703fad8 100644 --- a/sycl/test/include_deps/sycl_khr_includes_version.hpp.cpp +++ b/sycl/test/include_deps/sycl_khr_split_headers_version.hpp.cpp @@ -1,10 +1,10 @@ // Use update_test.sh to (re-)generate the checks // REQUIRES: linux -// RUN: bash %S/deps_known.sh sycl/khr/includes/version.hpp | FileCheck %s +// RUN: bash %S/deps_known.sh sycl/khr/split_headers/version.hpp | FileCheck %s -// CHECK-LABEL: Dependencies for : +// CHECK-LABEL: Dependencies for : // CHECK-NEXT: /dev/null: /dev/null -// CHECK-NEXT: khr/includes/version.hpp +// CHECK-NEXT: khr/split_headers/version.hpp // CHECK-NEXT: detail/defines_elementary.hpp // CHECK-NEXT: feature_test.hpp // CHECK-EMPTY: diff --git a/sycl/test/regression/khr_includes_builtins_common.cpp b/sycl/test/regression/khr_includes_builtins_common.cpp index e703a79c3b7f6..ac8d17f1b4116 100644 --- a/sycl/test/regression/khr_includes_builtins_common.cpp +++ b/sycl/test/regression/khr_includes_builtins_common.cpp @@ -1,8 +1,8 @@ // RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations %s -#include -#include -#include +#include +#include +#include #include diff --git a/sycl/test/regression/khr_includes_builtins_geometric.cpp b/sycl/test/regression/khr_includes_builtins_geometric.cpp index f804f635ef444..7ab994c7310ce 100644 --- a/sycl/test/regression/khr_includes_builtins_geometric.cpp +++ b/sycl/test/regression/khr_includes_builtins_geometric.cpp @@ -1,8 +1,8 @@ // RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations %s -#include -#include -#include +#include +#include +#include #include diff --git a/sycl/test/regression/khr_includes_builtins_integer.cpp b/sycl/test/regression/khr_includes_builtins_integer.cpp index a0c2e3ff19254..7a230b5766e9b 100644 --- a/sycl/test/regression/khr_includes_builtins_integer.cpp +++ b/sycl/test/regression/khr_includes_builtins_integer.cpp @@ -1,8 +1,8 @@ // RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations %s -#include -#include -#include +#include +#include +#include #include #include diff --git a/sycl/test/regression/khr_includes_builtins_math.cpp b/sycl/test/regression/khr_includes_builtins_math.cpp index 81fa67c720208..af3bb371a6a11 100644 --- a/sycl/test/regression/khr_includes_builtins_math.cpp +++ b/sycl/test/regression/khr_includes_builtins_math.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations %s -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/sycl/test/regression/khr_includes_builtins_relational.cpp b/sycl/test/regression/khr_includes_builtins_relational.cpp index cec7084a8208d..cc1941c34b886 100644 --- a/sycl/test/regression/khr_includes_builtins_relational.cpp +++ b/sycl/test/regression/khr_includes_builtins_relational.cpp @@ -1,8 +1,8 @@ // RUN: %clangxx -fsycl -fsyntax-only -Wno-deprecated-declarations %s -#include -#include -#include +#include +#include +#include #include #include From 87894a8010f831585927d825ba184a76bd7d7224 Mon Sep 17 00:00:00 2001 From: y Date: Mon, 18 May 2026 09:01:25 -0700 Subject: [PATCH 2/2] Fix update_test.sh to match new header paths --- sycl/test/include_deps/update_test.sh | 78 +++++++++++++-------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/sycl/test/include_deps/update_test.sh b/sycl/test/include_deps/update_test.sh index 96d4fd4038956..6bac1ab4b56be 100755 --- a/sycl/test/include_deps/update_test.sh +++ b/sycl/test/include_deps/update_test.sh @@ -7,47 +7,47 @@ HEADERS=( sycl/detail/core.hpp - sycl/khr/includes/accessor.hpp - sycl/khr/includes/atomic.hpp + sycl/khr/split_headers/accessor.hpp + sycl/khr/split_headers/atomic.hpp # backend header depends on how the project was configured and as such it # is not exactly portable, so it is excluded - # sycl/khr/includes/backend - sycl/khr/includes/bit.hpp - sycl/khr/includes/buffer.hpp - sycl/khr/includes/byte.hpp - sycl/khr/includes/builtins_common.hpp - sycl/khr/includes/builtins_geometric.hpp - sycl/khr/includes/builtins_integer.hpp - sycl/khr/includes/builtins_math.hpp - sycl/khr/includes/builtins_relational.hpp - sycl/khr/includes/context.hpp - sycl/khr/includes/device.hpp - sycl/khr/includes/event.hpp - sycl/khr/includes/exception.hpp - sycl/khr/includes/functional.hpp - sycl/khr/includes/group_algorithms.hpp - sycl/khr/includes/groups.hpp - sycl/khr/includes/half.hpp - sycl/khr/includes/handler.hpp - sycl/khr/includes/hierarchical_parallelism.hpp - sycl/khr/includes/images.hpp - sycl/khr/includes/index_space.hpp - sycl/khr/includes/interop_handle.hpp - sycl/khr/includes/kernel_bundle.hpp - sycl/khr/includes/kernel_handler.hpp - sycl/khr/includes/marray.hpp - sycl/khr/includes/math.hpp - sycl/khr/includes/multi_ptr.hpp - sycl/khr/includes/platform.hpp - sycl/khr/includes/property_list.hpp - sycl/khr/includes/queue.hpp - sycl/khr/includes/reduction.hpp - sycl/khr/includes/span.hpp - sycl/khr/includes/stream.hpp - sycl/khr/includes/type_traits.hpp - sycl/khr/includes/usm.hpp - sycl/khr/includes/vec.hpp - sycl/khr/includes/version.hpp + # sycl/khr/split_headers/backend + sycl/khr/split_headers/bit.hpp + sycl/khr/split_headers/buffer.hpp + sycl/khr/split_headers/byte.hpp + sycl/khr/split_headers/builtins_common.hpp + sycl/khr/split_headers/builtins_geometric.hpp + sycl/khr/split_headers/builtins_integer.hpp + sycl/khr/split_headers/builtins_math.hpp + sycl/khr/split_headers/builtins_relational.hpp + sycl/khr/split_headers/context.hpp + sycl/khr/split_headers/device.hpp + sycl/khr/split_headers/event.hpp + sycl/khr/split_headers/exception.hpp + sycl/khr/split_headers/functional.hpp + sycl/khr/split_headers/group_algorithms.hpp + sycl/khr/split_headers/groups.hpp + sycl/khr/split_headers/half.hpp + sycl/khr/split_headers/handler.hpp + sycl/khr/split_headers/hierarchical_parallelism.hpp + sycl/khr/split_headers/images.hpp + sycl/khr/split_headers/index_space.hpp + sycl/khr/split_headers/interop_handle.hpp + sycl/khr/split_headers/kernel_bundle.hpp + sycl/khr/split_headers/kernel_handler.hpp + sycl/khr/split_headers/marray.hpp + sycl/khr/split_headers/math.hpp + sycl/khr/split_headers/multi_ptr.hpp + sycl/khr/split_headers/platform.hpp + sycl/khr/split_headers/property_list.hpp + sycl/khr/split_headers/queue.hpp + sycl/khr/split_headers/reduction.hpp + sycl/khr/split_headers/span.hpp + sycl/khr/split_headers/stream.hpp + sycl/khr/split_headers/type_traits.hpp + sycl/khr/split_headers/usm.hpp + sycl/khr/split_headers/vec.hpp + sycl/khr/split_headers/version.hpp ) for x in ${HEADERS[@]} ; do