From 3f2f92a37a43013c777ed1ddb6bf71e0f58cedda Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Tue, 22 Jul 2025 15:54:01 -0500 Subject: [PATCH] RVS - Fix iet_stress by disabling logging Signed-off-by: Galantsev, Dmitrii --- cmake_modules/Findrvs.cmake | 2 ++ .../rdc_modules/rdc_rvs/RdcDiagnosticLib.cc | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cmake_modules/Findrvs.cmake b/cmake_modules/Findrvs.cmake index 981e659a36..d2cbc7419c 100644 --- a/cmake_modules/Findrvs.cmake +++ b/cmake_modules/Findrvs.cmake @@ -51,6 +51,7 @@ if(${NAME}_FOUND AND NOT TARGET ${NAME}::${NAME}) find_package(hipblaslt REQUIRED) find_package(hsakmt REQUIRED) find_package(hip REQUIRED) + find_package(hiprand REQUIRED) find_package(hsa-runtime64 REQUIRED) find_package(amd_smi REQUIRED) target_link_libraries( @@ -62,6 +63,7 @@ if(${NAME}_FOUND AND NOT TARGET ${NAME}::${NAME}) roc::hipblaslt hsakmt::hsakmt hip::amdhip64 + hip::hiprand hsa-runtime64::hsa-runtime64 amd_smi ) diff --git a/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc b/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc index 3cdd37b7e7..908ff80aa5 100644 --- a/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc +++ b/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc @@ -119,11 +119,9 @@ rdc_status_t rdc_diag_test_case_run(rdc_diag_test_cases_t test_case, case RDC_DIAG_RVS_GST_TEST: case RDC_DIAG_RVS_MEMBW_TEST: case RDC_DIAG_RVS_H2DD2H_TEST: - case RDC_DIAG_RVS_IET_TEST: case RDC_DIAG_RVS_GST_LONG_TEST: case RDC_DIAG_RVS_MEMBW_LONG_TEST: - case RDC_DIAG_RVS_H2DD2H_LONG_TEST: - case RDC_DIAG_RVS_IET_LONG_TEST: { + case RDC_DIAG_RVS_H2DD2H_LONG_TEST: { const std::string test_name = "Finished running " + test_to_name.at(test_case); if (test_to_conf.find(test_case) == test_to_conf.end()) { RDC_LOG(RDC_ERROR, "cannot find test " << test_to_name.at(test_case)); @@ -135,6 +133,21 @@ rdc_status_t rdc_diag_test_case_run(rdc_diag_test_cases_t test_case, rvs_status = rvs_p->run_rvs_app(predefined_config.c_str(), predefined_config.length() + 1, callback); break; + } + // IET tests don't work with callback, give it nullptr + case RDC_DIAG_RVS_IET_TEST: + case RDC_DIAG_RVS_IET_LONG_TEST: { + const std::string test_name = "Finished running " + test_to_name.at(test_case); + if (test_to_conf.find(test_case) == test_to_conf.end()) { + RDC_LOG(RDC_ERROR, "cannot find test " << test_to_name.at(test_case)); + return RDC_ST_NOT_FOUND; + } + const std::string predefined_config = test_to_conf.at(test_case); + // +1 to copy null + strncpy_with_null(result->info, test_name.c_str(), test_name.length() + 1); + rvs_status = + rvs_p->run_rvs_app(predefined_config.c_str(), predefined_config.length() + 1, nullptr); + break; } case RDC_DIAG_RVS_CUSTOM: RDC_LOG(RDC_ERROR, "custom config cannot be bundled with other tests!");