Update sycl/source/detail/device_filter.cpp

Co-authored-by: Vyacheslav Klochkov <[email protected]>

Author: bso-intel

sycl/source/detail/device_filter.cpp

@@ -32,56 +32,38 @@ device_filter::device_filter(const std::string &FilterString) {
 
   // handle the optional 1st field of the filter, backend
   size_t Cursor = 0;
-  size_t ColonPos = FilterString.find(":", Cursor);
-  // check if the first entry matches with a known backend type
-  auto It = std::find_if(
-      std::begin(SyclBeMap), std::end(SyclBeMap),
-      [=, &Cursor](const std::pair<std::string, backend> &Element) {
-        size_t Found = FilterString.find(Element.first, Cursor);
-        if (Found != std::string::npos) {
-          Cursor = Found;
-          return true;
-        }
-        return false;
-      });
-  // if no match is found, set the backend type backend::all
-  // which actually means 'any backend' will be a match.
-  if (It == SyclBeMap.end()) {
-    Backend = backend::all;
-  } else {
-    Backend = It->second;
-    if (ColonPos != std::string::npos) {
+  size_t ColonPos = 0;
+  auto findElement = [&](auto &Element) {
+    size_t Found = FilterString.find(Element.first, Cursor);
+    if (Found == std::string::npos)
+      return false;
+    Cursor = Found;
+    return true;
+  };
+  auto selectElement = [&](auto It, auto Map, auto EltIfNotFound) {
+    if (It == Map.end())
+      return EltIfNotFound;
+    ColonPos = FilterString.find(":", Cursor);
+    if (ColonPos != std::string::npos)
       Cursor = ColonPos + 1;
-    } else {
+    else
       Cursor = Cursor + It->first.size();
-    }
-  }
+    return It->second;
+  };
+  // Check if the first entry matches with a known backend type
+  auto It = std::find_if(
+      std::begin(SyclBeMap), std::end(SyclBeMap), findElement);
+  // If no match is found, set the backend type backend::all
+  // which actually means 'any backend' will be a match.
+  Backend = selectElement(It, SyclBeMap, backend::all);
 
-  // handle the optional 2nd field of the filter, device type
-  // check if the 2nd entry matches with any known device type.
+  // Handle the optional 2nd field of the filter - device type.
+  // Check if the 2nd entry matches with any known device type.
   auto Iter = std::find_if(
-      std::begin(SyclDeviceTypeMap), std::end(SyclDeviceTypeMap),
-      [=, &Cursor](const std::pair<std::string, info::device_type> &Element) {
-        size_t Found = FilterString.find(Element.first, Cursor);
-        if (Found != std::string::npos) {
-          Cursor = Found;
-          return true;
-        }
-        return false;
-      });
-  // if no match is found, set device_type 'all'
+      std::begin(SyclDeviceTypeMap), std::end(SyclDeviceTypeMap), findElement);
+  // If no match is found, set device_type 'all',
   // which actually means 'any device_type' will be a match.
-  if (Iter == SyclDeviceTypeMap.end()) {
-    DeviceType = info::device_type::all;
-  } else {
-    DeviceType = Iter->second;
-    ColonPos = FilterString.find(":", Cursor);
-    if (ColonPos != std::string::npos) {
-      Cursor = ColonPos + 1;
-    } else {
-      Cursor = Cursor + Iter->first.size();
-    }
-  }
+  DeviceType = selectElement(Iter, SyclDeviceTypeMap, info::device_type::all);
 
   // handle the optional 3rd field of the filter, device number
   // Try to convert the remaining string to an integer.