[SYCL] Implement sycl_khr_includes extension

sycl/include/sycl/define_vendors.hpp

@@ -9,5 +9,4 @@
 #pragma once
 
 #define SYCL_IMPLEMENTATION_ONEAPI
-#define SYCL_FEATURE_SET_FULL
 #define SYCL_IMPLEMENTATION_INTEL

sycl/include/sycl/detail/is_device_copyable.hpp

@@ -14,11 +14,6 @@
 #include <type_traits>
 #include <variant>
 
-/// This macro must be defined to 1 when SYCL implementation allows user
-/// applications to explicitly declare certain class types as device copyable
-/// by adding specializations of is_device_copyable type trait class.
-#define SYCL_DEVICE_COPYABLE 1
-
 namespace sycl {
 inline namespace _V1 {
 /// is_device_copyable is a user specializable class template to indicate

sycl/include/sycl/detail/spirv.hpp

@@ -17,18 +17,17 @@
 #include <sycl/__spirv/spirv_ops.hpp>
 #include <sycl/__spirv/spirv_types.hpp>
 
-#include <sycl/access/access.hpp>
-#include <sycl/detail/generic_type_traits.hpp>
-#include <sycl/id.hpp>
-#include <sycl/memory_enums.hpp>
-#include <sycl/multi_ptr.hpp>
-
 #if defined(__NVPTX__)
 #include <sycl/ext/oneapi/experimental/cuda/masked_shuffles.hpp>
 #endif
 
+#include <sycl/aliases.hpp>
+#include <sycl/detail/generic_type_traits.hpp>
 #include <sycl/detail/memcpy.hpp> // sycl::detail::memcpy
 #include <sycl/detail/type_traits.hpp>
+#include <sycl/half_type.hpp>
+#include <sycl/id.hpp>
+#include <sycl/multi_ptr.hpp>
 
 namespace sycl {
 inline namespace _V1 {

sycl/include/sycl/khr/includes/accessor.hpp

@@ -0,0 +1,16 @@
+//==-------- accessor --- SYCL accessor classes definition -----*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_ACCESSOR
+#define __SYCL_KHR_INCLUDES_ACCESSOR
+
+#include "version.hpp"
+
+#include <sycl/accessor.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_ACCESSOR

sycl/include/sycl/khr/includes/atomic.hpp

@@ -0,0 +1,17 @@
+//==---------- atomic --- SYCL atomic_ref class definition -----*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_ATOMIC
+#define __SYCL_KHR_INCLUDES_ATOMIC
+
+#include "version.hpp"
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/atomic_fence.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_ATOMIC

sycl/include/sycl/khr/includes/backend.hpp

@@ -0,0 +1,14 @@
+//==--------- backend --- SYCL backend interoperability --------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_BACKEND
+#define __SYCL_KHR_INCLUDES_BACKEND
+
+#include <sycl/backend.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_BACKEND

sycl/include/sycl/khr/includes/bit.hpp

@@ -0,0 +1,16 @@
+//==--------- bit --- SYCL pre-adopted C++20 features ----------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_BIT
+#define __SYCL_KHR_INCLUDES_BIT
+
+#include "version.hpp"
+
+#include <sycl/bit_cast.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_BIT

sycl/include/sycl/khr/includes/buffer.hpp

@@ -0,0 +1,16 @@
+//==------------- buffer --- SYCL buffer class definition ------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_BUFFER
+#define __SYCL_KHR_INCLUDES_BUFFER
+
+#include "version.hpp"
+
+#include <sycl/buffer.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_BUFFER

sycl/include/sycl/khr/includes/byte.hpp

@@ -0,0 +1,16 @@
+//==--------- byte --- SYCL byte pre-adopted from C++17 --------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_BYTE
+#define __SYCL_KHR_INCLUDES_BYTE
+
+#include "version.hpp"
+
+#include <sycl/aliases.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_BYTE

sycl/include/sycl/khr/includes/context.hpp

@@ -0,0 +1,16 @@
+//==---------------- context --- SYCL context class ------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_CONTEXT
+#define __SYCL_KHR_INCLUDES_CONTEXT
+
+#include "version.hpp"
+
+#include <sycl/context.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_CONTEXT

sycl/include/sycl/khr/includes/device.hpp

@@ -0,0 +1,17 @@
+//==------------------ device --- SYCL device class ------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_DEVICE
+#define __SYCL_KHR_INCLUDES_DEVICE
+
+#include <sycl/khr/includes/version.hpp>
+
+#include <sycl/device.hpp>
+#include <sycl/aspects.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_DEVICE

sycl/include/sycl/khr/includes/event.hpp

@@ -0,0 +1,16 @@
+//==----------------- event --- SYCL event class ---------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_EVENT
+#define __SYCL_KHR_INCLUDES_EVENT
+
+#include "version.hpp"
+
+#include <sycl/event.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_EVENT

sycl/include/sycl/khr/includes/exception.hpp

@@ -0,0 +1,17 @@
+//==------------------ exception --- SYCL exceptions -----------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_EXCEPTION
+#define __SYCL_KHR_INCLUDES_EXCEPTION
+
+#include "version.hpp"
+
+#include <sycl/exception.hpp>
+#include <sycl/exception_list.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_EXCEPTION

sycl/include/sycl/khr/includes/functional.hpp

@@ -0,0 +1,16 @@
+//==-------------- functional --- SYCL function objects --------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_FUNCTIONAL
+#define __SYCL_KHR_INCLUDES_FUNCTIONAL
+
+#include "version.hpp"
+
+#include <sycl/functional.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_FUNCTIONAL

sycl/include/sycl/khr/includes/group_algorithms.hpp

@@ -0,0 +1,16 @@
+//==--------------------- group_algorithms ---------------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS
+#define __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS
+
+#include "version.hpp"
+
+#include <sycl/group_algorithm.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_GROUP_ALGORITHMS

sycl/include/sycl/khr/includes/groups.hpp

@@ -0,0 +1,19 @@
+//==----------------- groups --- SYCL group classes ------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_GROUPS
+#define __SYCL_KHR_INCLUDES_GROUPS
+
+#include "version.hpp"
+
+#include <sycl/group.hpp>
+#include <sycl/sub_group.hpp>
+#include <sycl/group_algorithm.hpp>
+#include <sycl/group_barrier.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_GROUPS

sycl/include/sycl/khr/includes/half.hpp

@@ -0,0 +1,16 @@
+//==------------- half --- SYCL half data type definition ------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_HALF
+#define __SYCL_KHR_INCLUDES_HALF
+
+#include "version.hpp"
+
+#include <sycl/half_type.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_HALF

sycl/include/sycl/khr/includes/handler.hpp

@@ -0,0 +1,16 @@
+//==--------- handler --- SYCL handler class definition --------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_HANDLER
+#define __SYCL_KHR_INCLUDES_HANDLER
+
+#include "version.hpp"
+
+#include <sycl/handler.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_HANDLER

sycl/include/sycl/khr/includes/hierarchical_parallelism.hpp

@@ -0,0 +1,18 @@
+//==- hierarchical_parallelism - SYCL hierarchical parallelism -*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM
+#define __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM
+
+#include "version.hpp"
+
+#include <sycl/h_item.hpp>
+// TODO: private_memory should be outlined into its own header
+#include <sycl/group.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_HIERARCHICAL_PARALLELISM

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

@@ -0,0 +1,18 @@
+//==------------------ image --- SYCL images  ------------------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_IMAGE
+#define __SYCL_KHR_INCLUDES_IMAGE
+
+#include "version.hpp"
+
+#include <sycl/image.hpp>
+#include <sycl/accessor_image.hpp>
+#include <sycl/properties/image_properties.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_IMAGE

sycl/include/sycl/khr/includes/index_space.hpp

@@ -0,0 +1,22 @@
+//==--------- index_space --- SYCL index space classes ---------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_INDEX_SPACE
+#define __SYCL_KHR_INCLUDES_INDEX_SPACE
+
+#include "version.hpp"
+
+#include <sycl/id.hpp>
+#include <sycl/range.hpp>
+#include <sycl/nd_range.hpp>
+#include <sycl/item.hpp>
+#include <sycl/nd_item.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_INDEX_SPACE
+
+

sycl/include/sycl/khr/includes/interop_handle.hpp

@@ -0,0 +1,16 @@
+//==------ interop_handle --- SYCL interop_handle class --------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_INTEROP_HANDLE
+#define __SYCL_KHR_INCLUDES_INTEROP_HANDLE
+
+#include "version.hpp"
+
+#include <sycl/interop_handle.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_INTEROP_HANDLE

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

@@ -0,0 +1,18 @@
+//==---------- kernel_bundle --- SYCL kernel bundles -----------*- C++ -*---==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __SYCL_KHR_INCLUDES_KERNEL_BUNDLE
+#define __SYCL_KHR_INCLUDES_KERNEL_BUNDLE
+
+#include "version.hpp"
+
+#include <sycl/kernel_bundle.hpp>
+#include <sycl/kernel.hpp>
+#include <sycl/specialization_id.hpp>
+
+#endif // __SYCL_KHR_INCLUDES_KERNEL_BUNDLE