Apply review comment

Author: vladimirlaz

buildbot/configure.py

@@ -29,7 +29,7 @@ def do_configure(args):
     libclc_targets_to_build = ''
     libclc_gen_remangled_variants = 'OFF'
     sycl_build_pi_cuda = 'OFF'
-    sycl_build_pi_esimd_cpu = 'OFF'
+    sycl_build_pi_esimd_emulator = 'OFF'
     sycl_build_pi_hip = 'OFF'
     sycl_build_pi_hip_platform = 'AMD'
     sycl_werror = 'ON'
@@ -51,7 +51,7 @@ def do_configure(args):
         llvm_targets_to_build = 'ARM;AArch64'
 
     if args.enable_esimd_cpu_emulation:
-        sycl_build_pi_esimd_cpu = 'ON'
+        sycl_build_pi_esimd_emulator = 'ON'
 
     if args.cuda or args.hip:
         llvm_enable_projects += ';libclc'
@@ -123,7 +123,7 @@ def do_configure(args):
         "-DBUILD_SHARED_LIBS={}".format(llvm_build_shared_libs),
         "-DSYCL_ENABLE_XPTI_TRACING={}".format(sycl_enable_xpti_tracing),
         "-DLLVM_ENABLE_LLD={}".format(llvm_enable_lld),
-        "-DSYCL_BUILD_PI_ESIMD_CPU={}".format(sycl_build_pi_esimd_cpu)
+        "-DSYCL_BUILD_PI_ESIMD_EMULATOR={}".format(sycl_build_pi_esimd_emulator)
     ]
 
     if args.l0_headers and args.l0_loader:

sycl/.gitignore

@@ -1 +1,2 @@
 include/CL/sycl/version.hpp
+include/CL/sycl/feature_test.hpp

sycl/CMakeLists.txt

@@ -100,6 +100,8 @@ set(sycl_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
 string(TIMESTAMP __SYCL_COMPILER_VERSION "%Y%m%d")
 set(version_header "${sycl_inc_dir}/CL/sycl/version.hpp")
 configure_file("${version_header}.in" "${version_header}")
+set(feature_header "${sycl_inc_dir}/CL/sycl/feature_test.hpp")
+configure_file("${feature_header}.in" "${feature_header}")
 
 # Copy SYCL headers from sources to build directory
 add_custom_target(sycl-headers ALL
@@ -294,7 +296,7 @@ endif()
 # TODO : Remove 'if (NOT MSVC)' when CM_EMU supports Windows
 # environment
 if (NOT MSVC)
-  if (SYCL_BUILD_PI_ESIMD_CPU)
+  if (SYCL_BUILD_PI_ESIMD_EMULATOR)
     list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS pi_esimd_cpu libcmrt-headers)
     if (MSVC)
       list(APPEND SYCL_TOOLCHAIN_DEPLOY_COMPONENTS libcmrt-libs libcmrt-dlls)

sycl/include/CL/sycl/backend_types.hpp

@@ -26,7 +26,9 @@ enum class backend : char {
       ext_oneapi_level_zero,
   cuda = 3,
   all = 4,
-  esimd_cpu = 5,
+  ext_intel_esimd_emulator = 5,
+  esimd_cpu = __SYCL2020_DEPRECATED("use 'ext_oneapi_esimd_emulator' instead") =
+      ext_intel_esimd_emulator,
   hip = 6,
 };
 

sycl/include/CL/sycl/feature_test.hpp renamed to sycl/include/CL/sycl/feature_test.hpp.in

@@ -29,9 +29,15 @@ namespace sycl {
 #define SYCL_EXT_INTEL_MEM_CHANNEL_PROPERTY 1
 #define SYCL_EXT_INTEL_USM_ADDRESS_SPACES 1
 #define SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO 1
+#if ${SYCL_BUILD_PI_CUDA}
 #define SYCL_EXT_ONEAPI_BACKEND_CUDA 1
-#define SYCL_EXT_INTEL_BACKEND_ESIMD_CPU 1
+#endif
+#if ${SYCL_BUILD_PI_ESIMD_EMULATOR}
+#define SYCL_EXT_INTEL_BACKEND_ESIMD_EMULATOR 1
+#endif
+#if ${SYCL_BUILD_PI_HIP}
 #define SYCL_EXT_ONEAPI_BACKEND_HIP 1
+#endif
 
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/plugins/CMakeLists.txt

@@ -18,7 +18,7 @@ add_subdirectory(level_zero)
 # TODO : Remove 'if (NOT MSVC)' when CM_EMU supports Windows
 # environment
 if (NOT MSVC)
-  if (SYCL_BUILD_PI_ESIMD_CPU)
+  if (SYCL_BUILD_PI_ESIMD_EMULATOR)
     add_subdirectory(esimd_cpu)
   endif()
 endif()