From 849e43451ddf68c4b8a54301ef8f5396437d8fcd Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:10:06 -0500 Subject: [PATCH] Renamed API amdsmi_get_target_frequency_range to amdsmi_get_gpu_target_frequency_range grep -rli 'amdsmi_get_target_frequency_range' * | xargs -i@ sed -i 's/amdsmi_get_target_frequency_range/amdsmi_get_gpu_target_frequency_range/g' @ Change-Id: Ife4c533ded5d7743238502fe1789f34fd0edf9b8 --- example/amd_smi_drm_example.cc | 4 ++-- include/amd_smi/amdsmi.h | 2 +- py-interface/README.md | 10 +++++----- py-interface/__init__.py | 2 +- py-interface/amdsmi_interface.py | 4 ++-- py-interface/amdsmi_wrapper.py | 8 ++++---- src/amd_smi/amd_smi.cc | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc index 53d8fe5165..999d4b32b8 100644 --- a/example/amd_smi_drm_example.cc +++ b/example/amd_smi_drm_example.cc @@ -500,10 +500,10 @@ int main() { // Get frequency ranges amdsmi_frequency_range_t freq_ranges = {}; - ret = amdsmi_get_target_frequency_range( + ret = amdsmi_get_gpu_target_frequency_range( processor_handles[j], CLK_TYPE_GFX, &freq_ranges); CHK_AMDSMI_RET(ret) - printf(" Output of amdsmi_get_target_frequency_range:\n"); + printf(" Output of amdsmi_get_gpu_target_frequency_range:\n"); printf("\tSupported min freq: %lu\n", freq_ranges.supported_freq_range.lower_bound); printf("\tSupported max freq: %lu\n", diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 54cde8f430..6ac7f42b91 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -3810,7 +3810,7 @@ amdsmi_get_gpu_vram_usage(amdsmi_processor_handle processor_handle, amdsmi_vram_ * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); +amdsmi_get_gpu_target_frequency_range(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range); /** @} End powermon */ diff --git a/py-interface/README.md b/py-interface/README.md index c405ab47af..a0b3b13439 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -739,7 +739,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_get_target_frequency_range +## amdsmi_get_gpu_target_frequency_range Description: Returns the supported frequency target range for the given GPU `Note: Not Supported` @@ -772,7 +772,7 @@ Field | Description `current_upper_bound` | Maximal value of target current frequency in MHz `current_lower_bound` | Minimal value of target current frequency in MHz -Exceptions that can be thrown by `amdsmi_get_target_frequency_range` function: +Exceptions that can be thrown by `amdsmi_get_gpu_target_frequency_range` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -786,21 +786,21 @@ try: else: for device in devices: print("=============== GFX DOMAIN ================") - freq_range = amdsmi_get_target_frequency_range(device, + freq_range = amdsmi_get_gpu_target_frequency_range(device, AmdSmiClkType.GFX) print(freq_range['supported_upper_bound']) print(freq_range['supported_lower_bound']) print(freq_range['current_upper_bound']) print(freq_range['current_lower_bound']) print("=============== MEM DOMAIN ================") - freq_range = amdsmi_get_target_frequency_range(device, + freq_range = amdsmi_get_gpu_target_frequency_range(device, AmdSmiClkType.MEM) print(freq_range['supported_upper_bound']) print(freq_range['supported_lower_bound']) print(freq_range['current_upper_bound']) print(freq_range['current_lower_bound']) print("=============== VCLK0 DOMAIN ================") - freq_range = amdsmi_get_target_frequency_range(device, + freq_range = amdsmi_get_gpu_target_frequency_range(device, AmdSmiClkType.VCLK0) print(freq_range['supported_upper_bound']) print(freq_range['supported_lower_bound']) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index d46b4bd25f..c7e05b2797 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -56,7 +56,7 @@ from .amdsmi_interface import amdsmi_get_pcie_link_caps from .amdsmi_interface import amdsmi_get_bad_page_info # # Power Management -from .amdsmi_interface import amdsmi_get_target_frequency_range +from .amdsmi_interface import amdsmi_get_gpu_target_frequency_range # # Process Information from .amdsmi_interface import amdsmi_get_process_list diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index bef6e8801b..7d20b44153 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -751,7 +751,7 @@ def amdsmi_get_bad_page_info( return table_records -def amdsmi_get_target_frequency_range( +def amdsmi_get_gpu_target_frequency_range( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, clock_type: amdsmi_wrapper.amdsmi_clk_type_t, ) -> Dict[str, Any]: @@ -764,7 +764,7 @@ def amdsmi_get_target_frequency_range( freq_range = amdsmi_wrapper.amdsmi_frequency_range_t() _check_res( - amdsmi_wrapper.amdsmi_get_target_frequency_range( + amdsmi_wrapper.amdsmi_get_gpu_target_frequency_range( processor_handle, amdsmi_wrapper.amdsmi_clk_type_t(clock_type), ctypes.byref(freq_range), diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 9c0247a7fd..e63c793c19 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1706,9 +1706,9 @@ amdsmi_get_clock_measure.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, amdsmi_get_gpu_vram_usage = _libraries['libamd_smi.so'].amdsmi_get_gpu_vram_usage amdsmi_get_gpu_vram_usage.restype = amdsmi_status_t amdsmi_get_gpu_vram_usage.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_vram_info_t)] -amdsmi_get_target_frequency_range = _libraries['libamd_smi.so'].amdsmi_get_target_frequency_range -amdsmi_get_target_frequency_range.restype = amdsmi_status_t -amdsmi_get_target_frequency_range.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequency_range_t)] +amdsmi_get_gpu_target_frequency_range = _libraries['libamd_smi.so'].amdsmi_get_gpu_target_frequency_range +amdsmi_get_gpu_target_frequency_range.restype = amdsmi_status_t +amdsmi_get_gpu_target_frequency_range.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequency_range_t)] amdsmi_get_process_list = _libraries['libamd_smi.so'].amdsmi_get_process_list amdsmi_get_process_list.restype = amdsmi_status_t amdsmi_get_process_list.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(ctypes.c_uint32)] @@ -1910,7 +1910,7 @@ __all__ = \ 'amdsmi_get_process_list', 'amdsmi_get_ras_block_features_enabled', 'amdsmi_get_socket_handles', 'amdsmi_get_socket_info', - 'amdsmi_get_target_frequency_range', + 'amdsmi_get_gpu_target_frequency_range', 'amdsmi_get_utilization_count', 'amdsmi_get_gpu_vbios_info', 'amdsmi_get_version', 'amdsmi_get_version_str', 'amdsmi_get_gpu_vram_usage', 'amdsmi_get_xgmi_info', diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 132b70796e..02041b516e 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -1741,7 +1741,7 @@ amdsmi_get_power_measure(amdsmi_processor_handle processor_handle, amdsmi_power_ } amdsmi_status_t -amdsmi_get_target_frequency_range(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { +amdsmi_get_gpu_target_frequency_range(amdsmi_processor_handle processor_handle, amdsmi_clk_type_t clk_type, amdsmi_frequency_range_t *range) { AMDSMI_CHECK_INIT(); if (range == nullptr || clk_type > CLK_TYPE__MAX) {