Early continues in place of "!Filter.DeviceNum || DeviceNum ==

Filter.DeviceNum.value()" checks

Author: aelovikov-intel

sycl/source/detail/platform_impl.cpp

@@ -280,44 +280,46 @@ std::vector<int> platform_impl::filterDeviceFilter(
       // 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 (Filter.DeviceNum && DeviceNum != Filter.DeviceNum.value())
+          continue;
+
+        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;
+      }
+      if (FilterDevType == DeviceType) {
+        if (Filter.DeviceNum && DeviceNum != Filter.DeviceNum.value())
+          continue;
 
-      } 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;
-              }
+        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;
       }
     }
     DeviceNum++;