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]

projects/rdc/include/rdc/rdc.h

@@ -28,10 +28,20 @@ extern "C" {
 #endif  // __cplusplus
 
 #ifdef __cplusplus
+
+// cstddef include causes issues on older GCC
+// use stddef.h instead
+#if __GNUC__ < 9
+#include <stddef.h>
+#else
+#include <cstddef>
+#endif  // __GNUC__
+
 #include <cstdint>
 #else
+#include <stddef.h>
 #include <stdint.h>
-#endif
+#endif  // __cplusplus
 
 /** \file rdc.h
  *  Main header file for the ROCm RDC library.
@@ -434,6 +444,7 @@ typedef enum {
   RDC_DIAG_COMPUTE_QUEUE,   //!< The Compute Queue is ready
   RDC_DIAG_SYS_MEM_CHECK,   //!< Check System memory
   RDC_DIAG_NODE_TOPOLOGY,   //!< Report node topology
+  RDC_DIAG_RVS_TEST,        //!< TODO: Replace with real RVS tests
   RDC_DIAG_GPU_PARAMETERS,  //!< GPU parameters in range
   RDC_DIAG_TEST_LAST = RDC_DIAG_GPU_PARAMETERS
 } rdc_diag_test_cases_t;
@@ -972,12 +983,17 @@ rdc_status_t rdc_field_unwatch(rdc_handle_t p_rdc_handle, rdc_gpu_group_t group_
  *  The RDC_DIAG_LVL_SHORT only take a few seconds, and the
  *  the RDC_DIAG_LVL_LONG may take up to 15 minutes.
  *
+ *  @param[in] config  Implementation specific configuration.
+ *
+ *  @param[in] config_size  Length of the configuration.
+ *
  *  @param[inout] response  The detail results of the tests run.
  *
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
 rdc_status_t rdc_diagnostic_run(rdc_handle_t p_rdc_handle, rdc_gpu_group_t group_id,
-                                rdc_diag_level_t level, rdc_diag_response_t* response);
+                                rdc_diag_level_t level, const char* config, size_t config_size,
+                                rdc_diag_response_t* response);
 
 /**
  *  @brief Run one diagnostic test case
@@ -990,12 +1006,17 @@ rdc_status_t rdc_diagnostic_run(rdc_handle_t p_rdc_handle, rdc_gpu_group_t group
  *
  *  @param[in] test_case  The test case to run.
  *
+ *  @param[in] config  Implementation specific configuration.
+ *
+ *  @param[in] config_size  Length of the configuration.
+ *
  *  @param[inout] result  The results of the test.
  *
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
 rdc_status_t rdc_test_case_run(rdc_handle_t p_rdc_handle, rdc_gpu_group_t group_id,
-                               rdc_diag_test_cases_t test_case, rdc_diag_test_result_t* result);
+                               rdc_diag_test_cases_t test_case, const char* config,
+                               size_t config_size, rdc_diag_test_result_t* result);
 
 /**
  *  @brief Get a description of a provided RDC error status

projects/rdc/include/rdc_lib/RdcDiagnostic.h

@@ -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;

projects/rdc/include/rdc_lib/RdcDiagnosticLibInterface.h

@@ -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);

projects/rdc/include/rdc_lib/RdcHandler.h

@@ -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

projects/rdc/include/rdc_lib/impl/RdcDiagnosticModule.h

@@ -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;

projects/rdc/include/rdc_lib/impl/RdcEmbeddedHandler.h

@@ -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

projects/rdc/include/rdc_lib/impl/RdcModuleMgrImpl.h

@@ -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 {

projects/rdc/include/rdc_lib/impl/RdcRVSLib.h

@@ -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_

projects/rdc/include/rdc_lib/impl/RdcRasLib.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;

projects/rdc/include/rdc_lib/impl/RdcRocrLib.h

@@ -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_)();

projects/rdc/include/rdc_lib/impl/RdcSmiLib.h

@@ -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;

projects/rdc/include/rdc_lib/impl/RdcStandaloneHandler.h

@@ -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

projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h

@@ -0,0 +1,38 @@
+/*
+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 RDC_MODULES_RDC_RVS_RVSBASE_H_
+#define RDC_MODULES_RDC_RVS_RVSBASE_H_
+
+#include <cstddef>
+
+#include "rvs/rvs.h"
+
+namespace amd {
+namespace rdc {
+
+void session_callback(rvs_session_id_t session_id, const rvs_results_t* results);
+
+rvs_status_t run_rvs_app(const char* config, size_t config_size);
+}  // namespace rdc
+}  // namespace amd
+
+#endif  // RDC_MODULES_RDC_RVS_RVSBASE_H_