From 508d2612d349c2cfea86cb449f7ededd958d1821 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:45:11 -0500 Subject: [PATCH] Renamed API amdsmi_get_vbios_info to amdsmi_get_gpu_vbios_info grep -rli 'amdsmi_get_vbios_info' * | xargs -i@ sed -i 's/amdsmi_get_vbios_info/amdsmi_get_gpu_vbios_info/g' @ Change-Id: I90249704db3d77eca6b09c33ef3f2cec5eda77a2 --- example/amd_smi_drm_example.cc | 4 ++-- example/amd_smi_nodrm_example.cc | 4 ++-- include/amd_smi/amdsmi.h | 2 +- py-interface/README.md | 6 +++--- py-interface/__init__.py | 2 +- py-interface/amdsmi_interface.py | 4 ++-- py-interface/amdsmi_wrapper.py | 8 ++++---- py-interface/rocm_smi_tool.py | 4 ++-- src/amd_smi/amd_smi.cc | 4 ++-- tests/amd_smi_test/functional/sys_info_read.cc | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index 26ec97b7c8..469f5f5a1f 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -294,9 +294,9 @@ int main() { // Get VBIOS info amdsmi_vbios_info_t vbios_info = {}; - ret = amdsmi_get_vbios_info(processor_handles[j], &vbios_info); + ret = amdsmi_get_gpu_vbios_info(processor_handles[j], &vbios_info); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_vbios_info:\n"); + printf(" Output of amdsmi_get_gpu_vbios_info:\n"); printf("\tVBios Name: %s\n", vbios_info.name); printf("\tBuild Date: %s\n", vbios_info.build_date); printf("\tPart Number: %s\n", vbios_info.part_number); diff --git a/example/amd_smi_nodrm_example.cc b/example/amd_smi_nodrm_example.cc index 146d3ca94e..cdd3db9c54 100644 --- a/example/amd_smi_nodrm_example.cc +++ b/example/amd_smi_nodrm_example.cc @@ -139,9 +139,9 @@ int main() { // Get VBIOS info amdsmi_vbios_info_t vbios_info = {}; - ret = amdsmi_get_vbios_info(processor_handles[j], &vbios_info); + ret = amdsmi_get_gpu_vbios_info(processor_handles[j], &vbios_info); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_vbios_info:\n"); + printf(" Output of amdsmi_get_gpu_vbios_info:\n"); printf("\tVBios Name: %s\n", vbios_info.name); printf("\tBuild Date: %s\n", vbios_info.build_date); printf("\tPart Number: %s\n", vbios_info.part_number); diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 2b76e70218..bdf8c89d4e 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -3721,7 +3721,7 @@ amdsmi_get_fw_info(amdsmi_processor_handle processor_handle, amdsmi_fw_info_t *i * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_vbios_info(amdsmi_processor_handle processor_handle, amdsmi_vbios_info_t *info); +amdsmi_get_gpu_vbios_info(amdsmi_processor_handle processor_handle, amdsmi_vbios_info_t *info); /** @} End fwinfo */ diff --git a/py-interface/README.md b/py-interface/README.md index 3339b38eef..d293bd3bec 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -405,7 +405,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_vbios_info +## amdsmi_get_gpu_vbios_info Description: Returns the static information for the VBIOS on the device. Input parameters: @@ -421,7 +421,7 @@ Field | Description `part_number` | vbios part number `vbios_version_string` | vbios version string -Exceptions that can be thrown by `amdsmi_get_vbios_info` function: +Exceptions that can be thrown by `amdsmi_get_gpu_vbios_info` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -434,7 +434,7 @@ try: print("No GPUs on machine") else: for device in devices: - vbios_info = amdsmi_get_vbios_info(device) + vbios_info = amdsmi_get_gpu_vbios_info(device) print(vbios_info['name']) print(vbios_info['vbios_version']) print(vbios_info['build_date']) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 43f3844ff8..499ecf0d22 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -42,7 +42,7 @@ from .amdsmi_interface import amdsmi_get_power_cap_info from .amdsmi_interface import amdsmi_get_caps_info # # Microcode and VBIOS Information -from .amdsmi_interface import amdsmi_get_vbios_info +from .amdsmi_interface import amdsmi_get_gpu_vbios_info from .amdsmi_interface import amdsmi_get_fw_info # # GPU Monitoring diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 33e8f9c795..0eab315797 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -653,7 +653,7 @@ def amdsmi_get_caps_info( } -def amdsmi_get_vbios_info( +def amdsmi_get_gpu_vbios_info( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -663,7 +663,7 @@ def amdsmi_get_vbios_info( vbios_info = amdsmi_wrapper.amdsmi_vbios_info_t() _check_res( - amdsmi_wrapper.amdsmi_get_vbios_info( + amdsmi_wrapper.amdsmi_get_gpu_vbios_info( processor_handle, ctypes.byref(vbios_info)) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 9d3831a447..9504053978 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1691,9 +1691,9 @@ amdsmi_get_caps_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_ amdsmi_get_fw_info = _libraries['libamd_smi.so'].amdsmi_get_fw_info amdsmi_get_fw_info.restype = amdsmi_status_t amdsmi_get_fw_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_fw_info_t)] -amdsmi_get_vbios_info = _libraries['libamd_smi.so'].amdsmi_get_vbios_info -amdsmi_get_vbios_info.restype = amdsmi_status_t -amdsmi_get_vbios_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vbios_info_t)] +amdsmi_get_gpu_vbios_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_vbios_info +amdsmi_get_gpu_vbios_info.restype = amdsmi_status_t +amdsmi_get_gpu_vbios_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vbios_info_t)] amdsmi_get_gpu_activity = _libraries['libamd_smi.so'].amdsmi_get_gpu_activity amdsmi_get_gpu_activity.restype = amdsmi_status_t amdsmi_get_gpu_activity.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_engine_usage_t)] @@ -1911,7 +1911,7 @@ __all__ = \ 'amdsmi_get_ras_block_features_enabled', 'amdsmi_get_socket_handles', 'amdsmi_get_socket_info', 'amdsmi_get_target_frequency_range', - 'amdsmi_get_utilization_count', 'amdsmi_get_vbios_info', + 'amdsmi_get_utilization_count', 'amdsmi_get_gpu_vbios_info', 'amdsmi_get_version', 'amdsmi_get_version_str', 'amdsmi_get_vram_usage', 'amdsmi_get_xgmi_info', 'amdsmi_gpu_block_t', 'amdsmi_gpu_block_t__enumvalues', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 16bbd483b8..30a5dd0a72 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -344,7 +344,7 @@ class Formatter: | """ + self.style.text("55 Init. Api: amdsmi_init ") + """ | | """ + self.style.text("56 Shut down. Api: amdsmi_shut_down ") + """ | | """ + self.style.text("57 Get fw info. Api: amdsmi_get_fw_info ") + """ | - | """ + self.style.text("58 Get vbios info. Api: amdsmi_get_vbios_info ") + """ | + | """ + self.style.text("58 Get vbios info. Api: amdsmi_get_gpu_vbios_info ") + """ | | """ + self.style.text("59 Get counter available counters. Api: amdsmi_counter_get_available_counters ") + """ | | """ + self.style.text("60 Get counter control. Api: amdsmi_control_counter ") + """ | | """ + self.style.text("61 Get counter read. Api: amdsmi_read_counter ") + """ | @@ -893,7 +893,7 @@ commands = { 57: [smi_api.amdsmi_get_fw_info, { "device_identifier1": [None, True] }], - 58: [smi_api.amdsmi_get_vbios_info, { + 58: [smi_api.amdsmi_get_gpu_vbios_info, { "device_identifier1": [None, True] }], 59: [amdsmi_tool_counter_available_counters_get, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 7785b640ff..b5f4bf2ad3 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -917,7 +917,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_perf_level_get", "amdsmi_dev_get_perf_level"}, {"rsmi_perf_determinism_mode_set", "amdsmi_set_perf_determinism_mode"}, {"rsmi_dev_overdrive_level_set", " amdsmi_dev_set_overdrive_level"}, - {"rsmi_dev_vbios_version_get", "amdsmi_get_vbios_info"}, + {"rsmi_dev_vbios_version_get", "amdsmi_get_gpu_vbios_info"}, {"rsmi_dev_od_volt_info_get", " amdsmi_dev_get_od_volt_info"}, {"rsmi_dev_od_volt_info_set", " amdsmi_dev_set_od_volt_info"}, {"rsmi_dev_od_volt_curve_regions_get", " amdsmi_dev_get_od_volt_curve_regions"}, @@ -1422,7 +1422,7 @@ amdsmi_status_t amdsmi_get_version_str(amdsmi_sw_component_t component, } amdsmi_status_t -amdsmi_get_vbios_info(amdsmi_processor_handle processor_handle, amdsmi_vbios_info_t *info) { +amdsmi_get_gpu_vbios_info(amdsmi_processor_handle processor_handle, amdsmi_vbios_info_t *info) { AMDSMI_CHECK_INIT(); if (info == nullptr) { diff --git a/tests/amd_smi_test/functional/sys_info_read.cc b/tests/amd_smi_test/functional/sys_info_read.cc index 3fa5867fc6..b7d3c12dfc 100755 --- a/tests/amd_smi_test/functional/sys_info_read.cc +++ b/tests/amd_smi_test/functional/sys_info_read.cc @@ -103,7 +103,7 @@ void TestSysInfoRead::Run(void) { PrintDeviceHeader(processor_handles_[i]); amdsmi_vbios_info_t info; - err = amdsmi_get_vbios_info(processor_handles_[i], &info); + err = amdsmi_get_gpu_vbios_info(processor_handles_[i], &info); if (err != AMDSMI_STATUS_SUCCESS) { if (err == AMDSMI_STATUS_FILE_ERROR) { @@ -112,11 +112,11 @@ void TestSysInfoRead::Run(void) { << std::endl; } // Verify api support checking functionality is working - err = amdsmi_get_vbios_info(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_vbios_info(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED); } else { // Verify api support checking functionality is working - err = amdsmi_get_vbios_info(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_vbios_info(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); CHK_ERR_ASRT(err)