Change #define RSMI_GPU_METRICS_API_CONTENT_VER

Chnage to RSMI_GPU_METRICS_API_CONTENT_VER_1. In preparation for
supporting additional formats

Signed-off-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Change-Id: I4367a2622a0fa41e6b05bc4436ecd24b8c4e30e2

include/rocm_smi/rocm_smi.h

@@ -833,7 +833,7 @@ struct metrics_table_header_t {
 #define RSMI_GPU_METRICS_API_FORMAT_VER 1
 // The content version increments when gpu_metrics is extended with new and/or
 // existing field sizes are changed.
-#define RSMI_GPU_METRICS_API_CONTENT_VER 1
+#define RSMI_GPU_METRICS_API_CONTENT_VER_1 1
 
 // This should match NUM_HBM_INSTANCES
 #define RSMI_NUM_HBM_INSTANCES 4

src/rocm_smi_gpu_metrics.cc

@@ -119,10 +119,10 @@ typedef struct {
 
 static rsmi_status_t GetGPUMetricsFormat1(uint32_t dv_ind,
                                 rsmi_gpu_metrics_t *data, uint8_t content_v) {
-  assert(content_v != RSMI_GPU_METRICS_API_CONTENT_VER);
-  if (content_v == RSMI_GPU_METRICS_API_CONTENT_VER) {
+  assert(content_v != RSMI_GPU_METRICS_API_CONTENT_VER_1);
+  if (content_v == RSMI_GPU_METRICS_API_CONTENT_VER_1) {
     // This function shouldn't be called if content version is
-    // RSMI_GPU_METRICS_API_CONTENT_VER.
+    // RSMI_GPU_METRICS_API_CONTENT_VER_1.
     return RSMI_STATUS_INVALID_ARGS;
   }
   void *metric_data = nullptr;
@@ -224,7 +224,7 @@ rsmi_dev_gpu_metrics_info_get(uint32_t dv_ind, rsmi_gpu_metrics_t *smu) {
     return RSMI_STATUS_NOT_SUPPORTED;
   } else {  // format_revision == 1
     if (dev->gpu_metrics_ver().content_revision ==
-                                           RSMI_GPU_METRICS_API_CONTENT_VER) {
+                                           RSMI_GPU_METRICS_API_CONTENT_VER_1) {
       ret = GetDevBinaryBlob(amd::smi::kDevGpuMetrics, dv_ind,
                                            sizeof(rsmi_gpu_metrics_t), smu);
     } else {