Add support to use the field name in rdci

In the rdci dmon and fieldgroup, now the fields can be specified
using either number id or the field name.

When the rdc is async fetching metrics, it will not report that fetch
as an error.

Change-Id: I81331e2c239af987181147be5ac0e29ba1617ab4


[ROCm/rdc commit: d30cb81fdb]

projects/rdc/rdci/src/RdciDmonSubSystem.cc

@@ -147,10 +147,15 @@ void RdciDmonSubSystem::parse_cmd_opts(int argc, char ** argv) {
             std::vector<std::string> vec_ids = split_string(field_ids, ',');
             for (uint32_t i = 0; i < vec_ids.size(); i++) {
                 if (!IsNumber(vec_ids[i])) {
-                    throw RdcException(RDC_ST_BAD_PARAMETER, "The field Id "
-                            +vec_ids[i]+" needs to be a number");
+                    uint32_t field_id = 0;
+                    if (!get_field_id_from_name(vec_ids[i], field_id)) {
+                         throw RdcException(RDC_ST_BAD_PARAMETER,
+                            "The field name "+vec_ids[i]+" is not valid");
+                    }
+                    field_ids_.push_back(field_id);
+                } else {
+                    field_ids_.push_back(std::stoi(vec_ids[i]));
                 }
-                field_ids_.push_back(std::stoi(vec_ids[i]));
             }
         }
     }

projects/rdc/rdci/src/RdciFieldGroupSubSystem.cc

@@ -158,10 +158,13 @@ void RdciFieldGroupSubSystem::process() {
                uint32_t field_ids[RDC_MAX_FIELD_IDS_PER_FIELD_GROUP];
                for (uint32_t i = 0; i < fields.size(); i++) {
                    if (!IsNumber(fields[i])) {
-                       throw RdcException(RDC_ST_BAD_PARAMETER,
-                            "The field Id "+fields[i]+" needs to be a number");
+                       if (!get_field_id_from_name(fields[i], field_ids[i])) {
+                         throw RdcException(RDC_ST_BAD_PARAMETER,
+                            "The field name "+fields[i]+" is not valid");
+                       }
+                   } else {
+                     field_ids[i] = std::stoi(fields[i]);
                    }
-                   field_ids[i] = std::stoi(fields[i]);
                }
                rdc_field_grp_t group_id;
                result = rdc_group_field_create(rdc_handle_, fields.size(),

projects/rdc/rdci/src/RdciSubSystem.cc

@@ -40,6 +40,34 @@ RdciSubSystem::RdciSubSystem():
      }
 }
 
+bool RdciSubSystem::get_field_id_from_name(
+        const std::string& name, uint32_t& value) const {
+    const std::map<std::string, uint32_t> field_name_to_id = {
+        {"RDC_FI_GPU_MEMORY_USAGE", 525},
+        {"RDC_FI_GPU_MEMORY_TOTAL", 580},
+        {"RDC_FI_POWER_USAGE", 155},
+        {"RDC_FI_GPU_CLOCK", 100},
+        {"RDC_FI_MEM_CLOCK", 101},
+        {"RDC_FI_PCIE_TX", 200},
+        {"RDC_FI_PCIE_RX", 201},
+        {"RDC_FI_GPU_UTIL", 203},
+        {"RDC_FI_ECC_CORRECT_TOTAL", 312},
+        {"RDC_FI_ECC_UNCORRECT_TOTAL", 313},
+        {"RDC_FI_MEMORY_TEMP", 140},
+        {"RDC_FI_GPU_TEMP", 150},
+        {"RDC_FI_GPU_COUNT", 4},
+        {"RDC_FI_DEV_NAME", 50}
+    };
+
+    auto id = field_name_to_id.find(name);
+    if (id == field_name_to_id.end()) {
+        return false;
+    }
+
+    value = id->second;
+    return true;
+}
+
 std::vector<std::string> RdciSubSystem::split_string(const std::string& s,
             char delimiter) const {
     std::vector<std::string> tokens;