Remove esimd stuff

intel · Jan 24, 2024 · edf4094 · edf4094
1 parent f2b5792
commit edf4094
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/sycl/source/detail/config.hpp b/sycl/source/detail/config.hpp
@@ -235,14 +235,9 @@ template <> class SYCLConfig<SYCL_PARALLEL_FOR_RANGE_ROUNDING_PARAMS> {
 const std::array<std::pair<std::string, info::device_type>, 6> &
 getSyclDeviceTypeMap();
 
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
-// Array is used by SYCL_DEVICE_ALLOWLIST and ONEAPI_DEVICE_SELECTOR
-const std::array<std::pair<std::string, backend>, 7> &getSyclBeMap();
-#else
 // Array is used by SYCL_DEVICE_FILTER and SYCL_DEVICE_ALLOWLIST and
 // ONEAPI_DEVICE_SELECTOR
 const std::array<std::pair<std::string, backend>, 8> &getSyclBeMap();
-#endif
 
 // ---------------------------------------
 // ONEAPI_DEVICE_SELECTOR support

diff --git a/sycl/source/detail/device_filter.cpp b/sycl/source/detail/device_filter.cpp
@@ -288,20 +288,6 @@ ods_target_list::ods_target_list(const std::string &envStr) {
   TargetList = Parse_ONEAPI_DEVICE_SELECTOR(envStr);
 }
 
-#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
-// Backend is compatible with the ONEAPI_DEVICE_SELECTOR in the following cases.
-// 1. Filter backend is '*' which means ANY backend.
-// 2. Filter backend match exactly with the given 'Backend'
-bool ods_target_list::backendCompatible(backend Backend) {
-
-  return std::any_of(
-      TargetList.begin(), TargetList.end(), [&](ods_target &Target) {
-        backend TargetBackend = Target.Backend.value_or(backend::all);
-        return TargetBackend == Backend || TargetBackend == backend::all;
-      });
-}
-
-#else
 // Backend is compatible with the ONEAPI_DEVICE_SELECTOR in the following cases.
 // 1. Filter backend is '*' which means ANY backend.
 // 2. Filter backend match exactly with the given 'Backend'
@@ -314,6 +300,7 @@ bool ods_target_list::backendCompatible(backend Backend) {
       });
 }
 
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 // ---------------------------------------
 // SYCL_DEVICE_FILTER support
 

diff --git a/sycl/unittests/allowlist/ParseAllowList.cpp b/sycl/unittests/allowlist/ParseAllowList.cpp
@@ -174,9 +174,7 @@ TEST(ParseAllowListTests, CheckAllValidBackendNameValuesAreProcessed) {
       {{"BackendName", "level_zero"}},
       {{"BackendName", "cuda"}},
       {{"BackendName", "hip"}},
-#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
       {{"BackendName", "esimd_emulator"}},
-#endif
       {{"BackendName", "native_cpu"}},
       {{"BackendName", "*"}}};
   EXPECT_EQ(ExpectedValue, ActualValue);