[SYCL] Improve SYCL_DEVICE_ALLOWLIST

sycl/doc/EnvironmentVariables.md

@@ -23,7 +23,7 @@ subject to change. Do not rely on these variables in production code.
 | `SYCL_DISABLE_EXECUTION_GRAPH_CLEANUP` | Any(\*) | Disable cleanup of finished command nodes at host-device synchronization points. |
 | `SYCL_THROW_ON_BLOCK` | Any(\*) | Throw an exception on attempt to wait for a blocked command.  |
 | `SYCL_DEVICELIB_INHIBIT_NATIVE` | String of device library extensions (separated by a whitespace) | Do not rely on device native support for devicelib extensions listed in this option. |
-| `SYCL_DEVICE_ALLOWLIST` | A list of devices and their driver version following the pattern: DeviceName:{{XXX}},DriverVersion:{{X.Y.Z.W}}. Also may contain PlatformName and PlatformVersion | Filter out devices that do not match the pattern specified. Regular expression can be passed and the DPC++ runtime will select only those devices which satisfy the regex. Special characters, such as parenthesis, must be escaped. More than one device can be specified using the piping symbol "\|".|
+| `SYCL_DEVICE_ALLOWLIST` | A list of devices and their driver version following the pattern: `BackendName:XXX,DeviceType:YYY,DeviceVendorId:0xXYZW,DriverVersion:{{X.Y.Z.W}}`. Also may contain `PlatformVersion`, `DeviceName` and `PlatformName`. There is no fixed order of properties in the pattern. | Filter out devices that do not match the pattern specified. `BackendName` accepts `host`, `opencl`, `level_zero` or `cuda`. `DeviceType` accepts `host`, `cpu`, `gpu` or `acc`. `DeviceVendorId` accepts uint32_t in hex form (`0xXYZW`). `DriverVersion`, `PlatformVersion`, `DeviceName` and `PlatformName` accept regular expression. Special characters, such as parenthesis, must be escaped. DPC++ runtime will select only those devices which satisfy provided values above and regex. More than one device can be specified using the piping symbol "\|".|
 | `SYCL_QUEUE_THREAD_POOL_SIZE` | Positive integer | Number of threads in thread pool of queue. |
 | `SYCL_DEVICELIB_NO_FALLBACK` | Any(\*) | Disable loading and linking of device library images |
 | `SYCL_PI_LEVEL_ZERO_MAX_COMMAND_LIST_CACHE` | Positive integer | Maximum number of oneAPI Level Zero Command lists that can be allocated with no reuse before throwing an "out of resources" error. Default is 20000, threshold may be increased based on resource availabilty and workload demand. |

sycl/source/CMakeLists.txt

