Early continue in platform_impl::filterDeviceFilter for FilterBackend check

Author: aelovikov-intel

sycl/source/detail/platform_impl.cpp

@@ -273,50 +273,50 @@ std::vector<int> platform_impl::filterDeviceFilter(
     for (const FilterT &Filter : FilterList->get()) {
       backend FilterBackend = Filter.Backend.value_or(backend::all);
       // First, match the backend entry
-      if (FilterBackend == Backend || FilterBackend == backend::all) {
-        info::device_type FilterDevType =
-            Filter.DeviceType.value_or(info::device_type::all);
-        // Next, match the device_type entry
-        if (FilterDevType == info::device_type::all) {
-          // Last, match the device_num entry
-          if (!Filter.DeviceNum || DeviceNum == Filter.DeviceNum.value()) {
-            if constexpr (is_ods_target) {      // dealing with ODS filters
-              if (!Blacklist[DeviceNum]) {      // ensure it is not blacklisted
-                if (!Filter.IsNegativeTarget) { // is filter positive?
-                  PiDevices[InsertIDx++] = Device;
-                  original_indices.push_back(DeviceNum);
-                } else {
-                  // Filter is negative and the device matches the filter so
-                  // blacklist the device.
-                  Blacklist[DeviceNum] = true;
-                }
+      if (FilterBackend != Backend && FilterBackend != backend::all)
+        continue;
+      info::device_type FilterDevType =
+          Filter.DeviceType.value_or(info::device_type::all);
+      // Next, match the device_type entry
+      if (FilterDevType == info::device_type::all) {
+        // Last, match the device_num entry
+        if (!Filter.DeviceNum || DeviceNum == Filter.DeviceNum.value()) {
+          if constexpr (is_ods_target) {      // dealing with ODS filters
+            if (!Blacklist[DeviceNum]) {      // ensure it is not blacklisted
+              if (!Filter.IsNegativeTarget) { // is filter positive?
+                PiDevices[InsertIDx++] = Device;
+                original_indices.push_back(DeviceNum);
+              } else {
+                // Filter is negative and the device matches the filter so
+                // blacklist the device.
+                Blacklist[DeviceNum] = true;
               }
-            } else { // dealing with SYCL_DEVICE_FILTER
-              PiDevices[InsertIDx++] = Device;
-              original_indices.push_back(DeviceNum);
             }
-            break;
+          } else { // dealing with SYCL_DEVICE_FILTER
+            PiDevices[InsertIDx++] = Device;
+            original_indices.push_back(DeviceNum);
           }
+          break;
+        }
 
-        } else if (FilterDevType == DeviceType) {
-          if (!Filter.DeviceNum || DeviceNum == Filter.DeviceNum.value()) {
-            if constexpr (is_ods_target) {
-              if (!Blacklist[DeviceNum]) {
-                if (!Filter.IsNegativeTarget) {
-                  PiDevices[InsertIDx++] = Device;
-                  original_indices.push_back(DeviceNum);
-                } else {
-                  // Filter is negative and the device matches the filter so
-                  // blacklist the device.
-                  Blacklist[DeviceNum] = true;
-                }
+      } else if (FilterDevType == DeviceType) {
+        if (!Filter.DeviceNum || DeviceNum == Filter.DeviceNum.value()) {
+          if constexpr (is_ods_target) {
+            if (!Blacklist[DeviceNum]) {
+              if (!Filter.IsNegativeTarget) {
+                PiDevices[InsertIDx++] = Device;
+                original_indices.push_back(DeviceNum);
+              } else {
+                // Filter is negative and the device matches the filter so
+                // blacklist the device.
+                Blacklist[DeviceNum] = true;
               }
-            } else {
-              PiDevices[InsertIDx++] = Device;
-              original_indices.push_back(DeviceNum);
             }
-            break;
+          } else {
+            PiDevices[InsertIDx++] = Device;
+            original_indices.push_back(DeviceNum);
           }
+          break;
         }
       }
     }