AIESW-29257: Fix xrt-smi device ID reporting

src/runtime_src/core/common/query_requests.h

@@ -497,6 +497,17 @@ struct pcie_bdf : request
       (boost::format("%04x:%02x:%02x.%01x") % std::get<0>(value) %
        std::get<1>(value) % std::get<2>(value) % std::get<3>(value));
   }
+
+  static xrt::uuid
+  to_uuid(const result_type& bdf)
+  {
+    xuid_t uid = {};
+    auto* ptr = reinterpret_cast<uint8_t*>(&uid);
+    std::apply([&ptr](const auto&... fields) {
+      ((std::memcpy(ptr, &fields, sizeof(fields)), ptr += sizeof(fields)), ...);
+    }, bdf);
+    return {uid};
+  }
 };
 
 /**

src/runtime_src/core/tools/common/XBUtilities.cpp

@@ -86,6 +86,7 @@ XBUtilities::Timer::format_time(std::chrono::duration<double> duration)
   return formatted_time;
 }
 
+
 boost::property_tree::ptree
 XBUtilities::get_available_devices(bool inUserDomain)
 {
@@ -120,20 +121,26 @@ XBUtilities::get_available_devices(bool inUserDomain)
         break;
       }
 
-      try { //1RP
-        pt_dev.put("id", xrt_core::query::rom_time_since_epoch::to_string(xrt_core::device_query<xrt_core::query::rom_time_since_epoch>(device)));
-      }
-      catch(...) {
-        // The id wasn't added
+      if (device_class == xrt_core::query::device_class::type::ryzen) {
+        try { // Ryzen/NPU: derive UUID from PCIe BDF
+          pt_dev.put("id", xrt_core::query::pcie_bdf::to_uuid(
+            xrt_core::device_query<xrt_core::query::pcie_bdf>(device)).to_string());
+        }
+        catch(...) {}
       }
+      else {
+        try { //1RP
+          pt_dev.put("id", xrt_core::query::rom_time_since_epoch::to_string(
+            xrt_core::device_query<xrt_core::query::rom_time_since_epoch>(device)));
+        }
+        catch(...) {}
 
-      try { //2RP
-        auto logic_uuids = xrt_core::device_query<xrt_core::query::logic_uuids>(device);
-        if (!logic_uuids.empty())
-          pt_dev.put("id", xrt_core::query::interface_uuids::to_uuid_upper_string(logic_uuids[0]));
-      }
-      catch(...) {
-        // The id wasn't added
+        try { //2RP - overwrites 1RP if available
+          auto logic_uuids = xrt_core::device_query<xrt_core::query::logic_uuids>(device);
+          if (!logic_uuids.empty())
+            pt_dev.put("id", xrt_core::query::interface_uuids::to_uuid_upper_string(logic_uuids[0]));
+        }
+        catch(...) {}
       }
 
       try {

src/runtime_src/hip/api/hip_device.cpp

@@ -116,10 +116,8 @@ hip_device_get_uuid(hipDevice_t device)
 
   hipUUID uid = {0};
   auto bdf = xrt_core::device_query<xrt_core::query::pcie_bdf>((device_cache.get_or_error(device))->get_xrt_device().get_handle());
-  std::memcpy(uid.bytes, &std::get<0>(bdf), sizeof(uint16_t));
-  std::memcpy(uid.bytes + sizeof(uint16_t), &std::get<1>(bdf), sizeof(uint16_t));
-  std::memcpy(uid.bytes + 2 * sizeof(uint16_t), &std::get<2>(bdf), sizeof(uint16_t));
-  std::memcpy(uid.bytes + 3 * sizeof(uint16_t), &std::get<3>(bdf), sizeof(uint16_t));
+  auto uuid = xrt_core::query::pcie_bdf::to_uuid(bdf);
+  std::memcpy(uid.bytes, uuid.get(), sizeof(uid.bytes));
   return uid;
 }