From 9d23ac40c6f230bf0c7130535259fcde51cd4794 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 04:12:11 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_od_volt_curve_regions to amdsmi_get_gpu_od_volt_curve_regions grep -rli 'amdsmi_dev_get_od_volt_curve_regions' * | xargs -i@ sed -i 's/amdsmi_dev_get_od_volt_curve_regions/amdsmi_get_gpu_od_volt_curve_regions/g' @ Change-Id: I4b390c2d5173ca919c4ab5b1173a4fc40e2a0015 [ROCm/amdsmi commit: ced22230c48401d29aea7afe3784d74ddfc8fa7e] --- projects/amdsmi/include/amd_smi/amdsmi.h | 2 +- projects/amdsmi/py-interface/README.md | 6 +++--- projects/amdsmi/py-interface/__init__.py | 2 +- projects/amdsmi/py-interface/amdsmi_interface.py | 4 ++-- projects/amdsmi/py-interface/amdsmi_wrapper.py | 8 ++++---- projects/amdsmi/py-interface/rocm_smi_tool.py | 4 ++-- projects/amdsmi/src/amd_smi/amd_smi.cc | 4 ++-- .../tests/amd_smi_test/functional/mutual_exclusion.cc | 4 ++-- .../tests/amd_smi_test/functional/volt_freq_curv_read.cc | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 430b0aa6d6..22b92fe6b9 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2396,7 +2396,7 @@ amdsmi_status_t amdsmi_set_gpu_od_volt_info(amdsmi_processor_handle processor_h * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_od_volt_curve_regions(amdsmi_processor_handle processor_handle, uint32_t *num_regions, amdsmi_freq_volt_region_t *buffer); /** diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index acc7b77146..82059410cb 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2168,7 +2168,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_od_volt_curve_regions +## amdsmi_get_gpu_od_volt_curve_regions Description: This function will retrieve the current valid regions in the frequency/voltage space @@ -2183,7 +2183,7 @@ Field | Description `freq_range` |
Subfield Description
`lower_bound`lower bound freq range
`upper_bound`upper bound freq range
`volt_range` |
Subfield Description
`lower_bound`lower bound volt range
`upper_bound`upper bound volt range
-Exceptions that can be thrown by ` amdsmi_dev_get_od_volt_curve_regions` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_od_volt_curve_regions` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2196,7 +2196,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_get_od_volt_curve_regions(device, 3) + amdsmi_get_gpu_od_volt_curve_regions(device, 3) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 97081fd01b..d46957923f 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -112,7 +112,7 @@ from .amdsmi_interface import amdsmi_get_gpu_overdrive_level from .amdsmi_interface import amdsmi_get_clk_freq from .amdsmi_interface import amdsmi_get_gpu_od_volt_info from .amdsmi_interface import amdsmi_get_gpu_metrics_info -from .amdsmi_interface import amdsmi_dev_get_od_volt_curve_regions +from .amdsmi_interface import amdsmi_get_gpu_od_volt_curve_regions from .amdsmi_interface import amdsmi_get_gpu_power_profile_presets # # Performance Counters diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 4e91c66382..d252a5dce0 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2399,7 +2399,7 @@ def amdsmi_get_gpu_metrics_info( } -def amdsmi_dev_get_od_volt_curve_regions( +def amdsmi_get_gpu_od_volt_curve_regions( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, num_regions: int ) -> List[Dict[str, Any]]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2412,7 +2412,7 @@ def amdsmi_dev_get_od_volt_curve_regions( region_count = ctypes.c_uint32(num_regions) buffer = (amdsmi_wrapper.amdsmi_freq_volt_region_t * num_regions)() _check_res( - amdsmi_wrapper. amdsmi_dev_get_od_volt_curve_regions( + amdsmi_wrapper. amdsmi_get_gpu_od_volt_curve_regions( processor_handle, ctypes.byref(region_count), buffer ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index c2bad37a6d..c13d523cca 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1550,9 +1550,9 @@ amdsmi_set_gpu_od_clk_info.argtypes = [amdsmi_processor_handle, amdsmi_freq_ind_ amdsmi_set_gpu_od_volt_info = _libraries['libamd_smi.so'].amdsmi_set_gpu_od_volt_info amdsmi_set_gpu_od_volt_info.restype = amdsmi_status_t amdsmi_set_gpu_od_volt_info.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t, uint64_t] -amdsmi_dev_get_od_volt_curve_regions = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_curve_regions -amdsmi_dev_get_od_volt_curve_regions.restype = amdsmi_status_t -amdsmi_dev_get_od_volt_curve_regions.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_freq_volt_region_t)] +amdsmi_get_gpu_od_volt_curve_regions = _libraries['libamd_smi.so'].amdsmi_get_gpu_od_volt_curve_regions +amdsmi_get_gpu_od_volt_curve_regions.restype = amdsmi_status_t +amdsmi_get_gpu_od_volt_curve_regions.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_freq_volt_region_t)] amdsmi_get_gpu_power_profile_presets = _libraries['libamd_smi.so'].amdsmi_get_gpu_power_profile_presets amdsmi_get_gpu_power_profile_presets.restype = amdsmi_status_t amdsmi_get_gpu_power_profile_presets.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] @@ -1860,7 +1860,7 @@ __all__ = \ 'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent', 'amdsmi_get_gpu_memory_reserved_pages', 'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage', - 'amdsmi_dev_get_od_volt_curve_regions', + 'amdsmi_get_gpu_od_volt_curve_regions', 'amdsmi_get_gpu_od_volt_info', 'amdsmi_get_gpu_overdrive_level', 'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id', 'amdsmi_get_gpu_pci_replay_counter', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 796601f5e7..392570b7f9 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -317,7 +317,7 @@ class Formatter: | """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_get_clk_freq ") + """ | | """ + self.style.text("29 Get device od volt. Api: amdsmi_get_gpu_od_volt_info ") + """ | | """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_get_gpu_metrics_info ") + """ | - | """ + self.style.text("31 Get device od volt curve regions. Api: amdsmi_dev_get_od_volt_curve_regions ") + """ | + | """ + self.style.text("31 Get device od volt curve regions. Api: amdsmi_get_gpu_od_volt_curve_regions ") + """ | | """ + self.style.text("32 Get device power profile presets. Api: amdsmi_get_gpu_power_profile_presets ") + """ | | """ + self.style.text("33 Get the build version. Api: amdsmi_get_version ") + """ | | """ + self.style.text("34 Get version string. Api: amdsmi_get_version_str ") + """ | @@ -502,7 +502,7 @@ def amdsmi_tool_dev_gpu_clk_freq_get(dev): def amdsmi_tool_dev_od_volt_curve_regions_get(dev, dic): num_regions = dic["num_regions"] - return smi_api. amdsmi_dev_get_od_volt_curve_regions(dev, num_regions) + return smi_api. amdsmi_get_gpu_od_volt_curve_regions(dev, num_regions) def amdsmi_tool_dev_ecc_count_get(dev): diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index e15fdce81f..7de9d3ee6b 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -920,7 +920,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"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"}, - {"rsmi_dev_od_volt_curve_regions_get", " amdsmi_dev_get_od_volt_curve_regions"}, + {"rsmi_dev_od_volt_curve_regions_get", " amdsmi_get_gpu_od_volt_curve_regions"}, {"rsmi_dev_ecc_enabled_get", " amdsmi_dev_get_gpu_ecc_enabled"}, {"rsmi_dev_ecc_status_get", " amdsmi_dev_get_gpu_ecc_status"}, {"rsmi_dev_counter_group_supported", "amdsmi_gpu_counter_group_supported"}, @@ -1308,7 +1308,7 @@ amdsmi_status_t amdsmi_get_gpu_od_volt_info(amdsmi_processor_handle processor_h reinterpret_cast(odv)); } -amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions( +amdsmi_status_t amdsmi_get_gpu_od_volt_curve_regions( amdsmi_processor_handle processor_handle, uint32_t *num_regions, amdsmi_freq_volt_region_t *buffer) { return rsmi_wrapper(rsmi_dev_od_volt_curve_regions_get, processor_handle, diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc index df666139f7..9489a89e9c 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -243,7 +243,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_gpu_od_volt_info(processor_handles_[0], &dmy_od_volt); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_get_od_volt_curve_regions(processor_handles_[0], &dmy_ui32, &dmy_vlt_reg); + 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); CHECK_RET(ret, AMDSMI_STATUS_BUSY); @@ -281,7 +281,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_fan_speed_max amdsmi_get_gpu_od_volt_info amdsmi_get_gpu_metrics_info - amdsmi_dev_get_od_volt_curve_regions + amdsmi_get_gpu_od_volt_curve_regions amdsmi_dev_power_max_get amdsmi_get_power_ave amdsmi_dev_power_cap_get diff --git a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc index 38a2eba73e..9796115dd7 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/volt_freq_curv_read.cc @@ -184,7 +184,7 @@ void TestVoltCurvRead::Run(void) { ASSERT_TRUE(regions != nullptr); num_regions = odv.num_regions; - err = amdsmi_dev_get_od_volt_curve_regions(processor_handles_[i], &num_regions, regions); + err = amdsmi_get_gpu_od_volt_curve_regions(processor_handles_[i], &num_regions, regions); CHK_ERR_ASRT(err) ASSERT_TRUE(num_regions == odv.num_regions);