Fix rocprofiler plugin

- Replace non-working fields with working ones
    - remove CU_OCCUPANCY completely as it isn't well supported
- Fix rocprofiler initialization with shared_ptr and rdc_module_init
- Replace env var ROCPROFILER_METRICS_PATH with ROCP_METRICS
    - ROCPROFILER_METRICS_PATH is only relevant for rocprofv2
    - ROCP_METRICS is only relevant for rocprofv1 (which we are using)

Change-Id: I21e6fa3f0e1694c38f44ca0e5659d672559f7380
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>

rdc_libs/rdc/src/RdcRocpLib.cc

@@ -28,6 +28,7 @@ THE SOFTWARE.
 #include <string>
 
 #include "rdc_lib/RdcException.h"
+#include "rdc_lib/RdcTelemetryLibInterface.h"
 
 namespace amd {
 namespace rdc {
@@ -37,7 +38,9 @@ RdcRocpLib::RdcRocpLib()
     : telemetry_fields_query_(nullptr),
       telemetry_fields_value_get_(nullptr),
       telemetry_fields_watch_(nullptr),
-      telemetry_fields_unwatch_(nullptr) {
+      telemetry_fields_unwatch_(nullptr),
+      rdc_module_init_(nullptr),
+      rdc_module_destroy_(nullptr) {
   rdc_status_t status = set_rocprofiler_path();
   if (status != RDC_ST_OK) {
     RDC_LOG(RDC_ERROR, "Rocp related function will not work.");
@@ -51,6 +54,24 @@ RdcRocpLib::RdcRocpLib()
     return;
   }
 
+  status = lib_loader_.load_symbol(&rdc_module_init_, "rdc_module_init");
+  if (status != RDC_ST_OK) {
+    rdc_module_init_ = nullptr;
+    return;
+  }
+
+  status = rdc_module_init_(0);
+  if (status != RDC_ST_OK) {
+    RDC_LOG(RDC_ERROR, "Fail to init librdc_rocp.so:" << rdc_status_string(status)
+                                                      << ". ROCP related function will not work.");
+    return;
+  }
+
+  status = lib_loader_.load_symbol(&rdc_module_destroy_, "rdc_module_destroy");
+  if (status != RDC_ST_OK) {
+    rdc_module_destroy_ = nullptr;
+  }
+
   status = lib_loader_.load_symbol(&telemetry_fields_query_, "rdc_telemetry_fields_query");
   if (status != RDC_ST_OK) {
     telemetry_fields_query_ = nullptr;
@@ -163,37 +184,31 @@ std::string RdcRocpLib::get_rocm_path() {
 }
 
 rdc_status_t RdcRocpLib::set_rocprofiler_path() {
-  // librocprofiler64 requires ROCPROFILER_METRICS_PATH to be set
+  // rocprofiler requires ROCP_METRICS to be set
   std::string rocprofiler_metrics_path =
       get_rocm_path() + "/libexec/rocprofiler/counters/derived_counters.xml";
 
   // set rocm prefix
-  int result = setenv("ROCPROFILER_METRICS_PATH", rocprofiler_metrics_path.c_str(), 0);
+  int result = setenv("ROCP_METRICS", rocprofiler_metrics_path.c_str(), 0);
   if (result != 0) {
-    RDC_LOG(RDC_ERROR, "setenv ROCPROFILER_METRICS_PATH failed! " << result);
+    RDC_LOG(RDC_ERROR, "setenv ROCP_METRICS failed! " << result);
     return RDC_ST_PERM_ERROR;
   }
 
   // check that env exists
-  const char* rocprofiler_metrics_env = getenv("ROCPROFILER_METRICS_PATH");
+  const char* rocprofiler_metrics_env = getenv("ROCP_METRICS");
   if (rocprofiler_metrics_env == nullptr) {
-    RDC_LOG(RDC_ERROR, "ROCPROFILER_METRICS_PATH is not set!");
+    RDC_LOG(RDC_ERROR, "ROCP_METRICS is not set!");
     return RDC_ST_NO_DATA;
   }
 
   // check that file can be accessed
   std::ifstream test_file(rocprofiler_metrics_env);
   if (!test_file.good()) {
-    RDC_LOG(RDC_ERROR, "failed to open ROCPROFILER_METRICS_PATH: " << rocprofiler_metrics_env);
+    RDC_LOG(RDC_ERROR, "failed to open ROCP_METRICS: " << rocprofiler_metrics_env);
     return RDC_ST_FILE_ERROR;
   }
 
-  result = setenv("ROCP_METRICS", rocprofiler_metrics_path.c_str(), 0);
-  if (result != 0) {
-    RDC_LOG(RDC_ERROR, "setenv ROCP_METRICS failed! " << result);
-    return RDC_ST_PERM_ERROR;
-  }
-
   return RDC_ST_OK;
 }
 

rdc_libs/rdc_modules/rdc_rocp/RdcRocpBase.cc

@@ -243,7 +243,6 @@ RdcRocpBase::RdcRocpBase() {
 
   // all fields
   static const std::map<rdc_field_t, const char*> temp_field_map_k = {
-      {RDC_FI_PROF_CU_OCCUPANCY, "CU_OCCUPANCY"},
       {RDC_FI_PROF_MEAN_OCCUPANCY_PER_CU, "MEAN_OCCUPANCY_PER_CU"},
       {RDC_FI_PROF_MEAN_OCCUPANCY_PER_ACTIVE_CU, "MEAN_OCCUPANCY_PER_ACTIVE_CU"},
       {RDC_FI_PROF_ACTIVE_CYCLES, "ACTIVE_CYCLES"},

rdc_libs/rdc_modules/rdc_rocp/RdcTelemetryLib.cc

@@ -36,14 +36,24 @@ THE SOFTWARE.
 #include "rdc_lib/rdc_common.h"
 #include "rdc_modules/rdc_rocp/RdcRocpBase.h"
 
-amd::rdc::RdcRocpBase rocp;
+std::unique_ptr<amd::rdc::RdcRocpBase> rocp_p;
 
-rdc_status_t rdc_module_init(uint64_t flags) { return RDC_ST_OK; }
+rdc_status_t rdc_module_init(uint64_t flags) {
+  rocp_p = std::unique_ptr<amd::rdc::RdcRocpBase>(new amd::rdc::RdcRocpBase);
+  return RDC_ST_OK;
+}
+rdc_status_t rdc_module_destroy() {
+  rocp_p.reset();
+  return RDC_ST_OK;
+}
 
 // get supported field ids
 rdc_status_t rdc_telemetry_fields_query(uint32_t field_ids[MAX_NUM_FIELDS], uint32_t* field_count) {
   // extract all keys from counter_map
-  std::vector<rdc_field_t> fields = rocp.get_field_ids();
+  if (rocp_p == nullptr) {
+    return RDC_ST_FAIL_LOAD_MODULE;
+  }
+  std::vector<rdc_field_t> fields = rocp_p->get_field_ids();
   std::vector<uint32_t> counter_keys(fields.begin(), fields.end());
 
   *field_count = counter_keys.size();
@@ -56,7 +66,10 @@ rdc_status_t rdc_telemetry_fields_query(uint32_t field_ids[MAX_NUM_FIELDS], uint
 // Fetch
 rdc_status_t rdc_telemetry_fields_value_get(rdc_gpu_field_t* fields, const uint32_t fields_count,
                                             rdc_field_value_f callback, void* user_data) {
-  //
+  if (rocp_p == nullptr) {
+    return RDC_ST_FAIL_LOAD_MODULE;
+  }
+
   // Bulk fetch fields
   std::vector<rdc_gpu_field_value_t> bulk_results;
 
@@ -81,7 +94,7 @@ rdc_status_t rdc_telemetry_fields_value_get(rdc_gpu_field_t* fields, const uint3
       bulk_count = 0;
     }
 
-    status = rocp.rocp_lookup(fields[i].gpu_index, fields[i].field_id, &data);
+    status = rocp_p->rocp_lookup(fields[i].gpu_index, fields[i].field_id, &data);
     // get value
     values[bulk_count].gpu_index = fields[i].gpu_index;
     values[bulk_count].field_value.type = DOUBLE;