Support watch() and unwatch() in RDC module framework

The framework now supports watch() and unwatch(), which can be used
by the telemetry library to init events or pre-fetch fields when recording
starts.
* A new header file RdcTelemetryLibInterface.h is defined for library to
  include it.
* The RdcWatchTable will not talk to RdcMetricFetcher directly anymore.
  It will call the framework watch/unwatch to dispatch it to the libraries.
* Make the python binding consistent with the current code.

Change-Id: Ie5731d920ed5928f901369d60c23bd450807a562

include/rdc_lib/RdcTelemetry.h

@@ -24,26 +24,11 @@ THE SOFTWARE.
 
 #include <memory>
 #include "rdc/rdc.h"
+#include "rdc_lib/RdcTelemetryLibInterface.h"
 
 namespace amd {
 namespace rdc {
 
-// Structure to keep both gup index and field value
-typedef struct {
-    uint32_t gpu_index;
-    rdc_field_value field_value;
-} rdc_gpu_field_value_t;
-
-
-typedef struct {
-    uint32_t gpu_index;
-    rdc_field_t field_id;
-} rdc_gpu_field_t;
-
-#define MAX_NUM_FIELDS 8192
-typedef rdc_status_t(*rdc_field_value_f)(rdc_gpu_field_value_t*  values,
-            uint32_t num_values, void*  user_data);
-
 class RdcTelemetry {
  public:
     // get support field ids

include/rdc_lib/RdcTelemetryLibInterface.h

@@ -0,0 +1,68 @@
+/*
+Copyright (c) 2020 - present Advanced Micro Devices, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+#ifndef RDC_LIB_RDCTELEMETRYLIBINTERFACE_H_
+#define RDC_LIB_RDCTELEMETRYLIBINTERFACE_H_
+
+// The telemetry interface for libraries, for example, RAS.
+#include <rdc/rdc.h>
+#include <cstdint>
+
+extern "C" {
+
+// Structure to keep both gup index and field value
+typedef struct {
+    uint32_t gpu_index;
+    rdc_field_value field_value;
+} rdc_gpu_field_value_t;
+
+typedef struct {
+    uint32_t gpu_index;
+    rdc_field_t field_id;
+} rdc_gpu_field_t;
+
+#define MAX_NUM_FIELDS 8192
+typedef rdc_status_t(*rdc_field_value_f)(rdc_gpu_field_value_t*  values,
+                uint32_t num_values, void*  user_data);
+
+// The library will implement below function
+
+rdc_status_t rdc_telemetry_fields_query(uint32_t field_ids[MAX_NUM_FIELDS],
+                uint32_t* field_count);
+
+rdc_status_t rdc_telemetry_fields_value_get(rdc_gpu_field_t* fields,
+                uint32_t fields_count, rdc_field_value_f callback,
+                void*  user_data);
+
+
+rdc_status_t rdc_telemetry_fields_watch(rdc_gpu_field_t* fields,
+                uint32_t fields_count);
+
+rdc_status_t rdc_telemetry_fields_unwatch(rdc_gpu_field_t* fields,
+                uint32_t fields_count);
+
+rdc_status_t rdc_module_init(uint64_t flags);
+
+rdc_status_t rdc_module_destroy();
+
+}
+
+#endif   // RDC_LIB_RDCTELEMETRYLIBINTERFACE_H_

include/rdc_lib/impl/RdcMetricFetcherImpl.h

@@ -24,6 +24,7 @@ THE SOFTWARE.
 
 #include <mutex>  // NOLINT(build/c++11)
 #include <future>  // NOLINT(build/c++11)
+#include <memory>
 #include <condition_variable>  // NOLINT(build/c++11)
 #include <map>
 #include <queue>
@@ -54,7 +55,7 @@ struct FieldRSMIData {
     union {
         rsmi_counter_value_t counter_val;
     };
-    ~FieldRSMIData(){}
+    ~FieldRSMIData() {}
     FieldRSMIData() : evt_handle(0), counter_val{0, 0, 0}{}
 };
 

include/rdc_lib/impl/RdcRasLib.h

@@ -61,6 +61,9 @@ class RdcRasLib: public RdcTelemetry {
                 uint32_t, rdc_field_value_f, void*);
     rdc_status_t (*fields_query_)(uint32_t[MAX_NUM_FIELDS], uint32_t*);
 
+    rdc_status_t (*fields_watch_)(rdc_gpu_field_t*, uint32_t);
+    rdc_status_t (*fields_unwatch_)(rdc_gpu_field_t*, uint32_t);
+
     rdc_status_t (*rdc_module_init_)(uint64_t);
     rdc_status_t (*rdc_module_destroy_)();
 };

include/rdc_lib/impl/RdcTelemetryModule.h

@@ -24,6 +24,7 @@ THE SOFTWARE.
 
 #include <map>
 #include <list>
+#include <vector>
 #include <memory>
 #include "rdc_lib/RdcTelemetry.h"
 #include "rdc_lib/impl/RdcRasLib.h"
@@ -49,7 +50,15 @@ class RdcTelemetryModule : public RdcTelemetry {
 
     RdcTelemetryModule(const RdcMetricFetcherPtr& fetcher,
             const RdcRasLibPtr& ras_module);
+
  private:
+    //< Helper function to dispatch fields to module
+    void get_fields_for_module(
+        rdc_gpu_field_t* fields,
+        uint32_t fields_count,
+        std::map<RdcTelemetryPtr, std::vector<rdc_gpu_field_t>>
+                        & fields_in_module,
+        std::vector<rdc_gpu_field_value_t>& unsupport_fields); // NOLINT
     std::list<RdcTelemetryPtr> telemetry_modules_;
     std::map<uint32_t, RdcTelemetryPtr> fields_id_module_;
 };

include/rdc_lib/impl/RdcWatchTableImpl.h

@@ -83,10 +83,8 @@ class RdcWatchTableImpl : public RdcWatchTable {
     //!< once per second.
     rdc_status_t rdc_field_update_all() override;
 
-    // TODO(bill_liu): Remove the RdcMetricFetcherPtr
     RdcWatchTableImpl(const RdcGroupSettingsPtr& group_settings,
         const RdcCacheManagerPtr& cache_mgr,
-        const RdcMetricFetcherPtr& metric_fetcher,
         const RdcModuleMgrPtr& module_mgr);
 
  private:
@@ -116,7 +114,6 @@ class RdcWatchTableImpl : public RdcWatchTable {
 
     RdcGroupSettingsPtr group_settings_;
     RdcCacheManagerPtr cache_mgr_;
-    RdcMetricFetcherPtr metric_fetcher_;
     RdcModuleMgrPtr rdc_module_mgr_;
 
     //!< The watch table to store the watch settings.