From 0d5be2949b65010657da319ff8caa991e5c9b680 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:43:44 -0500 Subject: [PATCH] Renamed API amdsmi_set_perf_determinism_mode to amdsmi_set_gpu_perf_determinism_mode grep -rli 'amdsmi_set_perf_determinism_mode' * | xargs -i@ sed -i 's/amdsmi_set_perf_determinism_mode/amdsmi_set_gpu_perf_determinism_mode/g' @ Change-Id: I81b3a9738d3063d49ee2ed09a4223ee174d8d904 --- include/amd_smi/amdsmi.h | 2 +- py-interface/README.md | 6 +++--- py-interface/__init__.py | 4 ++-- py-interface/amdsmi_interface.py | 8 ++++---- 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/perf_determinism.cc | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 01caddfe2b..5255b4a112 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2197,7 +2197,7 @@ amdsmi_status_t amdsmi_get_gpu_perf_level(amdsmi_processor_handle processor_hand * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_set_perf_determinism_mode(amdsmi_processor_handle processor_handle, uint64_t clkvalue); +amdsmi_set_gpu_perf_determinism_mode(amdsmi_processor_handle processor_handle, uint64_t clkvalue); /** * @brief Get the overdrive percent associated with the device with provided diff --git a/py-interface/README.md b/py-interface/README.md index a57384ccfe..80e27fe3cc 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -1985,7 +1985,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_set_perf_determinism_mode +## amdsmi_set_gpu_perf_determinism_mode Description: Enter performance determinism mode with provided device handle Input parameters: @@ -1994,7 +1994,7 @@ Input parameters: Output: None -Exceptions that can be thrown by `amdsmi_set_perf_determinism_mode` function: +Exceptions that can be thrown by `amdsmi_set_gpu_perf_determinism_mode` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2007,7 +2007,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_set_perf_determinism_mode(device, 1333) + amdsmi_set_gpu_perf_determinism_mode(device, 1333) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 3a0db953ea..9a40aaae44 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -89,7 +89,7 @@ from .amdsmi_interface import amdsmi_dev_set_perf_level_v1 from .amdsmi_interface import amdsmi_dev_set_perf_level from .amdsmi_interface import amdsmi_dev_get_power_profile_presets from .amdsmi_interface import amdsmi_dev_reset_gpu -from .amdsmi_interface import amdsmi_set_perf_determinism_mode +from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode from .amdsmi_interface import amdsmi_set_gpu_fan_speed from .amdsmi_interface import amdsmi_reset_gpu_fan from .amdsmi_interface import amdsmi_dev_set_clk_freq @@ -107,7 +107,7 @@ from .amdsmi_interface import amdsmi_get_gpu_volt_metric from .amdsmi_interface import amdsmi_get_busy_percent from .amdsmi_interface import amdsmi_get_utilization_count from .amdsmi_interface import amdsmi_get_gpu_perf_level -from .amdsmi_interface import amdsmi_set_perf_determinism_mode +from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode from .amdsmi_interface import amdsmi_dev_get_overdrive_level from .amdsmi_interface import amdsmi_dev_get_gpu_clk_freq from .amdsmi_interface import amdsmi_dev_get_od_volt_info diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 9d3d677d34..a4e842686b 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1502,7 +1502,7 @@ def amdsmi_dev_reset_gpu(processor_handle: amdsmi_wrapper.amdsmi_processor_handl _check_res(amdsmi_wrapper.amdsmi_dev_reset_gpu(processor_handle)) -def amdsmi_set_perf_determinism_mode( +def amdsmi_set_gpu_perf_determinism_mode( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, clock_value: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1514,7 +1514,7 @@ def amdsmi_set_perf_determinism_mode( clock_value = ctypes.c_uint64(clock_value) _check_res( - amdsmi_wrapper.amdsmi_set_perf_determinism_mode( + amdsmi_wrapper.amdsmi_set_gpu_perf_determinism_mode( processor_handle, clock_value) ) @@ -2253,7 +2253,7 @@ def amdsmi_get_gpu_perf_level( return result -def amdsmi_set_perf_determinism_mode( +def amdsmi_set_gpu_perf_determinism_mode( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, clkvalue: int ) -> None: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2263,7 +2263,7 @@ def amdsmi_set_perf_determinism_mode( if not isinstance(clkvalue, int): raise AmdSmiParameterException(clkvalue, int) - _check_res(amdsmi_wrapper.amdsmi_set_perf_determinism_mode( + _check_res(amdsmi_wrapper.amdsmi_set_gpu_perf_determinism_mode( processor_handle, clkvalue)) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 14afd9dc80..767115f986 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1523,9 +1523,9 @@ amdsmi_get_pcie_link_caps.argtypes = [amdsmi_processor_handle, ctypes.POINTER(st amdsmi_get_gpu_perf_level = _libraries['libamd_smi.so'].amdsmi_get_gpu_perf_level amdsmi_get_gpu_perf_level.restype = amdsmi_status_t amdsmi_get_gpu_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_dev_perf_level_t)] -amdsmi_set_perf_determinism_mode = _libraries['libamd_smi.so'].amdsmi_set_perf_determinism_mode -amdsmi_set_perf_determinism_mode.restype = amdsmi_status_t -amdsmi_set_perf_determinism_mode.argtypes = [amdsmi_processor_handle, uint64_t] +amdsmi_set_gpu_perf_determinism_mode = _libraries['libamd_smi.so'].amdsmi_set_gpu_perf_determinism_mode +amdsmi_set_gpu_perf_determinism_mode.restype = amdsmi_status_t +amdsmi_set_gpu_perf_determinism_mode.argtypes = [amdsmi_processor_handle, uint64_t] amdsmi_dev_get_overdrive_level = _libraries['libamd_smi.so'].amdsmi_dev_get_overdrive_level amdsmi_dev_get_overdrive_level.restype = amdsmi_status_t amdsmi_dev_get_overdrive_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] @@ -1933,7 +1933,7 @@ __all__ = \ 'amdsmi_ras_err_state_t__enumvalues', 'amdsmi_read_counter', 'amdsmi_retired_page_record_t', 'amdsmi_set_event_notification_mask', - 'amdsmi_set_perf_determinism_mode', 'amdsmi_shut_down', + 'amdsmi_set_gpu_perf_determinism_mode', 'amdsmi_shut_down', 'amdsmi_socket_handle', 'amdsmi_status_string', 'amdsmi_status_t', 'amdsmi_status_t__enumvalues', 'amdsmi_stop_event_notification', 'amdsmi_sw_component_t', 'amdsmi_sw_component_t__enumvalues', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 849e27b05b..a8a41d66b1 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -312,7 +312,7 @@ class Formatter: | """ + self.style.text("23 Get device busy percent. Api: amdsmi_get_busy_percent ") + """ | | """ + self.style.text("24 Get utilization count. Api: amdsmi_get_utilization_count ") + """ | | """ + self.style.text("25 Get device perf level. Api: amdsmi_get_gpu_perf_level ") + """ | - | """ + self.style.text("26 Set perf determinism mode. Api: amdsmi_set_perf_determinism_mode ") + """ | + | """ + self.style.text("26 Set perf determinism mode. Api: amdsmi_set_gpu_perf_determinism_mode ") + """ | | """ + self.style.text("27 Get device overdrive level. Api: amdsmi_dev_get_overdrive_level ") + """ | | """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_dev_get_gpu_clk_freq ") + """ | | """ + self.style.text("29 Get device od volt. Api: amdsmi_dev_get_od_volt_info ") + """ | @@ -450,7 +450,7 @@ def amdsmi_tool_utilization_count_get(dev): def amdsmi_tool_perf_determinism_mode_set(dev, dic): clock_value = dic["clock_value"] - return smi_api.amdsmi_set_perf_determinism_mode(dev, clock_value) + return smi_api.amdsmi_set_gpu_perf_determinism_mode(dev, clock_value) def amdsmi_tool_dev_power_profile_presets_get(dev, dic): sensor_idx = dic["sensor_idx"] diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index a2f9206f86..f8ec8b18c2 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -915,7 +915,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_perf_level_set", " amdsmi_dev_set_perf_level"}, {"rsmi_dev_perf_level_set_v1", " amdsmi_dev_set_perf_level_v1"}, {"rsmi_dev_perf_level_get", "amdsmi_get_gpu_perf_level"}, - {"rsmi_perf_determinism_mode_set", "amdsmi_set_perf_determinism_mode"}, + {"rsmi_perf_determinism_mode_set", "amdsmi_set_gpu_perf_determinism_mode"}, {"rsmi_dev_overdrive_level_set", " amdsmi_dev_set_overdrive_level"}, {"rsmi_dev_vbios_version_get", "amdsmi_get_gpu_vbios_info"}, {"rsmi_dev_od_volt_info_get", " amdsmi_dev_get_od_volt_info"}, @@ -1153,7 +1153,7 @@ amdsmi_status_t reinterpret_cast(status)); } -amdsmi_status_t amdsmi_set_perf_determinism_mode( +amdsmi_status_t amdsmi_set_gpu_perf_determinism_mode( amdsmi_processor_handle processor_handle, uint64_t clkvalue) { return rsmi_wrapper(rsmi_perf_determinism_mode_set, processor_handle, clkvalue); diff --git a/tests/amd_smi_test/functional/perf_determinism.cc b/tests/amd_smi_test/functional/perf_determinism.cc index 7c51d8e889..6769b0151f 100644 --- a/tests/amd_smi_test/functional/perf_determinism.cc +++ b/tests/amd_smi_test/functional/perf_determinism.cc @@ -114,7 +114,7 @@ void TestPerfDeterminism::Run(void) { clkvalue = (odv.curr_sclk_range.lower_bound/1000000) + 50; } - err = amdsmi_set_perf_determinism_mode(processor_handles_[i], clkvalue); + err = amdsmi_set_gpu_perf_determinism_mode(processor_handles_[i], clkvalue); if (err == AMDSMI_STATUS_NOT_SUPPORTED) { IF_VERB(STANDARD) { std::cout << "\t**Not supported on this machine" << std::endl;