Add rsmi_dev_memory_total_get()and rsmi_dev_memory_usage_get()

src/rocm_smi.cc

@@ -287,6 +287,13 @@ static rsmi_status_t get_dev_value_str(amd::smi::DevInfoTypes type,
 
   return errno_to_rsmi_status(ret);
 }
+static rsmi_status_t get_dev_value_int(amd::smi::DevInfoTypes type,
+                                         uint32_t dv_ind, uint64_t *val_int) {
+  GET_DEV_FROM_INDX
+  int ret = dev->readDevInfo(type, val_int);
+
+  return errno_to_rsmi_status(ret);
+}
 
 static rsmi_status_t get_dev_value_line(amd::smi::DevInfoTypes type,
                                       uint32_t dv_ind, std::string *val_str) {
@@ -1374,6 +1381,73 @@ rsmi_dev_power_profile_set(uint32_t dv_ind, uint32_t sensor_ind,
   CATCH
 }
 
+rsmi_status_t
+rsmi_dev_memory_total_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
+                                                            uint64_t *total) {
+  TRY
+  rsmi_status_t ret;
+  amd::smi::DevInfoTypes mem_type_file;
+
+  if (total == nullptr) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
+
+  switch (mem_type) {
+    case RSMI_MEM_TYPE_GTT:
+      mem_type_file = amd::smi::kDevMemTotGTT;
+      break;
+
+    case RSMI_MEM_TYPE_VIS_VRAM:
+      mem_type_file = amd::smi::kDevMemTotVisVRAM;
+      break;
+
+    case RSMI_MEM_TYPE_VRAM:
+      mem_type_file = amd::smi::kDevMemTotVRAM;
+      break;
+
+    default:
+      assert(!"Unexpected memory type");
+      return RSMI_STATUS_INVALID_ARGS;
+  }
+  ret = get_dev_value_int(mem_type_file, dv_ind, total);
+
+  return ret;
+  CATCH
+}
+rsmi_status_t
+rsmi_dev_memory_usage_get(uint32_t dv_ind, rsmi_memory_type_t mem_type,
+                                                              uint64_t *used) {
+  TRY
+  rsmi_status_t ret;
+  amd::smi::DevInfoTypes mem_type_file;
+
+  if (used == nullptr) {
+    return RSMI_STATUS_INVALID_ARGS;
+  }
+
+  switch (mem_type) {
+    case RSMI_MEM_TYPE_GTT:
+      mem_type_file = amd::smi::kDevMemUsedGTT;
+      break;
+
+    case RSMI_MEM_TYPE_VIS_VRAM:
+      mem_type_file = amd::smi::kDevMemUsedVisVRAM;
+      break;
+
+    case RSMI_MEM_TYPE_VRAM:
+      mem_type_file = amd::smi::kDevMemUsedVRAM;
+      break;
+
+    default:
+      assert(!"Unexpected memory type");
+      return RSMI_STATUS_INVALID_ARGS;
+  }
+  ret = get_dev_value_int(mem_type_file, dv_ind, used);
+
+  return ret;
+  CATCH
+}
+
 rsmi_status_t
 rsmi_status_string(rsmi_status_t status, const char **status_string) {
   TRY

src/rocm_smi_device.cc

@@ -1,4 +1,4 @@
-/*   ROC Runtime Conformance Release License
+/*
  * =============================================================================
  * The University of Illinois/NCSA
  * Open Source License (NCSA)
@@ -74,6 +74,12 @@ static const char *kDevPCIEThruPutFName = "pcie_bw";
 static const char *kDevErrCntSDMAFName = "ras/sdma_err_count";
 static const char *kDevErrCntUMCFName = "ras/umc_err_count";
 static const char *kDevErrCntGFXFName = "ras/gfx_err_count";
+static const char *kDevMemTotGTTFName = "mem_info_gtt_total";
+static const char *kDevMemTotVisVRAMFName = "mem_info_vis_vram_total";
+static const char *kDevMemTotVRAMFName = "mem_info_vram_total";
+static const char *kDevMemUsedGTTFName = "mem_info_gtt_used";
+static const char *kDevMemUsedVisVRAMFName = "mem_info_vis_vram_used";
+static const char *kDevMemUsedVRAMFName = "mem_info_vram_used";
 
 // Strings that are found within sysfs files
 static const char *kDevPerfLevelAutoStr = "auto";
@@ -101,6 +107,12 @@ static const std::map<DevInfoTypes, const char *> kDevAttribNameMap = {
     {kDevErrCntSDMA, kDevErrCntSDMAFName},
     {kDevErrCntUMC, kDevErrCntUMCFName},
     {kDevErrCntGFX, kDevErrCntGFXFName},
+    {kDevMemTotGTT, kDevMemTotGTTFName},
+    {kDevMemTotVisVRAM, kDevMemTotVisVRAMFName},
+    {kDevMemTotVRAM, kDevMemTotVRAMFName},
+    {kDevMemUsedGTT, kDevMemUsedGTTFName},
+    {kDevMemUsedVisVRAM, kDevMemUsedVisVRAMFName},
+    {kDevMemUsedVRAM, kDevMemUsedVRAMFName},
 };
 
 static const std::map<rsmi_dev_perf_level, const char *> kDevPerfLvlMap = {
@@ -296,8 +308,7 @@ int Device::readDevInfoMultiLineStr(DevInfoTypes type,
   return 0;
 }
 
-#if 0
-int Device::readDevInfo(DevInfoTypes type, uint32_t *val) {
+int Device::readDevInfo(DevInfoTypes type, uint64_t *val) {
   assert(val != nullptr);
 
   std::string tempStr;
@@ -311,9 +322,15 @@ int Device::readDevInfo(DevInfoTypes type, uint32_t *val) {
 
     case kDevUsage:
     case kDevOverDriveLevel:
+    case kDevMemTotGTT:
+    case kDevMemTotVisVRAM:
+    case kDevMemTotVRAM:
+    case kDevMemUsedGTT:
+    case kDevMemUsedVisVRAM:
+    case kDevMemUsedVRAM:
       ret = readDevInfoStr(type, &tempStr);
       RET_IF_NONZERO(ret);
-      *val = std::stoi(tempStr, 0);
+      *val = std::stoul(tempStr, 0);
       break;
 
     default:
@@ -321,7 +338,7 @@ int Device::readDevInfo(DevInfoTypes type, uint32_t *val) {
   }
   return 0;
 }
-#endif
+
 int Device::readDevInfo(DevInfoTypes type, std::vector<std::string> *val) {
   assert(val != nullptr);
 

src/rocm_smi_monitor.cc

@@ -1,6 +1,4 @@
 /*
- * =============================================================================
- *   ROC Runtime Conformance Release License
  * =============================================================================
  * The University of Illinois/NCSA
  * Open Source License (NCSA)

src/rocm_smi_power_mon.cc

@@ -1,6 +1,4 @@
 /*
- * =============================================================================
- *   ROC Runtime Conformance Release License
  * =============================================================================
  * The University of Illinois/NCSA
  * Open Source License (NCSA)

src/rocm_smi_utils.cc

@@ -1,6 +1,4 @@
 /*
- * =============================================================================
- *   ROC Runtime Conformance Release License
  * =============================================================================
  * The University of Illinois/NCSA
  * Open Source License (NCSA)