From 912bcfaae94dcc80c69589bcea92fb425585e874 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Wed, 14 May 2025 02:19:05 +0000 Subject: [PATCH] Pad asic_serial and UUID with zeros Change-Id: Icf9bfdf9be60525433da378a77ddf5a8bcc21579 Signed-off-by: Galantsev, Dmitrii --- src/amd_smi/amd_smi.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 3093784fc7..dfcb5161d2 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -672,12 +672,12 @@ amdsmi_get_gpu_enumeration_info(amdsmi_processor_handle processor_handle, uint64_t device_uuid = 0; std::string hip_uuid_str; status = rsmi_wrapper(rsmi_dev_unique_id_get, processor_handle, 0, &device_uuid); - ss_uuid << "GPU-" << std::hex << device_uuid; + ss_uuid << "GPU-" << std::hex << std::setw(16) << std::setfill('0') << device_uuid; hip_uuid_str = ss_uuid.str(); smi_clear_char_and_reinitialize(info->hip_uuid, AMDSMI_MAX_STRING_LENGTH, hip_uuid_str); ss << "; device_uuid (dec): " << device_uuid << "\n" - << "; device_uuid (hex): 0x" << std::hex << device_uuid << std::dec << "\n" + << "; device_uuid (hex): 0x" << std::hex << std::setw(16) << std::setfill('0') << device_uuid << std::dec << "\n" << "; rsmi_dev_unique_id_get() status: " << smi_amdgpu_get_status_string(status, false) << "\n"; LOG_INFO(ss); @@ -1520,11 +1520,11 @@ amdsmi_get_gpu_asic_info(amdsmi_processor_handle processor_handle, amdsmi_asic_i // Ensure asic_serial defaults to an unsupported value std::string max_uint64_str = "ffffffffffffffff"; smi_clear_char_and_reinitialize(info->asic_serial, AMDSMI_MAX_STRING_LENGTH, max_uint64_str); - uint64_t dv_uid = 0; - status = rsmi_wrapper(rsmi_dev_unique_id_get, processor_handle, 0, &dv_uid); + uint64_t device_uuid = 0; + status = rsmi_wrapper(rsmi_dev_unique_id_get, processor_handle, 0, &device_uuid); if (status == AMDSMI_STATUS_SUCCESS) { ss.clear(); - ss << std::hex << dv_uid; + ss << std::hex << std::setw(16) << std::setfill('0') << device_uuid; std::string asic_serial_str = ss.str(); ss.clear(); smi_clear_char_and_reinitialize(info->asic_serial, AMDSMI_MAX_STRING_LENGTH,