Fixes for using ONEAPI_DEVICE_SELECTOR with linear ids (#18029)

Linear IDs (the `0` in `opencl:0`) did not function as intended when
there was multiple platforms; each platform started counting at zero.
This patch changes it so that they start counting at an appropriate
number that should match `urinfo`.

`urinfo` itself has also been updated to not display linear IDs when
the device list is being filtered, as they will not be correct. This
matches the behavior of sycl-ls and is different to the
`--no-linear-ids` which changes the format of the output.

Author: RossBrunton

source/loader/ur_lib.cpp

@@ -454,6 +454,7 @@ ur_result_t urDeviceGetSelected(ur_platform_handle_t hPlatform,
   std::vector<DeviceSpec> acceptDeviceList;
   std::vector<DeviceSpec> discardDeviceList;
 
+  bool deviceIdsInUse = false;
   for (auto &termPair : mapODS) {
     std::string backend = termPair.first;
     // TODO: Figure out how to process all ODS errors rather than returning
@@ -578,6 +579,10 @@ ur_result_t urDeviceGetSelected(ur_platform_handle_t hPlatform,
         deviceList.push_back(DeviceSpec{DevicePartLevel::ROOT, hardwareType,
                                         firstDeviceId, 0, 0, nullptr});
       }
+
+      if (deviceList.back().rootId != DeviceIdTypeALL) {
+        deviceIdsInUse = true;
+      }
     }
   }
 
@@ -621,7 +626,41 @@ ur_result_t urDeviceGetSelected(ur_platform_handle_t hPlatform,
       return UR_RESULT_ERROR_DEVICE_NOT_FOUND;
     }
 
-    DeviceIdType deviceCount = 0;
+    uint32_t startIdCount = 0;
+    if (deviceIdsInUse) {
+      ur_adapter_handle_t adapter;
+      if (UR_RESULT_SUCCESS !=
+          urPlatformGetInfo(hPlatform, UR_PLATFORM_INFO_ADAPTER,
+                            sizeof(adapter), &adapter, nullptr)) {
+        return UR_RESULT_ERROR_INVALID_PLATFORM;
+      }
+
+      uint32_t numPlatforms;
+      if (UR_RESULT_SUCCESS !=
+          urPlatformGet(adapter, 0, nullptr, &numPlatforms)) {
+        return UR_RESULT_ERROR_INVALID_PLATFORM;
+      }
+      std::vector<ur_platform_handle_t> platforms;
+      platforms.resize(numPlatforms);
+      if (UR_RESULT_SUCCESS !=
+          urPlatformGet(adapter, numPlatforms, platforms.data(), nullptr)) {
+        return UR_RESULT_ERROR_INVALID_PLATFORM;
+      }
+
+      for (auto p : platforms) {
+        if (p == hPlatform) {
+          break;
+        }
+        uint32_t deviceCount;
+        if (UR_RESULT_SUCCESS !=
+            urDeviceGet(p, UR_DEVICE_TYPE_ALL, 0, nullptr, &deviceCount)) {
+          return UR_RESULT_ERROR_INVALID_PLATFORM;
+        }
+        startIdCount += deviceCount;
+      }
+    }
+
+    DeviceIdType deviceCount = startIdCount;
     std::transform(rootDeviceHandles.cbegin(), rootDeviceHandles.cend(),
                    std::back_inserter(rootDevices),
                    [&](ur_device_handle_t urDeviceHandle) {

tools/urinfo/urinfo.cpp

@@ -17,6 +17,7 @@ struct app {
   bool verbose = false;
   bool linear_ids = true;
   bool ignore_device_selector = false;
+  bool using_environment_selector = false;
   ur_loader_config_handle_t loaderConfig = nullptr;
   std::vector<ur_adapter_handle_t> adapters;
   std::unordered_map<ur_adapter_handle_t, std::vector<ur_platform_handle_t>>
@@ -34,6 +35,7 @@ struct app {
                      "To see all devices, use the "
                      "--ignore-device-selector CLI option.\n\n",
                      device_selector);
+        using_environment_selector = true;
       }
     }
     UR_CHECK(urLoaderConfigCreate(&loaderConfig));
@@ -139,7 +141,12 @@ devices which are currently visible in the local execution environment.
           auto device = devices[deviceIndex];
           auto device_type = urinfo::getDeviceType(device);
 
-          if (linear_ids) {
+          // If we are using ONEAPI_DEVICE_SELECTOR, then the device id numbers
+          // won't match, so don't print them. This matches the behavior of
+          // sycl-ls.
+          if (using_environment_selector) {
+            std::cout << "[" << adapter_backend << ":" << device_type << "]";
+          } else if (linear_ids) {
             std::cout << "[" << adapter_backend << ":" << device_type << "]";
             std::cout << "[" << adapter_backend << ":" << adapter_device_id
                       << "]";