From e687a72235e5699bb4869db0e2c4f53502e36284 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 04:14:05 -0500 Subject: [PATCH] Renamed APIs 1) amdsmi_dev_set_overdrive_level to amdsmi_set_gpu_overdrive_level 2) amdsmi_dev_set_overdrive_level_v1 to amdsmi_set_gpu_overdrive_level_v1 grep -rli 'amdsmi_dev_set_overdrive_level' * | xargs -i@ sed -i 's/amdsmi_dev_set_overdrive_level/amdsmi_set_gpu_overdrive_level/g' @ Change-Id: Id6934e5b0962c9262cca041bdfdf02c60f69573b --- include/amd_smi/amdsmi.h | 6 +++--- py-interface/README.md | 12 ++++++------ py-interface/__init__.py | 4 ++-- py-interface/amdsmi_interface.py | 8 ++++---- py-interface/amdsmi_wrapper.py | 16 ++++++++-------- py-interface/rocm_smi_tool.py | 8 ++++---- src/amd_smi/amd_smi.cc | 6 +++--- .../amd_smi_test/functional/mutual_exclusion.cc | 2 +- .../functional/overdrive_read_write.cc | 6 +++--- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 22b92fe6b9..ab7ada448d 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2488,7 +2488,7 @@ amdsmi_status_t * @brief Set the overdrive percent associated with the device with provided * processor handle with the provided value. See details for WARNING. * - * @deprecated This function is deprecated. :: amdsmi_dev_set_overdrive_level_v1 + * @deprecated This function is deprecated. :: amdsmi_set_gpu_overdrive_level_v1 * has the same functionaltiy, with an interface that more closely * matches the rest of the amd_smi API. * @@ -2523,7 +2523,7 @@ amdsmi_status_t * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_overdrive_level(amdsmi_processor_handle processor_handle, uint32_t od); +amdsmi_status_t amdsmi_set_gpu_overdrive_level(amdsmi_processor_handle processor_handle, uint32_t od); /** * @brief Set the overdrive percent associated with the device with provided @@ -2562,7 +2562,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level(amdsmi_processor_handle processo * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_overdrive_level_v1(amdsmi_processor_handle processor_handle, uint32_t od); +amdsmi_status_t amdsmi_set_gpu_overdrive_level_v1(amdsmi_processor_handle processor_handle, uint32_t od); /** * @brief Control the set of allowed frequencies that can be used for the diff --git a/py-interface/README.md b/py-interface/README.md index 82059410cb..440b19a199 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2576,7 +2576,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_overdrive_level_v1 +## amdsmi_set_gpu_overdrive_level_v1 Description: Set the overdrive percent associated with the device with provided device handle with the provided value @@ -2586,7 +2586,7 @@ Input parameters: Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_overdrive_level_v1` function: +Exceptions that can be thrown by ` amdsmi_set_gpu_overdrive_level_v1` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2599,11 +2599,11 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_overdrive_level_v1(device, 0) + amdsmi_set_gpu_overdrive_level_v1(device, 0) except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_overdrive_level +## amdsmi_set_gpu_overdrive_level Description: **deprecated** Set the overdrive percent associated with the device with provided device handle with the provided value @@ -2613,7 +2613,7 @@ Input parameters: Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_overdrive_level` function: +Exceptions that can be thrown by ` amdsmi_set_gpu_overdrive_level` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2626,7 +2626,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_overdrive_level(device, 0) + amdsmi_set_gpu_overdrive_level(device, 0) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index d46957923f..aebe9bc58d 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -93,8 +93,8 @@ 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_set_clk_freq -from .amdsmi_interface import amdsmi_dev_set_overdrive_level_v1 -from .amdsmi_interface import amdsmi_dev_set_overdrive_level +from .amdsmi_interface import amdsmi_set_gpu_overdrive_level_v1 +from .amdsmi_interface import amdsmi_set_gpu_overdrive_level # # Physical State Queries from .amdsmi_interface import amdsmi_get_gpu_fan_rpms diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index d252a5dce0..41fc3d46e4 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1574,7 +1574,7 @@ def amdsmi_set_clk_freq( ) -def amdsmi_dev_set_overdrive_level_v1( +def amdsmi_set_gpu_overdrive_level_v1( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, overdrive_value: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1586,12 +1586,12 @@ def amdsmi_dev_set_overdrive_level_v1( overdrive_value = ctypes.c_uint32(overdrive_value) _check_res( - amdsmi_wrapper. amdsmi_dev_set_overdrive_level_v1( + amdsmi_wrapper. amdsmi_set_gpu_overdrive_level_v1( processor_handle, overdrive_value) ) -def amdsmi_dev_set_overdrive_level( +def amdsmi_set_gpu_overdrive_level( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, overdrive_value: int ): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1603,7 +1603,7 @@ def amdsmi_dev_set_overdrive_level( overdrive_value = ctypes.c_uint32(overdrive_value) _check_res( - amdsmi_wrapper. amdsmi_dev_set_overdrive_level( + amdsmi_wrapper. amdsmi_set_gpu_overdrive_level( processor_handle, overdrive_value) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index c13d523cca..8626358345 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1562,12 +1562,12 @@ amdsmi_set_gpu_perf_level.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_l amdsmi_set_gpu_perf_level_v1 = _libraries['libamd_smi.so'].amdsmi_set_gpu_perf_level_v1 amdsmi_set_gpu_perf_level_v1.restype = amdsmi_status_t amdsmi_set_gpu_perf_level_v1.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] -amdsmi_dev_set_overdrive_level = _libraries['libamd_smi.so'].amdsmi_dev_set_overdrive_level -amdsmi_dev_set_overdrive_level.restype = amdsmi_status_t -amdsmi_dev_set_overdrive_level.argtypes = [amdsmi_processor_handle, uint32_t] -amdsmi_dev_set_overdrive_level_v1 = _libraries['libamd_smi.so'].amdsmi_dev_set_overdrive_level_v1 -amdsmi_dev_set_overdrive_level_v1.restype = amdsmi_status_t -amdsmi_dev_set_overdrive_level_v1.argtypes = [amdsmi_processor_handle, uint32_t] +amdsmi_set_gpu_overdrive_level = _libraries['libamd_smi.so'].amdsmi_set_gpu_overdrive_level +amdsmi_set_gpu_overdrive_level.restype = amdsmi_status_t +amdsmi_set_gpu_overdrive_level.argtypes = [amdsmi_processor_handle, uint32_t] +amdsmi_set_gpu_overdrive_level_v1 = _libraries['libamd_smi.so'].amdsmi_set_gpu_overdrive_level_v1 +amdsmi_set_gpu_overdrive_level_v1.restype = amdsmi_status_t +amdsmi_set_gpu_overdrive_level_v1.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_set_clk_freq = _libraries['libamd_smi.so'].amdsmi_set_clk_freq amdsmi_set_clk_freq.restype = amdsmi_status_t amdsmi_set_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, uint64_t] @@ -1877,8 +1877,8 @@ __all__ = \ 'amdsmi_dev_reset_xgmi_error', 'amdsmi_set_clk_freq', 'amdsmi_set_gpu_clk_range', 'amdsmi_set_gpu_fan_speed', 'amdsmi_set_gpu_od_clk_info', 'amdsmi_set_gpu_od_volt_info', - 'amdsmi_dev_set_overdrive_level', - 'amdsmi_dev_set_overdrive_level_v1', + 'amdsmi_set_gpu_overdrive_level', + 'amdsmi_set_gpu_overdrive_level_v1', 'amdsmi_set_gpu_pci_bandwidth', 'amdsmi_set_gpu_perf_level', 'amdsmi_set_gpu_perf_level_v1', 'amdsmi_set_power_cap', 'amdsmi_set_gpu_power_profile', 'amdsmi_gpu_xgmi_error_status', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 392570b7f9..e53a577bc6 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -356,8 +356,8 @@ class Formatter: | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_reset_gpu ") + """ | | """ + self.style.text("68 Set dev od clk info. Api: amdsmi_set_gpu_od_clk_info ") + """ | | """ + self.style.text("69 Set dev od volt info. Api: amdsmi_set_gpu_od_volt_info ") + """| - | """ + self.style.text("70 Set dev overdrive level. Api: amdsmi_dev_set_overdrive_level ") + """ | - | """ + self.style.text("71 Set v1 dev overdrive level. Api: amdsmi_dev_set_overdrive_level_v1 ") + """ | + | """ + self.style.text("70 Set dev overdrive level. Api: amdsmi_set_gpu_overdrive_level ") + """ | + | """ + self.style.text("71 Set v1 dev overdrive level. Api: amdsmi_set_gpu_overdrive_level_v1 ") + """ | | """ + self.style.text("72 Set dev pci bandwidth. Api: amdsmi_set_gpu_pci_bandwidth ") + """ | | """ + self.style.text("73 Set dev perf level. Api: amdsmi_set_gpu_perf_level ") + """ | | """ + self.style.text("74 Set dev perf level v1. Api: amdsmi_set_gpu_perf_level_v1 ") + """ | @@ -478,11 +478,11 @@ def amdsmi_tool_dev_fan_speed_set(dev, dic): def amdsmi_tool_dev_overdrive_level_set(dev, dic): overdrive_value = dic["overdrive_value"] - return smi_api. amdsmi_dev_set_overdrive_level(dev, overdrive_value) + return smi_api. amdsmi_set_gpu_overdrive_level(dev, overdrive_value) def amdsmi_tool_dev_overdrive_level_set_v1(dev, dic): overdrive_value = dic["overdrive_value"] - return smi_api. amdsmi_dev_set_overdrive_level(dev, overdrive_value) + return smi_api. amdsmi_set_gpu_overdrive_level(dev, overdrive_value) def amdsmi_tool_dev_pci_bandwidth_set(dev, dic): bitmask = dic["bitmask"] diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 7de9d3ee6b..401bec7158 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -916,7 +916,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_perf_level_set_v1", " amdsmi_set_gpu_perf_level_v1"}, {"rsmi_dev_perf_level_get", "amdsmi_get_gpu_perf_level"}, {"rsmi_perf_determinism_mode_set", "amdsmi_set_gpu_perf_determinism_mode"}, - {"rsmi_dev_overdrive_level_set", " amdsmi_dev_set_overdrive_level"}, + {"rsmi_dev_overdrive_level_set", " amdsmi_set_gpu_overdrive_level"}, {"rsmi_dev_vbios_version_get", "amdsmi_get_gpu_vbios_info"}, {"rsmi_dev_od_volt_info_get", " amdsmi_get_gpu_od_volt_info"}, {"rsmi_dev_od_volt_info_set", " amdsmi_set_gpu_od_volt_info"}, @@ -1286,7 +1286,7 @@ amdsmi_status_t amdsmi_get_gpu_overdrive_level( return rsmi_wrapper(rsmi_dev_overdrive_level_get, processor_handle, od); } -amdsmi_status_t amdsmi_dev_set_overdrive_level( +amdsmi_status_t amdsmi_set_gpu_overdrive_level( amdsmi_processor_handle processor_handle, uint32_t od) { return rsmi_wrapper(rsmi_dev_overdrive_level_set, processor_handle, od); } @@ -1347,7 +1347,7 @@ amdsmi_status_t amdsmi_set_gpu_clk_range(amdsmi_processor_handle processor_handl static_cast(clkType)); } -amdsmi_status_t amdsmi_dev_set_overdrive_level_v1( +amdsmi_status_t amdsmi_set_gpu_overdrive_level_v1( amdsmi_processor_handle processor_handle, uint32_t od) { return rsmi_wrapper(rsmi_dev_overdrive_level_set_v1, processor_handle, diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 9489a89e9c..00caa421de 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -245,7 +245,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_gpu_od_volt_curve_regions(processor_handles_[0], &dmy_ui32, &dmy_vlt_reg); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_set_overdrive_level_v1(processor_handles_[0], dmy_i32); + ret = amdsmi_set_gpu_overdrive_level_v1(processor_handles_[0], dmy_i32); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_set_clk_freq(processor_handles_[0], CLK_TYPE_SYS, 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); diff --git a/tests/amd_smi_test/functional/overdrive_read_write.cc b/tests/amd_smi_test/functional/overdrive_read_write.cc index e389409787..a8f258061c 100755 --- a/tests/amd_smi_test/functional/overdrive_read_write.cc +++ b/tests/amd_smi_test/functional/overdrive_read_write.cc @@ -100,12 +100,12 @@ void TestOverdriveReadWrite::Run(void) { IF_VERB(STANDARD) { std::cout << "Set Overdrive level to 0%..." << std::endl; } - ret = amdsmi_dev_set_overdrive_level(processor_handles_[dv_ind], 0); + ret = amdsmi_set_gpu_overdrive_level(processor_handles_[dv_ind], 0); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "Set Overdrive level to 10%..." << std::endl; } - ret = amdsmi_dev_set_overdrive_level(processor_handles_[dv_ind], 10); + ret = amdsmi_set_gpu_overdrive_level(processor_handles_[dv_ind], 10); CHK_ERR_ASRT(ret) ret = amdsmi_get_gpu_overdrive_level(processor_handles_[dv_ind], &val); CHK_ERR_ASRT(ret) @@ -113,7 +113,7 @@ void TestOverdriveReadWrite::Run(void) { std::cout << "\t**New OverDrive Level:" << val << std::endl; std::cout << "Reset Overdrive level to 0%..." << std::endl; } - ret = amdsmi_dev_set_overdrive_level(processor_handles_[dv_ind], 0); + ret = amdsmi_set_gpu_overdrive_level(processor_handles_[dv_ind], 0); CHK_ERR_ASRT(ret) ret = amdsmi_get_gpu_overdrive_level(processor_handles_[dv_ind], &val); CHK_ERR_ASRT(ret)