Skip to content

Commit 9d0888c

Browse files
[SYCL] Remove esimd_emulator from filters (#12428)
This PR removes esimd_emulator from device filters and filter selectors. Esimd_emulator is already depreciated.
1 parent d2463c6 commit 9d0888c

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

sycl/source/detail/config.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ getSyclDeviceTypeMap() {
177177

178178
// Array is used by SYCL_DEVICE_FILTER and SYCL_DEVICE_ALLOWLIST and
179179
// ONEAPI_DEVICE_SELECTOR
180+
// TODO: Remove esimd_emulator in the next ABI breaking window.
180181
const std::array<std::pair<std::string, backend>, 8> &getSyclBeMap() {
181182
static const std::array<std::pair<std::string, backend>, 8> SyclBeMap = {
182183
{{"host", backend::host},

sycl/source/detail/device_filter.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,10 @@ ods_target_list::ods_target_list(const std::string &envStr) {
293293
// 2. Filter backend match exactly with the given 'Backend'
294294
bool ods_target_list::backendCompatible(backend Backend) {
295295

296-
bool isESIMD = Backend == backend::ext_intel_esimd_emulator;
297296
return std::any_of(
298297
TargetList.begin(), TargetList.end(), [&](ods_target &Target) {
299298
backend TargetBackend = Target.Backend.value_or(backend::all);
300-
return (TargetBackend == Backend) ||
301-
(TargetBackend == backend::all && !isESIMD);
299+
return (TargetBackend == Backend) || (TargetBackend == backend::all);
302300
});
303301
}
304302

@@ -363,7 +361,7 @@ device_filter::device_filter(const std::string &FilterString) {
363361
std::string Message =
364362
std::string("Invalid device filter: ") + FilterString +
365363
"\nPossible backend values are "
366-
"{opencl,level_zero,cuda,hip,esimd_emulator,*}.\n"
364+
"{opencl,level_zero,cuda,hip,*}.\n"
367365
"Possible device types are {cpu,gpu,acc,*}.\n"
368366
"Device number should be an non-negative integer.\n";
369367
throw sycl::invalid_parameter_error(Message, PI_ERROR_INVALID_VALUE);

sycl/source/detail/filter_selector_impl.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ filter create_filter(const std::string &Input) {
7474
Result.Backend = backend::ext_oneapi_cuda;
7575
} else if (Token == "hip" && !Result.Backend) {
7676
Result.Backend = backend::ext_oneapi_hip;
77-
} else if (Token == "esimd_emulator" && !Result.Backend) {
78-
Result.Backend = backend::ext_intel_esimd_emulator;
7977
} else if (std::regex_match(Token, IntegerExpr) && !Result.DeviceNum) {
8078
try {
8179
Result.DeviceNum = std::stoi(Token);

sycl/unittests/allowlist/ParseAllowList.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ TEST(ParseAllowListTests, CheckMissingClosedDoubleCurlyBracesAreHandled) {
157157
}
158158
}
159159

160+
// TODO: Remove esimd_emulator from ExpectedValue in the next ABI
161+
// breaking window.
160162
TEST(ParseAllowListTests, CheckAllValidBackendNameValuesAreProcessed) {
161163
std::string AllowList;
162164
for (const auto &SyclBe : sycl::detail::getSyclBeMap()) {

0 commit comments

Comments
 (0)