From 5e1bfcadd7fb232130b9e2ed3e795be184c14808 Mon Sep 17 00:00:00 2001 From: Elena Sakhnovitch Date: Fri, 13 Aug 2021 11:59:50 -0400 Subject: [PATCH] rocm_smi_lib: fix gpu_metrics_v1_3 support Signed-off-by: Elena Sakhnovitch Change-Id: Ia7a6b17eb0f317465613ba92ae7548a221c46ee3 --- include/rocm_smi/rocm_smi.h | 13 ------------- src/rocm_smi_gpu_metrics.cc | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/include/rocm_smi/rocm_smi.h b/include/rocm_smi/rocm_smi.h index fc09eda1db..319015062c 100755 --- a/include/rocm_smi/rocm_smi.h +++ b/include/rocm_smi/rocm_smi.h @@ -901,19 +901,6 @@ typedef struct { uint32_t gfx_activity_acc; // new in v1 uint32_t mem_actvity_acc; // new in v1 uint16_t temperature_hbm[RSMI_NUM_HBM_INSTANCES]; // new in v1 - - /* PMFW attached timestamp (10ns resolution) */ - uint64_t firmware_timestamp; // added in v1_2 - - /* Voltage (mV) */ - uint16_t voltage_soc; // added in v1_3 - uint16_t voltage_gfx; // added in v1_3 - uint16_t voltage_mem; // added in v1_3 - - uint16_t padding1; - - /* Throttle status (ASIC independent) */ - uint64_t indep_throttle_status; // added in v1_3 /// \endcond } rsmi_gpu_metrics_t; diff --git a/src/rocm_smi_gpu_metrics.cc b/src/rocm_smi_gpu_metrics.cc index 9f961012f2..1f9fad479c 100755 --- a/src/rocm_smi_gpu_metrics.cc +++ b/src/rocm_smi_gpu_metrics.cc @@ -123,16 +123,18 @@ typedef struct { typedef struct { rsmi_gpu_metrics_t base; - /* PMFW attached timestamp (10ns resolution) */ - uint64_t firmware_timestamp; + /* PMFW attached timestamp (10ns resolution) */ + uint64_t firmware_timestamp; - /* Voltage (mV) */ - uint16_t voltage_soc; - uint16_t voltage_gfx; - uint16_t voltage_mem; + /* Voltage (mV) */ + uint16_t voltage_soc; + uint16_t voltage_gfx; + uint16_t voltage_mem; - /* Throttle status (ASIC independent) */ - uint64_t indep_throttle_status; + uint16_t padding1; + + /* Throttle status (ASIC independent) */ + uint64_t indep_throttle_status; } rsmi_gpu_metrics_v_1_3;