From 0019e1caab1eebac65db25116aff63edb6fc6ae5 Mon Sep 17 00:00:00 2001 From: Chris Freehill Date: Thu, 24 Jan 2019 16:07:25 -0600 Subject: [PATCH] Don't assert or fail tests that are unsupported by system [ROCm/amdsmi commit: 08ec2a9804f46cf74a9b1c384fcaa931423ab48c] --- projects/amdsmi/src/rocm_smi.cc | 6 +++++- .../tests/rocm_smi_test/functional/rsmi_sanity.cc | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/amdsmi/src/rocm_smi.cc b/projects/amdsmi/src/rocm_smi.cc index ebcce80db9..7e0f13e68c 100755 --- a/projects/amdsmi/src/rocm_smi.cc +++ b/projects/amdsmi/src/rocm_smi.cc @@ -662,7 +662,11 @@ static rsmi_status_t get_od_clk_volt_info(uint32_t dv_ind, p->curr_sclk_range.upper_bound = freq_string_to_int(val_vec, nullptr, nullptr, kOD_SCLK_label_array_index + 2); - assert(val_vec[kOD_MCLK_label_array_index] == "OD_MCLK:"); + + // The condition below indicates old style format, which is not supported + if (val_vec[kOD_MCLK_label_array_index] != "OD_MCLK:") { + return RSMI_STATUS_NOT_YET_IMPLEMENTED; + } p->curr_mclk_range.lower_bound = 0; p->curr_mclk_range.upper_bound = freq_string_to_int(val_vec, nullptr, diff --git a/projects/amdsmi/tests/rocm_smi_test/functional/rsmi_sanity.cc b/projects/amdsmi/tests/rocm_smi_test/functional/rsmi_sanity.cc index 6d339d23b4..065ce11b71 100755 --- a/projects/amdsmi/tests/rocm_smi_test/functional/rsmi_sanity.cc +++ b/projects/amdsmi/tests/rocm_smi_test/functional/rsmi_sanity.cc @@ -650,7 +650,16 @@ void TestSanity::Run(void) { } err = rsmi_dev_od_volt_info_get(i, &odv); - DISPLAY_RSMI_ERR(err) + if (err == RSMI_STATUS_FILE_ERROR || + err == RSMI_STATUS_NOT_YET_IMPLEMENTED) { + IF_VERB(STANDARD) { + std::cout << + "\t**rsmi_dev_od_volt_info_get: Not supported on this machine" + << std::endl; + } + } else { + CHK_ERR_ASRT(err) + } if (err == RSMI_STATUS_SUCCESS) { std::cout << "\t**Frequency-voltage curve data:" << std::endl;