AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GPU Metric content revision check

Browse Source 
Change-Id: I94ff4732be01214591b635357d9a62eb7d5192a0
Signed-off-by: Charis Poag <Charis.Poag@amd.com>
This commit is contained in:
Charis Poag
2023-10-31 17:37:43 -05:00
parent de5bc164de
commit b49e82a4f4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocm_smi/example/rocm_smi_example.cc
+4
View File
@@ -808,6 +808,10 @@ int main() {
print_test_header("GPU METRICS", i);
print_function_header_with_rsmi_ret(ret,
"rsmi_dev_gpu_metrics_info_get(" + std::to_string(i) + ", &p)");
std::cout << "\t**p.common_header.content_revision: " << std::dec
<< p.common_header.content_revision << "\n";
std::cout << "\t**p.common_header.format_revision: " << std::dec
<< p.common_header.format_revision << "\n";
std::cout << "\t**p.average_gfxclk_frequency: " << std::dec
<< p.average_gfxclk_frequency << "\n";
std::cout << "\t**p.average_socclk_frequency: " << std::dec
src/rocm_smi_gpu_metrics.cc
+9 -4
View File
@@ -496,10 +496,15 @@ rsmi_dev_gpu_metrics_info_get(uint32_t dv_ind, rsmi_gpu_metrics_t *smu) {
// a specific version.
*smu = {};
uint8_t dev_content_revision = dev->gpu_metrics_ver().content_revision;
if (dev_content_revision != RSMI_GPU_METRICS_API_CONTENT_VER_1 ||
dev_content_revision != RSMI_GPU_METRICS_API_CONTENT_VER_2 ||
dev_content_revision != RSMI_GPU_METRICS_API_CONTENT_VER_3) {
bool isRevisionExpected = ((dev->gpu_metrics_ver().content_revision == 1) ||
(dev->gpu_metrics_ver().content_revision == 2) ||
(dev->gpu_metrics_ver().content_revision == 3));
if (isRevisionExpected == false) {
ss << __PRETTY_FUNCTION__ << " | content revision was = "
<< print_unsigned_hex_and_int(dev->gpu_metrics_ver().content_revision)
<< ", expected version 1,2, or 3 | returning "
<< getRSMIStatusString(RSMI_STATUS_NOT_SUPPORTED);
LOG_ERROR(ss);
return RSMI_STATUS_NOT_SUPPORTED;
}
if (dev->gpu_metrics_ver().content_revision ==