Merge from 'sycl' to 'sycl-web'

Author: iclsrc

sycl/CMakeLists.txt

@@ -313,7 +313,7 @@ endif()
 # environment
 if (NOT MSVC)
   if (SYCL_BUILD_PI_ESIMD_EMULATOR)
-    list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS pi_esimd_cpu libcmrt-headers)
+    list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS pi_esimd_emulator libcmrt-headers)
     if (MSVC)
       list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS libcmrt-libs libcmrt-dlls)
     else()

sycl/include/CL/__spirv/spirv_ops.hpp

@@ -1,4 +1,4 @@
-//==---------- spirv_ops.hpp --- SPIRV operations -------------------------==//
+//==----------- spirv_ops.hpp --- SPIRV operations -------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/__spirv/spirv_types.hpp

@@ -1,4 +1,4 @@
-//===----------- spirv_types.hpp --- SPIRV types -------------------------===//
+//===------------ spirv_types.hpp --- SPIRV types -------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/__spirv/spirv_vars.hpp

@@ -1,4 +1,4 @@
-//==---------- spirv_vars.hpp --- SPIRV variables -------------------------==//
+//==----------- spirv_vars.hpp --- SPIRV variables -------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/sycl/aspects.hpp

@@ -1,4 +1,4 @@
-//==-------------- aspects.hpp - SYCL Aspect Enums ------------*- C++ -*---==//
+//==--------------- aspects.hpp - SYCL Aspect Enums ------------*- C++ -*---==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/sycl/backend/cuda.hpp

@@ -41,7 +41,9 @@ template <> struct interop<backend::cuda, queue> { using type = CUstream; };
 
 template <> struct interop<backend::cuda, event> { using type = CUevent; };
 
+#ifdef __SYCL_INTERNAL_API
 template <> struct interop<backend::cuda, program> { using type = CUmodule; };
+#endif
 
 template <typename DataT, int Dimensions, access::mode AccessMode>
 struct interop<backend::cuda,

sycl/include/CL/sycl/backend/opencl.hpp

@@ -37,9 +37,11 @@ template <> struct interop<backend::opencl, queue> {
   using type = cl_command_queue;
 };
 
+#ifdef __SYCL_INTERNAL_API
 template <> struct interop<backend::opencl, program> {
   using type = cl_program;
 };
+#endif
 
 template <> struct interop<backend::opencl, event> { using type = cl_event; };
 
@@ -110,8 +112,10 @@ namespace opencl {
 __SYCL_EXPORT platform make_platform(pi_native_handle NativeHandle);
 __SYCL_EXPORT device make_device(pi_native_handle NativeHandle);
 __SYCL_EXPORT context make_context(pi_native_handle NativeHandle);
+#ifdef __SYCL_INTERNAL_API
 __SYCL_EXPORT program make_program(const context &Context,
                                    pi_native_handle NativeHandle);
+#endif
 __SYCL_EXPORT queue make_queue(const context &Context,
                                pi_native_handle InteropHandle);
 
@@ -137,12 +141,14 @@ T make(typename interop<backend::opencl, T>::type Interop) {
 }
 
 // Construction of SYCL program.
+#ifdef __SYCL_INTERNAL_API
 template <typename T, typename detail::enable_if_t<
                           std::is_same<T, program>::value> * = nullptr>
 T make(const context &Context,
        typename interop<backend::opencl, T>::type Interop) {
   return make_program(Context, detail::pi::cast<pi_native_handle>(Interop));
 }
+#endif
 
 // Construction of SYCL queue.
 template <typename T, typename detail::enable_if_t<

sycl/include/CL/sycl/detail/hip_definitions.hpp

@@ -1,4 +1,4 @@
-//==------------ hip_definitions.hpp - SYCL HIP backend -------------------==//
+//==------------- hip_definitions.hpp - SYCL HIP backend -------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/sycl/detail/item_base.hpp

@@ -1,4 +1,4 @@
-//==---------- item_base.hpp --- SYCL iteration ItemBase ------------------==//
+//==----------- item_base.hpp --- SYCL iteration ItemBase ------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/sycl/detail/pi.hpp

@@ -65,13 +65,13 @@ bool trace(TraceLevel level);
 #define __SYCL_OPENCL_PLUGIN_NAME "pi_opencl.dll"
 #define __SYCL_LEVEL_ZERO_PLUGIN_NAME "pi_level_zero.dll"
 #define __SYCL_CUDA_PLUGIN_NAME "pi_cuda.dll"
-#define __SYCL_ESIMD_CPU_PLUGIN_NAME "pi_esimd_cpu.dll"
+#define __SYCL_ESIMD_EMULATOR_PLUGIN_NAME "pi_esimd_emulator.dll"
 #define __SYCL_HIP_PLUGIN_NAME "libpi_hip.dll"
 #else
 #define __SYCL_OPENCL_PLUGIN_NAME "libpi_opencl.so"
 #define __SYCL_LEVEL_ZERO_PLUGIN_NAME "libpi_level_zero.so"
 #define __SYCL_CUDA_PLUGIN_NAME "libpi_cuda.so"
-#define __SYCL_ESIMD_CPU_PLUGIN_NAME "libpi_esimd_cpu.so"
+#define __SYCL_ESIMD_EMULATOR_PLUGIN_NAME "libpi_esimd_emulator.so"
 #define __SYCL_HIP_PLUGIN_NAME "libpi_hip.so"
 #endif