RVS: Finish initial RVS integration

NOTE: RVS Build is disabled by default due to CI build issues. Change-Id: I1593f0fe22075a9f86f54afa3ac151e109f1f7bd Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com> [ROCm/rdc commit: eaa1862a80]
2023-06-07 19:46:35 -05:00
Parent ea624cbb7c
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #include <memory>

 #include "rdc/rdc.h"
-#include "rdc_lib/RdcDiagnosticLibInterface.h"

 namespace amd {
 namespace rdc {
@@ -39,10 +38,12 @@ class RdcDiagnostic {
  // Run a specific test case
  virtual rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
                                         uint32_t gpu_index[RDC_MAX_NUM_DEVICES],
-                                         uint32_t gpu_count, rdc_diag_test_result_t* result) = 0;
+                                         uint32_t gpu_count, const char* config, size_t config_size,
+                                         rdc_diag_test_result_t* result) = 0;

  // Run multiple test cases
  virtual rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                          const char* config, size_t config_size,
                                          rdc_diag_response_t* response) = 0;

  virtual rdc_status_t rdc_diag_init(uint64_t flags) = 0;
@@ -37,6 +37,7 @@ rdc_status_t rdc_diag_test_cases_query(rdc_diag_test_cases_t test_cases[MAX_TEST

 rdc_status_t rdc_diag_test_case_run(rdc_diag_test_cases_t test_case,
                                    uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                    const char* config, size_t config_size,
                                    rdc_diag_test_result_t* result);

 rdc_status_t rdc_diag_init(uint64_t flags);
@@ -77,9 +77,11 @@ class RdcHandler {

  // Diagnostic API
  virtual rdc_status_t rdc_diagnostic_run(rdc_gpu_group_t group_id, rdc_diag_level_t level,
+                                          const char* config, size_t config_size,
                                          rdc_diag_response_t* response) = 0;

  virtual rdc_status_t rdc_test_case_run(rdc_gpu_group_t group_id, rdc_diag_test_cases_t test_case,
+                                         const char* config, size_t config_size,
                                         rdc_diag_test_result_t* result) = 0;

  // Control API
@@ -42,9 +42,11 @@ class RdcDiagnosticModule : public RdcDiagnostic {
  // Run a specific test case
  rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
                                 uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;

  rdc_status_t rdc_diag_init(uint64_t flags) override;
@@ -81,8 +81,10 @@ class RdcEmbeddedHandler : public RdcHandler {
  rdc_status_t rdc_field_unwatch(rdc_gpu_group_t group_id, rdc_field_grp_t field_group_id) override;
  // Diagnostic API
  rdc_status_t rdc_diagnostic_run(rdc_gpu_group_t group_id, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;
  rdc_status_t rdc_test_case_run(rdc_gpu_group_t group_id, rdc_diag_test_cases_t test_case,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  // Control API
@@ -27,9 +27,6 @@ THE SOFTWARE.
 #include "rdc_lib/RdcMetricFetcher.h"
 #include "rdc_lib/RdcModuleMgr.h"
 #include "rdc_lib/RdcTelemetry.h"
-#include "rdc_lib/impl/RdcRasLib.h"
-#include "rdc_lib/impl/RdcRocrLib.h"
-#include "rdc_lib/impl/RdcSmiLib.h"

 namespace amd {
 namespace rdc {
@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2023 - 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 INCLUDE_RDC_LIB_IMPL_RDCRVSLIB_H_
+#define INCLUDE_RDC_LIB_IMPL_RDCRVSLIB_H_
+
+#include <memory>
+#include <vector>
+
+#include "rdc/rdc.h"
+#include "rdc_lib/RdcDiagnostic.h"
+#include "rdc_lib/RdcLibraryLoader.h"
+
+namespace amd {
+namespace rdc {
+
+class RdcRVSLib : public RdcDiagnostic {
+ public:
+  rdc_status_t rdc_diag_test_cases_query(rdc_diag_test_cases_t test_cases[MAX_TEST_CASES],
+                                         uint32_t* test_case_count) override;
+
+  // Run a specific test case
+  rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
+                                 uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                 const char* config, size_t config_size,
+                                 rdc_diag_test_result_t* result) override;
+
+  rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
+                                  rdc_diag_response_t* response) override;
+
+  rdc_status_t rdc_diag_init(uint64_t flags) override;
+  rdc_status_t rdc_diag_destroy() override;
+
+  RdcRVSLib();
+
+  ~RdcRVSLib() override;
+
+ private:
+  RdcLibraryLoader lib_loader_;
+  rdc_status_t (*test_case_run_)(rdc_diag_test_cases_t, uint32_t[RDC_MAX_NUM_DEVICES], uint32_t,
+                                 const char* config, size_t config_size, rdc_diag_test_result_t*);
+  rdc_status_t (*diag_test_cases_query_)(rdc_diag_test_cases_t[MAX_TEST_CASES], uint32_t*);
+  rdc_status_t (*diag_init_)(uint64_t);
+  rdc_status_t (*diag_destroy_)();
+};
+
+typedef std::shared_ptr<RdcRVSLib> RdcRVSLibPtr;
+
+}  // namespace rdc
+}  // namespace amd
+
+#endif  // INCLUDE_RDC_LIB_IMPL_RDCRVSLIB_H_
@@ -56,9 +56,11 @@ class RdcRasLib : public RdcTelemetry, public RdcDiagnostic {
  // Run a specific test case
  rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
                                 uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;

  rdc_status_t rdc_diag_init(uint64_t flags) override;
@@ -39,9 +39,11 @@ class RdcRocrLib : public RdcDiagnostic {
  // Run a specific test case
  rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
                                 uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;

  rdc_status_t rdc_diag_init(uint64_t flags) override;
@@ -54,7 +56,7 @@ class RdcRocrLib : public RdcDiagnostic {
 private:
  RdcLibraryLoader lib_loader_;
  rdc_status_t (*test_case_run_)(rdc_diag_test_cases_t, uint32_t[RDC_MAX_NUM_DEVICES], uint32_t,
-                                 rdc_diag_test_result_t*);
+                                 const char*, size_t, rdc_diag_test_result_t*);
  rdc_status_t (*diag_test_cases_query_)(rdc_diag_test_cases_t[MAX_TEST_CASES], uint32_t*);
  rdc_status_t (*diag_init_)(uint64_t);
  rdc_status_t (*diag_destroy_)();
@@ -53,9 +53,11 @@ class RdcSmiLib : public RdcTelemetry, public RdcDiagnostic {
  // Run a specific test case
  rdc_status_t rdc_test_case_run(rdc_diag_test_cases_t test_case,
                                 uint32_t gpu_index[RDC_MAX_NUM_DEVICES], uint32_t gpu_count,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  rdc_status_t rdc_diagnostic_run(const rdc_group_info_t& gpus, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;

  rdc_status_t rdc_diag_init(uint64_t flags) override;
@@ -76,8 +76,10 @@ class RdcStandaloneHandler : public RdcHandler {
  rdc_status_t rdc_field_unwatch(rdc_gpu_group_t group_id, rdc_field_grp_t field_group_id) override;
  // Diagnostic API
  rdc_status_t rdc_diagnostic_run(rdc_gpu_group_t group_id, rdc_diag_level_t level,
+                                  const char* config, size_t config_size,
                                  rdc_diag_response_t* response) override;
  rdc_status_t rdc_test_case_run(rdc_gpu_group_t group_id, rdc_diag_test_cases_t test_case,
+                                 const char* config, size_t config_size,
                                 rdc_diag_test_result_t* result) override;

  // Control RdcAPI