From b9b495e48621445c370a42a0d41a88309b2863a0 Mon Sep 17 00:00:00 2001 From: Suma Hegde Date: Sun, 26 Feb 2023 21:01:44 -0500 Subject: [PATCH] Renamed API amdsmi_dev_set_clk_freq It is changed to amdsmi_set_clk_freq grep -rli 'amdsmi_dev_set_clk_freq' * | xargs -i@ sed -i 's/amdsmi_dev_set_clk_freq/amdsmi_set_clk_freq/g' @ Change-Id: I4cb623791c4570d144b4bf88e9c5f2ee5943527e --- 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/frequencies_read_write.cc | 8 ++++---- tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 8b6ead384c..4832f52d8b 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2596,7 +2596,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level_v1(amdsmi_processor_handle proce * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_set_clk_freq(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, uint64_t freq_bitmask); /** @} End PerfCont */ diff --git a/py-interface/README.md b/py-interface/README.md index f8f1c8cfaf..b78ffcd176 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2544,7 +2544,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_clk_freq +## amdsmi_set_clk_freq Description: Control the set of allowed frequencies that can be used for the specified clock @@ -2558,7 +2558,7 @@ bits of this mask are relevant. Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_clk_freq` function: +Exceptions that can be thrown by ` amdsmi_set_clk_freq` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2572,7 +2572,7 @@ try: else: for device in devices: freq_bitmask = 0 - amdsmi_dev_set_clk_freq(device, AmdSmiClkType.GFX, freq_bitmask) + amdsmi_set_clk_freq(device, AmdSmiClkType.GFX, freq_bitmask) except AmdSmiException as e: print(e) ``` diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 50a790a324..f1490380bf 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -92,7 +92,7 @@ from .amdsmi_interface import amdsmi_dev_reset_gpu 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 +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 diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 31e7a28839..278b44a7a4 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1553,7 +1553,7 @@ def amdsmi_reset_gpu_fan( _check_res(amdsmi_wrapper.amdsmi_reset_gpu_fan(processor_handle, sensor_idx)) -def amdsmi_dev_set_clk_freq( +def amdsmi_set_clk_freq( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, clk_type: AmdSmiClkType, freq_bitmask: int, @@ -1568,7 +1568,7 @@ def amdsmi_dev_set_clk_freq( raise AmdSmiParameterException(freq_bitmask, int) freq_bitmask = ctypes.c_uint64(freq_bitmask) _check_res( - amdsmi_wrapper. amdsmi_dev_set_clk_freq( + amdsmi_wrapper. amdsmi_set_clk_freq( processor_handle, clk_type, freq_bitmask ) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 4bee6e3b1b..a433f72487 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1568,9 +1568,9 @@ 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_dev_set_clk_freq = _libraries['libamd_smi.so'].amdsmi_dev_set_clk_freq -amdsmi_dev_set_clk_freq.restype = amdsmi_status_t -amdsmi_dev_set_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, uint64_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] amdsmi_get_version = _libraries['libamd_smi.so'].amdsmi_get_version amdsmi_get_version.restype = amdsmi_status_t amdsmi_get_version.argtypes = [ctypes.POINTER(struct_c__SA_amdsmi_version_t)] @@ -1874,7 +1874,7 @@ __all__ = \ 'amdsmi_dev_open_supported_variant_iterator', 'amdsmi_dev_perf_level_t', 'amdsmi_dev_perf_level_t__enumvalues', 'amdsmi_reset_gpu_fan', 'amdsmi_dev_reset_gpu', - 'amdsmi_dev_reset_xgmi_error', 'amdsmi_dev_set_clk_freq', + 'amdsmi_dev_reset_xgmi_error', 'amdsmi_set_clk_freq', 'amdsmi_set_gpu_clk_range', 'amdsmi_set_gpu_fan_speed', 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', 'amdsmi_dev_set_overdrive_level', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index fe70228d76..d00cf3b1a6 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -352,7 +352,7 @@ class Formatter: | """ + self.style.text("63 Get dev counter group supported. Api: amdsmi_dev_counter_group_supported ") + """ | | """ + self.style.text("64 Reset dev fan. Api: amdsmi_reset_gpu_fan ") + """ | | """ + self.style.text("65 Set dev fan speed. Api: amdsmi_set_gpu_fan_speed ") + """ | - | """ + self.style.text("66 Set dev gpu clk freq. Api: amdsmi_dev_set_clk_freq ") + """ | + | """ + self.style.text("66 Set dev gpu clk freq. Api: amdsmi_set_clk_freq ") + """ | | """ + self.style.text("67 Reset dev gpu. Api: amdsmi_dev_reset_gpu ") + """ | | """ + self.style.text("68 Set dev od clk info. Api: amdsmi_dev_set_od_clk_info ") + """ | | """ + self.style.text("69 Set dev od volt info. Api: amdsmi_dev_set_od_volt_info ") + """| @@ -643,7 +643,7 @@ def amdsmi_tool_dev_gpu_clk_freq_set(dev, dic): freq_bitmask = dic["freq_bitmask"] for clock_type in smi_api.AmdSmiClkType: try: - value = smi_api. amdsmi_dev_set_clk_freq(dev, clock_type, freq_bitmask) + value = smi_api. amdsmi_set_clk_freq(dev, clock_type, freq_bitmask) result.update({clock_type.name: value}) except smi_api.AmdSmiException as e: print("{}:\t{}".format(clock_type.name, e)) diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 2ee4defd5a..024691637e 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -934,7 +934,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_memory_total_get", "amdsmi_get_gpu_memory_total"}, {"rsmi_dev_memory_usage_get", "amdsmi_get_gpu_memory_usage"}, {"rsmi_dev_gpu_clk_freq_get", " amdsmi_get_clk_freq"}, - {"rsmi_dev_gpu_clk_freq_set", " amdsmi_dev_set_clk_freq"}, + {"rsmi_dev_gpu_clk_freq_set", " amdsmi_set_clk_freq"}, {"rsmi_dev_firmware_version_get", "amdsmi_get_fw_info"}, {"rsmi_dev_ecc_count_get", " amdsmi_dev_get_ecc_count"}, {"rsmi_counter_available_counters_get", " amdsmi_counter_get_available_counters"}, @@ -1246,7 +1246,7 @@ amdsmi_status_t amdsmi_get_clk_freq(amdsmi_processor_handle processor_handle, reinterpret_cast(f)); } -amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_set_clk_freq(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, uint64_t freq_bitmask) { AMDSMI_CHECK_INIT(); diff --git a/tests/amd_smi_test/functional/frequencies_read_write.cc b/tests/amd_smi_test/functional/frequencies_read_write.cc index b093426c14..778f6a4446 100755 --- a/tests/amd_smi_test/functional/frequencies_read_write.cc +++ b/tests/amd_smi_test/functional/frequencies_read_write.cc @@ -151,7 +151,7 @@ void TestFrequenciesReadWrite::Run(void) { FreqEnumToStr(amdsmi_clk) << " to 0b" << freq_bm_str << " ..." << std::endl; } - ret = amdsmi_dev_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, freq_bitmask); + ret = amdsmi_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, freq_bitmask); //Certain ASICs does not allow to set particular clocks. If set function for a clock returns //permission error despite root access, manually set ret value to success and return if (ret == AMDSMI_STATUS_NO_PERM && geteuid() == 0) { @@ -175,7 +175,7 @@ void TestFrequenciesReadWrite::Run(void) { std::cout << "Frequency is now index " << f.current << std::endl; std::cout << "Resetting mask to all frequencies." << std::endl; } - ret = amdsmi_dev_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, 0xFFFFFFFF); + ret = amdsmi_set_clk_freq(processor_handles_[dv_ind], amdsmi_clk, 0xFFFFFFFF); if (ret != AMDSMI_STATUS_SUCCESS) { return; } @@ -215,7 +215,7 @@ void TestFrequenciesReadWrite::Run(void) { std::cout << "Setting frequency mask for clock " << amdsmi_clk << " to 0b" << freq_bm_str << " ..." << std::endl; } - ret = amdsmi_dev_set_clk_freq(dv_ind, amdsmi_clk, freq_bitmask); + ret = amdsmi_set_clk_freq(dv_ind, amdsmi_clk, freq_bitmask); CHK_ERR_ASRT(ret) ret = amdsmi_get_clk_freq(dv_ind, amdsmi_clk, &f); @@ -225,7 +225,7 @@ void TestFrequenciesReadWrite::Run(void) { std::cout << "Frequency is now index " << f.current << std::endl; std::cout << "Resetting mask to all frequencies." << std::endl; } - ret = amdsmi_dev_set_clk_freq(dv_ind, amdsmi_clk, 0xFFFFFFFF); + ret = amdsmi_set_clk_freq(dv_ind, amdsmi_clk, 0xFFFFFFFF); CHK_ERR_ASRT(ret) ret = amdsmi_set_gpu_perf_level(dv_ind, AMDSMI_DEV_PERF_LEVEL_AUTO); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index dca78d3bfd..5eddc93e6f 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -247,7 +247,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_set_overdrive_level_v1(processor_handles_[0], dmy_i32); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_set_clk_freq(processor_handles_[0], CLK_TYPE_SYS, 0); + ret = amdsmi_set_clk_freq(processor_handles_[0], CLK_TYPE_SYS, 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_ecc_count(processor_handles_[0], AMDSMI_GPU_BLOCK_UMC, &dmy_err_cnt); CHECK_RET(ret, AMDSMI_STATUS_BUSY);