Rename headers to match KHR

sycl/include/sycl/khr/includes/accessor.hpp → 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 <sycl/accessor.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_ACCESSOR
+#endif // __SYCL_KHR_SPLIT_HEADERS_ACCESSOR

sycl/include/sycl/khr/includes/atomic.hpp → 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 <sycl/atomic_fence.hpp>
 #include <sycl/atomic_ref.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_ATOMIC
+#endif // __SYCL_KHR_SPLIT_HEADERS_ATOMIC

sycl/include/sycl/khr/includes/backend.hpp → 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 <sycl/backend.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BACKEND
+#endif // __SYCL_KHR_SPLIT_HEADERS_BACKEND

sycl/include/sycl/khr/includes/bit.hpp → 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 <sycl/bit_cast.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BIT
+#endif // __SYCL_KHR_SPLIT_HEADERS_BIT

sycl/include/sycl/khr/includes/buffer.hpp → 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 <sycl/buffer.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUFFER
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUFFER

sycl/include/sycl/khr/includes/builtins_common.hpp → sycl/include/sycl/khr/split_headers/builtins_common.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/detail/defines_elementary.hpp>
 
 #include <sycl/detail/builtins/common_functions.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUILTINS_COMMON
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_COMMON

sycl/include/sycl/khr/includes/builtins_geometric.hpp → sycl/include/sycl/khr/split_headers/builtins_geometric.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/detail/defines_elementary.hpp>
 
 #include <sycl/detail/builtins/geometric_functions.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUILTINS_GEOMETRIC
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_GEOMETRIC

sycl/include/sycl/khr/includes/builtins_integer.hpp → sycl/include/sycl/khr/split_headers/builtins_integer.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/detail/defines_elementary.hpp>
 
 #include <sycl/detail/builtins/integer_functions.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUILTINS_INTEGER
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_INTEGER

sycl/include/sycl/khr/includes/builtins_math.hpp → 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 <sycl/detail/builtins/math_functions.hpp>
 #include <sycl/detail/builtins/native_math_functions.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUILTINS_MATH
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_MATH

sycl/include/sycl/khr/includes/builtins_relational.hpp → sycl/include/sycl/khr/split_headers/builtins_relational.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/detail/defines_elementary.hpp>
 
 #include <sycl/detail/builtins/relational_functions.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BUILTINS_RELATIONAL
+#endif // __SYCL_KHR_SPLIT_HEADERS_BUILTINS_RELATIONAL

sycl/include/sycl/khr/includes/byte.hpp → 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 <sycl/aliases.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_BYTE
+#endif // __SYCL_KHR_SPLIT_HEADERS_BYTE

sycl/include/sycl/khr/includes/context.hpp → 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 <sycl/context.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_CONTEXT
+#endif // __SYCL_KHR_SPLIT_HEADERS_CONTEXT

sycl/include/sycl/khr/includes/device.hpp → 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 <sycl/aspects.hpp>
 #include <sycl/device.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_DEVICE
+#endif // __SYCL_KHR_SPLIT_HEADERS_DEVICE

sycl/include/sycl/khr/includes/event.hpp → 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 <sycl/event.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_EVENT
+#endif // __SYCL_KHR_SPLIT_HEADERS_EVENT

sycl/include/sycl/khr/includes/exception.hpp → 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 <sycl/exception.hpp>
 #include <sycl/exception_list.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_EXCEPTION
+#endif // __SYCL_KHR_SPLIT_HEADERS_EXCEPTION

sycl/include/sycl/khr/includes/functional.hpp → 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 <sycl/functional.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_FUNCTIONAL
+#endif // __SYCL_KHR_SPLIT_HEADERS_FUNCTIONAL

sycl/include/sycl/khr/includes/group_algorithms.hpp → 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 <sycl/group_algorithm.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS
+#endif // __SYCL_KHR_SPLIT_HEADERS_GROUP_ALGORITHMS

sycl/include/sycl/khr/includes/groups.hpp → 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 <sycl/group_barrier.hpp>
 #include <sycl/sub_group.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_GROUPS
+#endif // __SYCL_KHR_SPLIT_HEADERS_GROUPS

sycl/include/sycl/khr/includes/half.hpp → 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 <sycl/half_type.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_HALF
+#endif // __SYCL_KHR_SPLIT_HEADERS_HALF

sycl/include/sycl/khr/includes/handler.hpp → 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 <sycl/handler.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_HANDLER
+#endif // __SYCL_KHR_SPLIT_HEADERS_HANDLER

sycl/include/sycl/khr/includes/hierarchical_parallelism.hpp → 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 <sycl/group.hpp>
 #include <sycl/h_item.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM
+#endif // __SYCL_KHR_SPLIT_HEADERS_HIERARCHICAL_PARALLELISM

sycl/include/sycl/khr/includes/images.hpp → sycl/include/sycl/khr/split_headers/images.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/accessor_image.hpp>
 #include <sycl/image.hpp>
 #include <sycl/properties/image_properties.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_IMAGE
+#endif // __SYCL_KHR_SPLIT_HEADERS_IMAGE

sycl/include/sycl/khr/includes/index_space.hpp → 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 <sycl/nd_range.hpp>
 #include <sycl/range.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_INDEX_SPACE
+#endif // __SYCL_KHR_SPLIT_HEADERS_INDEX_SPACE

sycl/include/sycl/khr/includes/interop_handle.hpp → 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 <sycl/interop_handle.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_INTEROP_HANDLE
+#endif // __SYCL_KHR_SPLIT_HEADERS_INTEROP_HANDLE

sycl/include/sycl/khr/includes/kernel_bundle.hpp → sycl/include/sycl/khr/split_headers/kernel_bundle.hpp

@@ -6,13 +6,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#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"
 
 #include <sycl/kernel.hpp>
 #include <sycl/kernel_bundle.hpp>
 #include <sycl/specialization_id.hpp>
 
-#endif // __SYCL_KHR_INCLUDES_KERNEL_BUNDLE
+#endif // __SYCL_KHR_SPLIT_HEADERS_KERNEL_BUNDLE