Skip to content

Commit 18949a7

Browse files
committed
Remove early depracation of some parameters
1 parent 3a58432 commit 18949a7

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

sycl/source/detail/platform_impl.cpp

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,9 @@ AllowListParsedT parseAllowList(const std::string &AllowListRaw) {
179179
DriverVersionKeyName, PlatformVersionKeyName, DeviceNameKeyName,
180180
PlatformNameKeyName};
181181

182-
const std::string &DeprecatedKeyNameDeviceName = DeviceNameKeyName;
183-
const std::string &DeprecatedKeyNamePlatformName = PlatformNameKeyName;
184-
185182
size_t KeyStart = 0, KeyEnd = 0, ValueStart = 0, ValueEnd = 0,
186183
DeviceDescIndex = 0;
187184

188-
bool IsDeprecatedKeyNameDeviceNameWasUsed = false;
189-
bool IsDeprecatedKeyNamePlatformNameWasUsed = false;
190-
191185
while ((KeyEnd = AllowListRaw.find(':', KeyStart)) != std::string::npos) {
192186
if ((ValueStart = AllowListRaw.find_first_not_of(":", KeyEnd)) ==
193187
std::string::npos)
@@ -201,12 +195,6 @@ AllowListParsedT parseAllowList(const std::string &AllowListRaw) {
201195
throw sycl::runtime_error("Unrecognized key in SYCL_DEVICE_ALLOWLIST",
202196
PI_INVALID_VALUE);
203197
}
204-
if (Key == DeprecatedKeyNameDeviceName) {
205-
IsDeprecatedKeyNameDeviceNameWasUsed = true;
206-
}
207-
if (Key == DeprecatedKeyNamePlatformName) {
208-
IsDeprecatedKeyNamePlatformNameWasUsed = true;
209-
}
210198

211199
bool ShouldAllocateNewDeviceDescMap = false;
212200

@@ -341,25 +329,6 @@ AllowListParsedT parseAllowList(const std::string &AllowListRaw) {
341329
}
342330
}
343331

344-
if (IsDeprecatedKeyNameDeviceNameWasUsed &&
345-
IsDeprecatedKeyNamePlatformNameWasUsed) {
346-
std::cerr << "\nWARNING: DeviceName and PlatformName in "
347-
"SYCL_DEVICE_ALLOWLIST are deprecated. ";
348-
} else if (IsDeprecatedKeyNameDeviceNameWasUsed) {
349-
std::cerr
350-
<< "\nWARNING: DeviceName in SYCL_DEVICE_ALLOWLIST is deprecated. ";
351-
} else if (IsDeprecatedKeyNamePlatformNameWasUsed) {
352-
std::cerr
353-
<< "\nWARNING: PlatformName in SYCL_DEVICE_ALLOWLIST is deprecated. ";
354-
}
355-
if (IsDeprecatedKeyNameDeviceNameWasUsed ||
356-
IsDeprecatedKeyNamePlatformNameWasUsed) {
357-
std::cerr << "Please use BackendName, DeviceType and DeviceVendorId "
358-
"instead. For details, please refer to "
359-
"https://github.com/intel/llvm/blob/sycl/sycl/doc/"
360-
"EnvironmentVariables.md\n\n";
361-
}
362-
363332
return AllowListParsed;
364333
}
365334

0 commit comments

Comments
 (0)