Incorporating code review comments

Signed-off-by: Gail Lyons <[email protected]>

Author: glyons-intel

sycl/doc/EnvironmentVariables.md

@@ -22,7 +22,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 minimum 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. Note that the device name, platform name and platform version are regular expressions.  Special characters, such as parenthesis, must be escaped. The device driver version is treated as 4 regular expressions, separated by ".". More than one device can be specified using "|".|
+| 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_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_LEVEL0_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/detail/platform_impl.cpp

@@ -208,62 +208,8 @@ static std::vector<DevDescT> getAllowListDesc() {
   return DecDescs;
 }
 
-std::vector<int> convertVersionString(std::string Version) {
-  // version string format is xx.yy.zzzzz.ww   WW is optional
-  std::vector<int> Values;
-  size_t Pos = 0;
-  size_t Start = Pos;
-  if ((Pos = Version.find(".", Pos)) == std::string::npos) {
-    throw sycl::runtime_error("Malformed syntax in version string",
-                              PI_INVALID_VALUE);
-  }
-  Values.push_back(std::stoi(Version.substr(Start, Pos - Start)));
-  Pos++;
-  Start = Pos;
-  if ((Pos = Version.find(".", Pos)) == std::string::npos) {
-    throw sycl::runtime_error("Malformed syntax in version string",
-                              PI_INVALID_VALUE);
-  }
-  Values.push_back(std::stoi(Version.substr(Start, Pos - Start)));
-  Pos++;
-  size_t Prev = Pos;
-  if ((Pos = Version.find(".", Pos)) == std::string::npos) {
-    Values.push_back(std::stoi(Version.substr(Prev)));
-  } else {
-    Values.push_back(std::stoi(Version.substr(Start, Pos - Start)));
-    Pos++;
-    Values.push_back(std::stoi(Version.substr(Pos)));
-  }
-  return Values;
-}
-
 enum MatchState { UNKNOWN, MATCH, NOMATCH };
 
-MatchState matchVersions(std::string Version1, std::string Version2) {
-  std::vector<int> V1 = convertVersionString(Version1);
-  std::vector<int> V2 = convertVersionString(Version2);
-
-  if (V1.size() != V2.size()) {
-    return MatchState::NOMATCH;
-  }
-  if (V1[0] > V2[0]) {
-    return MatchState::MATCH;
-  }
-  if ((V1[0] == V2[0]) && (V1[1] >= V2[1])) {
-    return MatchState::MATCH;
-  }
-  if ((V1[0] == V2[0]) && (V1[1] == V2[1]) && (V1[2] >= V2[2])) {
-    return MatchState::MATCH;
-  }
-  if (V1.size() == 4) {
-    if ((V1[0] == V2[0]) && (V1[1] == V2[1]) && (V1[2] == V2[2]) &&
-        (V1[3] >= V2[3])) {
-      return MatchState::MATCH;
-    }
-  }
-  return MatchState::NOMATCH;
-}
-
 static void filterAllowList(vector_class<RT::PiDevice> &PiDevices,
                             RT::PiPlatform PiPlatform, const plugin &Plugin) {
   const std::vector<DevDescT> AllowList(getAllowListDesc());
@@ -323,10 +269,8 @@ static void filterAllowList(vector_class<RT::PiDevice> &PiDevices,
 
       if (!Desc.DevDriverVer.empty()) {
         if (!std::regex_match(DeviceDriverVer, std::regex(Desc.DevDriverVer))) {
-          DevVerState = matchVersions(DeviceDriverVer, Desc.DevDriverVer);
-          if (DevVerState == MatchState::NOMATCH) {
-            continue;
-          }
+          DevVerState = MatchState::NOMATCH;
+          continue;
         } else {
           DevVerState = MatchState::MATCH;
         }