[Rel 7.0 RC2]Profiler - Remove UUID metric (#224)

[ROCm/rdc commit: 6cb0cea]

Author: bwelton

projects/rdc/common/rdc_field.data

@@ -195,7 +195,6 @@ FLD_DESC_ENT(RDC_FI_PROF_CPF_CPF_TCIU_IDLE,                  "", "CPF_CPF_TCIU_I
 FLD_DESC_ENT(RDC_FI_PROF_CPF_CPF_TCIU_STALL,                 "", "CPF_CPF_TCIU_STALL",                 false)
 // Misc
 FLD_DESC_ENT(RDC_FI_PROF_SIMD_UTILIZATION, "Fraction of time the SIMDs are being utilized", "SIMD_UTILIZATION", false)
-FLD_DESC_ENT(RDC_FI_PROF_UUID,             "UUID from rocprofiler",                         "PROF_UUID",        true)
 FLD_DESC_ENT(RDC_FI_PROF_KFD_ID,           "GPU_ID from rocprofiler, same as KFD_ID",       "PROF_KFD_ID",      true)
 
 // Events

projects/rdc/include/rdc/rdc.h

@@ -344,7 +344,6 @@ typedef enum {
   RDC_FI_PROF_CPF_CPF_TCIU_IDLE,
   RDC_FI_PROF_CPF_CPF_TCIU_STALL,
   RDC_FI_PROF_SIMD_UTILIZATION,
-  RDC_FI_PROF_UUID,
   RDC_FI_PROF_KFD_ID,
 
   /**

projects/rdc/rdc_libs/rdc_modules/rdc_rocp/RdcRocpBase.cc

@@ -110,7 +110,6 @@ static const std::map<rdc_field_t, const char*> temp_field_map_k = {
     {RDC_FI_PROF_CPF_CPF_TCIU_IDLE, "CPF_CPF_TCIU_IDLE"},
     {RDC_FI_PROF_CPF_CPF_TCIU_STALL, "CPF_CPF_TCIU_STALL"},
     {RDC_FI_PROF_SIMD_UTILIZATION, "SIMD_UTILIZATION"},
-    {RDC_FI_PROF_UUID, "SQ_WAVES"},    // dummy value,
     {RDC_FI_PROF_KFD_ID, "SQ_WAVES"},  // dummy value,
 };
 
@@ -164,21 +163,6 @@ const std::vector<rdc_field_t> RdcRocpBase::get_field_ids() {
   return field_ids;
 }
 
-rocprofiler_uuid_t asic_serial_to_uuid(const char* asic_serial) {
-  rocprofiler_uuid_t uuid = {0};
-  // have to cast to stoull as a workaround for amdsmi ignoring leading zeroes
-  uuid.value = std::stoull(asic_serial, nullptr, 16);
-  return uuid;
-}
-
-std::string uuid_to_string(const uint64_t uuid) {
-  std::ostringstream oss;
-  oss << "0x" << std::hex << std::setw(16) << std::setfill('0') << uuid;
-  return oss.str();
-}
-
-std::string uuid_to_string(const rocprofiler_uuid_t& uuid) { return uuid_to_string(uuid.value); }
-
 rdc_status_t RdcRocpBase::map_entity_to_profiler() {
   // std::map<uint32_t, uint32_t> entity_to_index_map;
   // kfd_id_t is only used inside this function
@@ -419,15 +403,8 @@ rdc_status_t RdcRocpBase::rocp_lookup(rdc_gpu_field_t gpu_field, rdc_field_value
       // FLOPS/clock/CU
       data->dbl = divided_dbl / (256.0F / static_cast<double>(agents[agent_index].simd_per_cu));
       break;
-    case RDC_FI_PROF_UUID: {
-      // do not care what RDC_FI_PROF_UUID is mapped to. read value from agents
-      *type = STRING;
-      std::string uuid_str = uuid_to_string(agents[agent_index].uuid);
-      strncpy_with_null(data->str, uuid_str.c_str(), uuid_str.length());
-      break;
-    }
     case RDC_FI_PROF_KFD_ID: {
-      // do not care what RDC_FI_PROF_UUID is mapped to. read value from agents
+      // do not care what it is mapped to. read value from agents
       *type = INTEGER;
       data->l_int = agents[agent_index].gpu_id;
       break;