Merge amd-staging into amd-master 20230720

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: Ib2cb8cd0fa41f863e692dd5f92ab78ace776210c

.gitignore

@@ -12,3 +12,6 @@ python_smi_tools/rsmiBindings.py
 
 # Build directory
 build/
+
+# CMake cache
+.cache/

python_smi_tools/rocm_smi.py

@@ -537,7 +537,7 @@ def printEventList(device, delay, eventList):
         data = rsmi_evt_notification_data_t(1)
         rocmsmi.rsmi_event_notification_get(delay, byref(num_elements), byref(data))
         if len(data.message) > 0:
-            print2DArray([['\rGPU[%d]:\t' % (device), ctime().split()[3], notification_type_names[data.event.value - 1],
+            print2DArray([['\rGPU[%d]:\t' % (data.dv_ind), ctime().split()[3], notification_type_names[data.event.value - 1],
                            data.message.decode('utf8') + '\r']])
 
 def printLog(device, metricName, value=None, extraSpace=False):

src/rocm_smi_device.cc

@@ -379,7 +379,8 @@ static const std::map<const char *, dev_depends_t> kDevFuncDependsMap = {
   {"rsmi_dev_name_get",                  {{kDevVendorIDFName,
                                            kDevDevIDFName}, {}}},
   {"rsmi_dev_sku_get",                   {{kDevDevProdNumFName}, {}}},
-  {"rsmi_dev_brand_get",                 {{kDevVendorIDFName}, {}}},
+  {"rsmi_dev_brand_get",                 {{kDevVendorIDFName,
+                                           kDevVBiosVerFName}, {}}},
   {"rsmi_dev_vendor_name_get",           {{kDevVendorIDFName}, {}}},
   {"rsmi_dev_serial_number_get",         {{kDevSerialNumberFName}, {}}},
   {"rsmi_dev_subsystem_id_get",          {{kDevSubSysDevIDFName}, {}}},

tests/rocm_smi_test/functional/id_info_read.cc

@@ -162,7 +162,7 @@ void TestIdInfoRead::Run(void) {
       IF_VERB(STANDARD) {
         std::cout << "\t**Device Vram Vendor name: " << buffer << std::endl;
       }
-      err = rsmi_dev_brand_get(i, nullptr, kBufferLen);
+      err = rsmi_dev_vram_vendor_get(i, nullptr, kBufferLen);
       ASSERT_EQ(err, RSMI_STATUS_INVALID_ARGS);
     }
     err = rsmi_dev_vendor_id_get(i, &id);

tests/rocm_smi_test/functional/sys_info_read.cc

@@ -105,7 +105,7 @@ void TestSysInfoRead::Run(void) {
     err = rsmi_dev_vbios_version_get(i, buffer, 80);
 
     if (err != RSMI_STATUS_SUCCESS) {
-      if (err == RSMI_STATUS_FILE_ERROR) {
+      if ((err == RSMI_STATUS_FILE_ERROR) || (err == RSMI_STATUS_NOT_SUPPORTED)) {
         IF_VERB(STANDARD) {
           std::cout << "\t**VBIOS read: Not supported on this machine"
                                                                 << std::endl;