@@ -102,6 +102,7 @@ set(SYCL_SOURCES
     "backend/level_zero.cpp"
     "backend.cpp"
     "detail/accessor_impl.cpp"
+    "detail/allowlist.cpp"
     "detail/buffer_impl.cpp"
     "detail/builtins_common.cpp"
     "detail/builtins_geometric.cpp"

sycl/source/detail/allowlist.cpp

@@ -0,0 +1,362 @@
+//==-------------- allowlist.cpp - SYCL_DEVICE_ALLOWLIST -------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include <detail/allowlist.hpp>
+#include <detail/config.hpp>
+#include <detail/device_impl.hpp>
+#include <detail/platform_info.hpp>
+
+#include <regex>
+
+__SYCL_INLINE_NAMESPACE(cl) {
+namespace sycl {
+namespace detail {
+
+constexpr char BackendNameKeyName[] = "BackendName";
+constexpr char DeviceTypeKeyName[] = "DeviceType";
+constexpr char DeviceVendorIdKeyName[] = "DeviceVendorId";
+constexpr char DriverVersionKeyName[] = "DriverVersion";
+constexpr char PlatformVersionKeyName[] = "PlatformVersion";
+constexpr char DeviceNameKeyName[] = "DeviceName";
+constexpr char PlatformNameKeyName[] = "PlatformName";
+
+constexpr std::array<const char *, 7> SupportedAllowListKeyNames{
+    BackendNameKeyName,   DeviceTypeKeyName,      DeviceVendorIdKeyName,
+    DriverVersionKeyName, PlatformVersionKeyName, DeviceNameKeyName,
+    PlatformNameKeyName};
+
+// Parsing and validating SYCL_DEVICE_ALLOWLIST variable value.
+//
+// The value has the following form:
+// DeviceDesc1|DeviceDesc2|<...>|DeviceDescN
+// DeviceDescN is the set of descriptions for the device which should be
+// allowed. The sets of device descriptions are separated by '|' symbol. The set
+// of descriptions has the following structure:
+// DeviceDescN = Key1:Value1,Key2:Value2,...,KeyN:ValueN
+// Device descriptions are separated by ',' symbol.
+// Key and value of a device description are separated by ":" symbol.
+// KeyN is the key of a device description, it could be one of the following
+// from SupportedAllowListKeyNames vector above.
+// DeviceName and PlatformName device descriptions are deprecated and will be
+// removed in one of the future releases.
+// ValueN is the value of a device description, it could be regex and some fixed
+// string.
+// Function should return parsed SYCL_DEVICE_ALLOWLIST variable value as
+// AllowListParsedT type (vector of maps), e.g.:
+// {{Key1: Value1, Key2: Value2}, ..., {Key1: Value1, ..., KeyN: ValueN}}
+AllowListParsedT parseAllowList(const std::string &AllowListRaw) {
+  if (AllowListRaw.empty())
+    return {};
+
+  AllowListParsedT AllowListParsed;
+  AllowListParsed.emplace_back();
+
+  constexpr std::array<const char *, 3> SupportedKeyNamesHaveFixedValue{
+      BackendNameKeyName, DeviceTypeKeyName, DeviceVendorIdKeyName};
+  constexpr std::array<const char *, 4> SupportedKeyNamesRequireRegexValue{
+      DriverVersionKeyName, PlatformVersionKeyName, DeviceNameKeyName,
+      PlatformNameKeyName};
+
+  size_t KeyStart = 0, KeyEnd = 0, ValueStart = 0, ValueEnd = 0,
+         DeviceDescIndex = 0;
+
+  const char DelimeterBtwKeyAndValue = ':';
+  const char DelimeterBtwItemsInDeviceDesc = ',';
+  const char DelimeterBtwDeviceDescs = '|';
+
+  while ((KeyEnd = AllowListRaw.find(DelimeterBtwKeyAndValue, KeyStart)) !=
+         std::string::npos) {
+    if ((ValueStart = AllowListRaw.find_first_not_of(
+             DelimeterBtwKeyAndValue, KeyEnd)) == std::string::npos)
+      break;
+    const std::string &Key = AllowListRaw.substr(KeyStart, KeyEnd - KeyStart);
+
+    // check that provided key is supported
+    if (std::find(SupportedAllowListKeyNames.begin(),
+                  SupportedAllowListKeyNames.end(),
+                  Key) == SupportedAllowListKeyNames.end()) {
+      throw sycl::runtime_error(
+          "Unrecognized key in SYCL_DEVICE_ALLOWLIST. For details, please "
+          "refer to "
+          "https://github.com/intel/llvm/blob/sycl/sycl/doc/"
+          "EnvironmentVariables.md",
+          PI_INVALID_VALUE);
+    }
+
+    bool ShouldAllocateNewDeviceDescMap = false;
+
+    std::string Value;
+
+    auto &DeviceDescMap = AllowListParsed[DeviceDescIndex];
+
+    // check if Key is not already defined in DeviceDescMap, e.g., caused by the
+    // following invalid syntax: Key1:Value1,Key2:Value2,Key1:Value3
+    if (DeviceDescMap.find(Key) == DeviceDescMap.end()) {
+      // calculate and validate value which has fixed format
+      if (std::find(SupportedKeyNamesHaveFixedValue.begin(),
+                    SupportedKeyNamesHaveFixedValue.end(),
+                    Key) != SupportedKeyNamesHaveFixedValue.end()) {
+        ValueEnd = AllowListRaw.find(DelimeterBtwItemsInDeviceDesc, ValueStart);
+        // check if it is the last Key:Value pair in the device description, and
+        // correct end position of that value
+        if (size_t ValueEndCand =
+                AllowListRaw.find(DelimeterBtwDeviceDescs, ValueStart);
+            (ValueEndCand != std::string::npos) && (ValueEndCand < ValueEnd)) {
+          ValueEnd = ValueEndCand;
+          ShouldAllocateNewDeviceDescMap = true;
+        }
+        if (ValueEnd == std::string::npos)
+          ValueEnd = AllowListRaw.length();
+
+        Value = AllowListRaw.substr(ValueStart, ValueEnd - ValueStart);
+
+        // post-processing checks for some values
+
+        auto ValidateEnumValues = [&](std::string CheckingKeyName,
+                                      auto SourceOfSupportedValues) {
+          if (Key == CheckingKeyName) {
+            bool ValueIsValid = false;
+            for (const auto &Item : SourceOfSupportedValues)
+              if (Value == Item.first) {
+                ValueIsValid = true;
+                break;
+              }
+            if (!ValueIsValid)
+              throw sycl::runtime_error(
+                  "Value " + Value + " for key " + Key +
+                      " is not valid in "
+                      "SYCL_DEVICE_ALLOWLIST. For details, please refer to "
+                      "https://github.com/intel/llvm/blob/sycl/sycl/doc/"
+                      "EnvironmentVariables.md",
+                  PI_INVALID_VALUE);
+          }
+        };
+
+        // check that values of keys, which should have some fixed format, are
+        // valid. E.g., for BackendName key, the allowed values are only ones
+        // described in SyclBeMap
+        ValidateEnumValues(BackendNameKeyName, SyclBeMap);
+        ValidateEnumValues(DeviceTypeKeyName, SyclDeviceTypeMap);
+
+        if (Key == DeviceVendorIdKeyName) {
+          // DeviceVendorId should have hex format
+          if (!std::regex_match(Value, std::regex("0[xX][0-9a-fA-F]+"))) {
+            throw sycl::runtime_error(
+                "Value " + Value + " for key " + Key +
+                    " is not valid in "
+                    "SYCL_DEVICE_ALLOWLIST. It should have the hex format. For "
+                    "details, please refer to "
+                    "https://github.com/intel/llvm/blob/sycl/sycl/doc/"
+                    "EnvironmentVariables.md",
+                PI_INVALID_VALUE);
+          }
+        }
+      }
+      // calculate and validate value which has regex format
+      else if (std::find(SupportedKeyNamesRequireRegexValue.begin(),
+                         SupportedKeyNamesRequireRegexValue.end(),
+                         Key) != SupportedKeyNamesRequireRegexValue.end()) {
+        const std::string Prefix("{{");
+        // TODO: can be changed to string_view::starts_with after switching
+        // DPC++ RT to C++20
+        if (Prefix != AllowListRaw.substr(ValueStart, Prefix.length())) {
+          throw sycl::runtime_error("Key " + Key +
+                                        " of SYCL_DEVICE_ALLOWLIST should have "
+                                        "value which starts with " +
+                                        Prefix,
+                                    PI_INVALID_VALUE);
+        }
+        // cut off prefix from the value
+        ValueStart += Prefix.length();
+
+        ValueEnd = ValueStart;
+        const std::string Postfix("}}");
+        for (; ValueEnd < AllowListRaw.length() - Postfix.length() + 1;
+             ++ValueEnd) {
+          if (Postfix == AllowListRaw.substr(ValueEnd, Postfix.length()))
+            break;
+          // if it is the last iteration and next 2 symbols are not a postfix,
+          // throw exception
+          if (ValueEnd == AllowListRaw.length() - Postfix.length())
+            throw sycl::runtime_error(
+                "Key " + Key +
+                    " of SYCL_DEVICE_ALLOWLIST should have "
+                    "value which ends with " +
+                    Postfix,
+                PI_INVALID_VALUE);
+        }
+        size_t NextExpectedDelimeterPos = ValueEnd + Postfix.length();
+        // if it is not the end of the string, check that symbol next to a
+        // postfix is a delimeter (, or ;)
+        if ((AllowListRaw.length() != NextExpectedDelimeterPos) &&
+            (AllowListRaw[NextExpectedDelimeterPos] !=
+             DelimeterBtwItemsInDeviceDesc) &&
+            (AllowListRaw[NextExpectedDelimeterPos] != DelimeterBtwDeviceDescs))
+          throw sycl::runtime_error(
+              "Unexpected symbol on position " +
+                  std::to_string(NextExpectedDelimeterPos) + ": " +
+                  AllowListRaw[NextExpectedDelimeterPos] +
+                  ". Should be either " + DelimeterBtwItemsInDeviceDesc +
+                  " or " + DelimeterBtwDeviceDescs,
+              PI_INVALID_VALUE);
+
+        if (AllowListRaw[NextExpectedDelimeterPos] == DelimeterBtwDeviceDescs)
+          ShouldAllocateNewDeviceDescMap = true;
+
+        Value = AllowListRaw.substr(ValueStart, ValueEnd - ValueStart);
+
+        ValueEnd += Postfix.length();
+      } else
+        assert(false &&
+               "Key should be either in SupportedKeyNamesHaveFixedValue "
+               "or SupportedKeyNamesRequireRegexValue");
+
+      // add key and value to the map
+      DeviceDescMap.emplace(Key, Value);
+    } else
+      throw sycl::runtime_error("Re-definition of key " + Key +
+                                    " is not allowed in "
+                                    "SYCL_DEVICE_ALLOWLIST",
+                                PI_INVALID_VALUE);
+
+    KeyStart = ValueEnd;
+    if (KeyStart != std::string::npos)
+      ++KeyStart;
+    if (ShouldAllocateNewDeviceDescMap) {
+      ++DeviceDescIndex;
+      AllowListParsed.emplace_back();
+    }
+  }
+
+  return AllowListParsed;
+}
+
+// Checking if we can allow device with device description DeviceDesc
+bool deviceIsAllowed(const DeviceDescT &DeviceDesc,
+                     const AllowListParsedT &AllowListParsed) {
+  for (const auto &SupportedKeyName : SupportedAllowListKeyNames)
+    assert((DeviceDesc.find(SupportedKeyName) != DeviceDesc.end()) &&
+           "DeviceDesc map should have all supported keys for "
+           "SYCL_DEVICE_ALLOWLIST.");
+  auto EqualityComp = [&](const std::string &KeyName,
+                          const DeviceDescT &AllowListDeviceDesc) {
+    // change to map::contains after switching DPC++ RT to C++20
+    if (AllowListDeviceDesc.find(KeyName) != AllowListDeviceDesc.end())
+      if (AllowListDeviceDesc.at(KeyName) != DeviceDesc.at(KeyName))
+        return false;
+    return true;
+  };
+  auto RegexComp = [&](const std::string &KeyName,
+                       const DeviceDescT &AllowListDeviceDesc) {
+    if (AllowListDeviceDesc.find(KeyName) != AllowListDeviceDesc.end())
+      if (!std::regex_match(DeviceDesc.at(KeyName),
+                            std::regex(AllowListDeviceDesc.at(KeyName))))
+        return false;
+    return true;
+  };
+
+  bool ShouldDeviceBeAllowed = false;
+
+  for (const auto &AllowListDeviceDesc : AllowListParsed) {
+    if (!EqualityComp(BackendNameKeyName, AllowListDeviceDesc))
+      continue;
+    if (!EqualityComp(DeviceTypeKeyName, AllowListDeviceDesc))
+      continue;
+    if (!EqualityComp(DeviceVendorIdKeyName, AllowListDeviceDesc))
+      continue;
+    if (!RegexComp(DriverVersionKeyName, AllowListDeviceDesc))
+      continue;
+    if (!RegexComp(PlatformVersionKeyName, AllowListDeviceDesc))
+      continue;
+    if (!RegexComp(DeviceNameKeyName, AllowListDeviceDesc))
+      continue;
+    if (!RegexComp(PlatformNameKeyName, AllowListDeviceDesc))
+      continue;
+
+    // no any continue was called on this iteration, so all parameters matched
+    // successfully, so allow this device to use
+    ShouldDeviceBeAllowed = true;
+    break;
+  }
+
+  return ShouldDeviceBeAllowed;
+}
+
+void applyAllowList(std::vector<RT::PiDevice> &PiDevices,
+                    RT::PiPlatform PiPlatform, const plugin &Plugin) {
+  AllowListParsedT AllowListParsed =
+      parseAllowList(SYCLConfig<SYCL_DEVICE_ALLOWLIST>::get());
+  if (AllowListParsed.empty())
+    return;
+
+  DeviceDescT DeviceDesc;
+
+  // get BackendName value and put it to DeviceDesc
+  sycl::backend Backend = Plugin.getBackend();
+  for (const auto &SyclBe : SyclBeMap) {
+    if (SyclBe.second == Backend) {
+      DeviceDesc.emplace(BackendNameKeyName, SyclBe.first);
+      break;
+    }
+  }
+  // get PlatformVersion value and put it to DeviceDesc
+  DeviceDesc.emplace(
+      PlatformVersionKeyName,
+      sycl::detail::get_platform_info<std::string,
+                                      info::platform::version>::get(PiPlatform,
+                                                                    Plugin));
+  // get PlatformName value and put it to DeviceDesc
+  DeviceDesc.emplace(
+      PlatformNameKeyName,
+      sycl::detail::get_platform_info<std::string, info::platform::name>::get(
+          PiPlatform, Plugin));
+
+  int InsertIDx = 0;
+  for (RT::PiDevice Device : PiDevices) {
+    // get DeviceType value and put it to DeviceDesc
+    RT::PiDeviceType PiDevType;
+    Plugin.call<PiApiKind::piDeviceGetInfo>(Device, PI_DEVICE_INFO_TYPE,
+                                            sizeof(RT::PiDeviceType),
+                                            &PiDevType, nullptr);
+    sycl::info::device_type DeviceType = pi::cast<info::device_type>(PiDevType);
+    for (const auto &SyclDeviceType : SyclDeviceTypeMap) {
+      if (SyclDeviceType.second == DeviceType) {
+        const auto &DeviceTypeValue = SyclDeviceType.first;
+        DeviceDesc[DeviceTypeKeyName] = DeviceTypeValue;
+        break;
+      }
+    }
+    // get DeviceVendorId value and put it to DeviceDesc
+    uint32_t DeviceVendorIdUInt =
+        sycl::detail::get_device_info<uint32_t, info::device::vendor_id>::get(
+            Device, Plugin);
+    std::stringstream DeviceVendorIdHexStringStream;
+    DeviceVendorIdHexStringStream << "0x" << std::hex << DeviceVendorIdUInt;
+    const auto &DeviceVendorIdValue = DeviceVendorIdHexStringStream.str();
+    DeviceDesc[DeviceVendorIdKeyName] = DeviceVendorIdValue;
+    // get DriverVersion value and put it to DeviceDesc
+    const auto &DriverVersionValue = sycl::detail::get_device_info<
+        std::string, info::device::driver_version>::get(Device, Plugin);
+    DeviceDesc[DriverVersionKeyName] = DriverVersionValue;
+    // get DeviceName value and put it to DeviceDesc
+    const auto &DeviceNameValue =
+        sycl::detail::get_device_info<std::string, info::device::name>::get(
+            Device, Plugin);
+    DeviceDesc[DeviceNameKeyName] = DeviceNameValue;
+
+    // check if we can allow device with such device description DeviceDesc
+    if (deviceIsAllowed(DeviceDesc, AllowListParsed)) {
+      PiDevices[InsertIDx++] = Device;
+    }
+  }
+  PiDevices.resize(InsertIDx);
+}
+
+} // namespace detail
+} // namespace sycl
+} // __SYCL_INLINE_NAMESPACE(cl)