Handle different gpu_metrics content versions for format v1

Change-Id: I344d1815da683befc8f8b5caf921803b267ae29f

tests/rocm_smi_test/functional/gpu_metrics_read.cc

@@ -111,75 +111,84 @@ void TestGpuMetricsRead::Run(void) {
           "Not supported on this machine" << std::endl;
           return;
         }
-      } else {
-        CHK_ERR_ASRT(err);
-        IF_VERB(STANDARD) {
-            std::cout << std::dec << "system_clock_counter="
-            << smu.system_clock_counter << '\n';
-            std::cout << std::dec << "temperature_edge="
-            << smu.temperature_edge << '\n';
-            std::cout << std::dec << "temperature_hotspot="
-            << smu.temperature_hotspot << '\n';
-            std::cout << std::dec << "temperature_mem="
-            << smu.temperature_mem << '\n';
-            std::cout << std::dec << "temperature_vrgfx="
-            << smu.temperature_vrgfx << '\n';
-            std::cout << std::dec << "temperature_vrsoc="
-            << smu.temperature_vrsoc << '\n';
-            std::cout << std::dec << "temperature_vrmem="
-            << smu.temperature_vrmem << '\n';
-            std::cout << std::dec << "average_gfx_activity="
-            << smu.average_gfx_activity << '\n';
-            std::cout << std::dec << "average_umc_activity="
-            << smu.average_umc_activity << '\n';
-            std::cout << std::dec << "average_mm_activity="
-            << smu.average_mm_activity << '\n';
-            std::cout << std::dec << "average_socket_power="
-            << smu.average_socket_power << '\n';
-            std::cout << std::dec << "energy_accumulator="
-            << smu.energy_accumulator << '\n';
-            std::cout << std::dec << "average_gfxclk_frequency="
-            << smu.average_gfxclk_frequency << '\n';
-            std::cout << std::dec << "average_gfxclk_frequency="
-            << smu.average_gfxclk_frequency << '\n';
-            std::cout << std::dec << "average_uclk_frequency="
-            << smu.average_uclk_frequency << '\n';
-            std::cout << std::dec << "average_vclk0_frequency="
-            << smu.average_vclk0_frequency << '\n';
-            std::cout << std::dec << "average_dclk0_frequency="
-            << smu.average_dclk0_frequency << '\n';
-            std::cout << std::dec << "average_dclk0_frequency="
-            << smu.average_dclk0_frequency << '\n';
-            std::cout << std::dec << "average_dclk1_frequency="
-            << smu.average_dclk1_frequency << '\n';
-            std::cout << std::dec << "current_gfxclk="
-            << smu.current_gfxclk << '\n';
-            std::cout << std::dec << "current_socclk="
-            << smu.current_socclk << '\n';
-            std::cout << std::dec << "current_uclk="
-            << smu.current_uclk << '\n';
-            std::cout << std::dec << "current_vclk0="
-            << smu.current_vclk0 << '\n';
-            std::cout << std::dec << "current_dclk0="
-            << smu.current_dclk0 << '\n';
-            std::cout << std::dec << "current_vclk1="
-            << smu.current_vclk1 << '\n';
-            std::cout << std::dec << "current_dclk1="
-            << smu.current_dclk1 << '\n';
-            std::cout << std::dec << "throttle_status="
-            << smu.throttle_status << '\n';
-            std::cout << std::dec << "current_fan_speed="
-            << smu.current_fan_speed << '\n';
-            std::cout << "pcie_link_width="
-            << std::to_string(smu.pcie_link_width) << '\n';
-            std::cout << "pcie_link_width="
-            << std::to_string(smu.pcie_link_speed) << '\n';
+      }
+    } else {
+      CHK_ERR_ASRT(err);
+      IF_VERB(STANDARD) {
+          std::cout << std::dec << "system_clock_counter="
+          << smu.system_clock_counter << '\n';
+          std::cout << std::dec << "temperature_edge="
+          << smu.temperature_edge << '\n';
+          std::cout << std::dec << "temperature_hotspot="
+          << smu.temperature_hotspot << '\n';
+          std::cout << std::dec << "temperature_mem="
+          << smu.temperature_mem << '\n';
+          std::cout << std::dec << "temperature_vrgfx="
+          << smu.temperature_vrgfx << '\n';
+          std::cout << std::dec << "temperature_vrsoc="
+          << smu.temperature_vrsoc << '\n';
+          std::cout << std::dec << "temperature_vrmem="
+          << smu.temperature_vrmem << '\n';
+          std::cout << std::dec << "average_gfx_activity="
+          << smu.average_gfx_activity << '\n';
+          std::cout << std::dec << "average_umc_activity="
+          << smu.average_umc_activity << '\n';
+          std::cout << std::dec << "average_mm_activity="
+          << smu.average_mm_activity << '\n';
+          std::cout << std::dec << "average_socket_power="
+          << smu.average_socket_power << '\n';
+          std::cout << std::dec << "energy_accumulator="
+          << smu.energy_accumulator << '\n';
+          std::cout << std::dec << "average_gfxclk_frequency="
+          << smu.average_gfxclk_frequency << '\n';
+          std::cout << std::dec << "average_gfxclk_frequency="
+          << smu.average_gfxclk_frequency << '\n';
+          std::cout << std::dec << "average_uclk_frequency="
+          << smu.average_uclk_frequency << '\n';
+          std::cout << std::dec << "average_vclk0_frequency="
+          << smu.average_vclk0_frequency << '\n';
+          std::cout << std::dec << "average_dclk0_frequency="
+          << smu.average_dclk0_frequency << '\n';
+          std::cout << std::dec << "average_vclk1_frequency="
+          << smu.average_vclk1_frequency << '\n';
+          std::cout << std::dec << "average_dclk1_frequency="
+          << smu.average_dclk1_frequency << '\n';
+          std::cout << std::dec << "current_gfxclk="
+          << smu.current_gfxclk << '\n';
+          std::cout << std::dec << "current_socclk="
+          << smu.current_socclk << '\n';
+          std::cout << std::dec << "current_uclk="
+          << smu.current_uclk << '\n';
+          std::cout << std::dec << "current_vclk0="
+          << smu.current_vclk0 << '\n';
+          std::cout << std::dec << "current_dclk0="
+          << smu.current_dclk0 << '\n';
+          std::cout << std::dec << "current_vclk1="
+          << smu.current_vclk1 << '\n';
+          std::cout << std::dec << "current_dclk1="
+          << smu.current_dclk1 << '\n';
+          std::cout << std::dec << "throttle_status="
+          << smu.throttle_status << '\n';
+          std::cout << std::dec << "current_fan_speed="
+          << smu.current_fan_speed << '\n';
+          std::cout << "pcie_link_width="
+          << std::to_string(smu.pcie_link_width) << '\n';
+          std::cout << "pcie_link_width="
+          << std::to_string(smu.pcie_link_speed) << '\n';
+          std::cout << "gfx_activity_acc="
+          << std::dec << smu.gfx_activity_acc << '\n';
+          std::cout << "mem_actvity_acc="
+          << std::dec << smu.mem_actvity_acc  << '\n';
+
+          for (int i = 0; i < RSMI_NUM_HBM_INSTANCES; ++i) {
+            std::cout << "temperature_hbm[" << i << "]=" << std::dec <<
+                                               smu.temperature_hbm[i] << '\n';
           }
       }
+    }
 
     // Verify api support checking functionality is working
     err = rsmi_dev_gpu_metrics_info_get(i, nullptr);
     ASSERT_EQ(err, RSMI_STATUS_INVALID_ARGS);
-    }
   }
 }