Apply review comments

Author: vladimirlaz

sycl/include/CL/sycl/backend_types.hpp

@@ -27,7 +27,7 @@ enum class backend : char {
   cuda = 3,
   all = 4,
   ext_intel_esimd_emulator = 5,
-  esimd_cpu = __SYCL2020_DEPRECATED("use 'ext_oneapi_esimd_emulator' instead") =
+  esimd_cpu __SYCL2020_DEPRECATED("use 'ext_oneapi_esimd_emulator' instead") =
       ext_intel_esimd_emulator,
   hip = 6,
 };
@@ -57,8 +57,8 @@ inline std::ostream &operator<<(std::ostream &Out, backend be) {
   case backend::cuda:
     Out << "cuda";
     break;
-  case backend::esimd_cpu:
-    Out << "esimd_cpu";
+  case backend::ext_intel_esimd_emulator:
+    Out << "ext_intel_esimd_emulator";
     break;
   case backend::hip:
     Out << "hip";

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

@@ -29,13 +29,16 @@ 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}
+#cmakedefine01 SYCL_BUILD_PI_CUDA
+#if SYCL_BUILD_PI_CUDA
 #define SYCL_EXT_ONEAPI_BACKEND_CUDA 1
 #endif
-#if ${SYCL_BUILD_PI_ESIMD_EMULATOR}
+#cmakedefine01 SYCL_BUILD_PI_ESIMD_EMULATOR
+#if SYCL_BUILD_PI_ESIMD_EMULATOR
 #define SYCL_EXT_INTEL_BACKEND_ESIMD_EMULATOR 1
 #endif
-#if ${SYCL_BUILD_PI_HIP}
+#cmakedefine01 SYCL_BUILD_PI_HIP
+#if SYCL_BUILD_PI_HIP
 #define SYCL_EXT_ONEAPI_BACKEND_HIP 1
 #endif
 

sycl/include/sycl/ext/intel/experimental/esimd/emu/detail/esimdcpu_device_interface.hpp

@@ -75,7 +75,9 @@ ESIMDDeviceInterface *getESIMDDeviceInterface() {
   // tight loop)
   void *PIOpaqueData = nullptr;
 
-  PIOpaqueData = getPluginOpaqueData<cl::sycl::backend::esimd_cpu>(nullptr);
+  PIOpaqueData =
+      getPluginOpaqueData<cl::sycl::backend::ext_oneapi_esimd_emulator>(
+          nullptr);
 
   ESIMDEmuPluginOpaqueData *OpaqueData =
       reinterpret_cast<ESIMDEmuPluginOpaqueData *>(PIOpaqueData);

sycl/source/detail/pi.cpp

@@ -74,7 +74,7 @@ void *getPluginOpaqueData(void *OpaqueDataParam) {
 }
 
 template __SYCL_EXPORT void *
-getPluginOpaqueData<cl::sycl::backend::esimd_cpu>(void *);
+getPluginOpaqueData<cl::sycl::backend::ext_intel_esimd_emulator>(void *);
 
 namespace pi {
 
@@ -504,7 +504,8 @@ template <backend BE> const plugin &getPlugin() {
 
 template __SYCL_EXPORT const plugin &getPlugin<backend::opencl>();
 template __SYCL_EXPORT const plugin &getPlugin<backend::level_zero>();
-template __SYCL_EXPORT const plugin &getPlugin<backend::esimd_cpu>();
+template __SYCL_EXPORT const plugin &
+getPlugin<backend::ext_intel_esimd_emulator>();
 
 // Report error and no return (keeps compiler from printing warnings).
 // TODO: Probably change that to throw a catchable exception,