From 46b21f99d54a9dbd617a48588d02dfbee7171604 Mon Sep 17 00:00:00 2001 From: Suma Hegde Date: Sun, 26 Feb 2023 20:59:06 -0500 Subject: [PATCH] Renamed API amdsmi_dev_set_perf_level amdsmi_dev_set_perf_level -> amdsmi_set_gpu_perf_level amdsmi_dev_set_perf_level_v1 -> amdsmi_set_gpu_perf_level_v1 grep -rli 'amdsmi_dev_set_perf_level' * | xargs -i@ sed -i 's/amdsmi_dev_set_perf_level/amdsmi_set_gpu_perf_level/g' @ Change-Id: Ib37766938c9a808d971a49a24979ada8919a329e [ROCm/amdsmi commit: 40a1904ef97ed0fd6457a3806db4b248c1c55070] --- projects/amdsmi/include/amd_smi/amdsmi.h | 6 +++--- projects/amdsmi/py-interface/README.md | 12 ++++++------ projects/amdsmi/py-interface/__init__.py | 4 ++-- projects/amdsmi/py-interface/amdsmi_interface.py | 8 ++++---- projects/amdsmi/py-interface/amdsmi_wrapper.py | 16 ++++++++-------- projects/amdsmi/py-interface/rocm_smi_tool.py | 8 ++++---- projects/amdsmi/src/amd_smi/amd_smi.cc | 8 ++++---- .../functional/frequencies_read_write.cc | 4 ++-- .../amd_smi_test/functional/mutual_exclusion.cc | 2 +- .../amd_smi_test/functional/pci_read_write.cc | 2 +- .../amd_smi_test/functional/perf_determinism.cc | 2 +- .../functional/perf_level_read_write.cc | 4 ++-- .../amd_smi_test/functional/power_read_write.cc | 2 +- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 0a1a1852ed..8b6ead384c 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2447,7 +2447,7 @@ amdsmi_status_t * @brief Set the PowerPlay performance level associated with the device with * provided processor handle with the provided value. * - * @deprecated :: amdsmi_dev_set_perf_level_v1() is preferred, with an + * @deprecated :: amdsmi_set_gpu_perf_level_v1() is preferred, with an * interface that more closely matches the rest of the amd_smi API. * * @details Given a processor handle @p processor_handle and an ::amdsmi_dev_perf_level_t @p @@ -2463,7 +2463,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_perf_level(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl); + amdsmi_set_gpu_perf_level(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl); /** * @brief Set the PowerPlay performance level associated with the device with @@ -2482,7 +2482,7 @@ amdsmi_status_t * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_set_perf_level_v1(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl); + amdsmi_set_gpu_perf_level_v1(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl); /** * @brief Set the overdrive percent associated with the device with provided diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 8ec23e1da9..f8f1c8cfaf 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1719,7 +1719,7 @@ except AmdSmiException as e: -## amdsmi_dev_set_perf_level_v1 +## amdsmi_set_gpu_perf_level_v1 Description: Set the PowerPlay performance level associated with the device with provided device handle with the provided value @@ -1729,7 +1729,7 @@ Input parameters: Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_perf_level_v1` function: +Exceptions that can be thrown by ` amdsmi_set_gpu_perf_level_v1` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1742,7 +1742,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_perf_level_v1(device, AmdSmiDevPerfLevel.AMDSMI_DEV_PERF_LEVEL_HIGH) + amdsmi_set_gpu_perf_level_v1(device, AmdSmiDevPerfLevel.AMDSMI_DEV_PERF_LEVEL_HIGH) except AmdSmiException as e: print(e) ``` @@ -2405,7 +2405,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_perf_level +## amdsmi_set_gpu_perf_level Description: Set a desired performance level for given device Input parameters: @@ -2414,7 +2414,7 @@ Input parameters: Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_perf_level` function: +Exceptions that can be thrown by ` amdsmi_set_gpu_perf_level` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2427,7 +2427,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_perf_level(device, AmdSmiDevPerfLevel.STABLE_PEAK) + amdsmi_set_gpu_perf_level(device, AmdSmiDevPerfLevel.STABLE_PEAK) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 3162f11f4a..50a790a324 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -85,8 +85,8 @@ from .amdsmi_interface import amdsmi_set_gpu_power_profile from .amdsmi_interface import amdsmi_set_gpu_clk_range from .amdsmi_interface import amdsmi_dev_set_od_clk_info from .amdsmi_interface import amdsmi_dev_set_od_volt_info -from .amdsmi_interface import amdsmi_dev_set_perf_level_v1 -from .amdsmi_interface import amdsmi_dev_set_perf_level +from .amdsmi_interface import amdsmi_set_gpu_perf_level_v1 +from .amdsmi_interface import amdsmi_set_gpu_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_gpu_perf_determinism_mode diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index a0f17dab85..31e7a28839 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1452,7 +1452,7 @@ def amdsmi_counter_get_available_counters( return available.value -def amdsmi_dev_set_perf_level( +def amdsmi_set_gpu_perf_level( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, perf_level: AmdSmiDevPerfLevel, ): @@ -1463,7 +1463,7 @@ def amdsmi_dev_set_perf_level( if not isinstance(perf_level, AmdSmiDevPerfLevel): raise AmdSmiParameterException(perf_level, AmdSmiDevPerfLevel) - _check_res(amdsmi_wrapper. amdsmi_dev_set_perf_level( + _check_res(amdsmi_wrapper. amdsmi_set_gpu_perf_level( processor_handle, perf_level)) @@ -2044,7 +2044,7 @@ def amdsmi_get_gpu_memory_busy_percent(processor_handle: amdsmi_wrapper.amdsmi_p return busy_percent.value -def amdsmi_dev_set_perf_level_v1( +def amdsmi_set_gpu_perf_level_v1( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, perf_lvl: AmdSmiDevPerfLevel, ) -> None: @@ -2056,7 +2056,7 @@ def amdsmi_dev_set_perf_level_v1( if not isinstance(perf_lvl, AmdSmiDevPerfLevel): raise AmdSmiParameterException(perf_lvl, AmdSmiDevPerfLevel) - _check_res(amdsmi_wrapper. amdsmi_dev_set_perf_level_v1( + _check_res(amdsmi_wrapper. amdsmi_set_gpu_perf_level_v1( processor_handle, perf_lvl)) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 20c522a83e..4bee6e3b1b 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1556,12 +1556,12 @@ amdsmi_dev_get_od_volt_curve_regions.argtypes = [amdsmi_processor_handle, ctypes amdsmi_dev_get_power_profile_presets = _libraries['libamd_smi.so'].amdsmi_dev_get_power_profile_presets amdsmi_dev_get_power_profile_presets.restype = amdsmi_status_t amdsmi_dev_get_power_profile_presets.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] -amdsmi_dev_set_perf_level = _libraries['libamd_smi.so'].amdsmi_dev_set_perf_level -amdsmi_dev_set_perf_level.restype = amdsmi_status_t -amdsmi_dev_set_perf_level.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] -amdsmi_dev_set_perf_level_v1 = _libraries['libamd_smi.so'].amdsmi_dev_set_perf_level_v1 -amdsmi_dev_set_perf_level_v1.restype = amdsmi_status_t -amdsmi_dev_set_perf_level_v1.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] +amdsmi_set_gpu_perf_level = _libraries['libamd_smi.so'].amdsmi_set_gpu_perf_level +amdsmi_set_gpu_perf_level.restype = amdsmi_status_t +amdsmi_set_gpu_perf_level.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] +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] @@ -1879,8 +1879,8 @@ __all__ = \ 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', 'amdsmi_dev_set_overdrive_level', 'amdsmi_dev_set_overdrive_level_v1', - 'amdsmi_set_gpu_pci_bandwidth', 'amdsmi_dev_set_perf_level', - 'amdsmi_dev_set_perf_level_v1', 'amdsmi_set_power_cap', + '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_dev_xgmi_error_status', 'amdsmi_processor_handle', 'amdsmi_engine_usage_t', 'amdsmi_error_count_t', 'amdsmi_event_group_t', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index b38b7c341b..fe70228d76 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -359,8 +359,8 @@ class Formatter: | """ + 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("72 Set dev pci bandwidth. Api: amdsmi_set_gpu_pci_bandwidth ") + """ | - | """ + self.style.text("73 Set dev perf level. Api: amdsmi_dev_set_perf_level ") + """ | - | """ + self.style.text("74 Set dev perf level v1. Api: amdsmi_dev_set_perf_level_v1 ") + """ | + | """ + 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 ") + """ | | """ + self.style.text("75 Set dev power cap. Api: amdsmi_set_power_cap ") + """ | | """ + self.style.text("76 Set dev power profile. Api: amdsmi_set_gpu_power_profile ") + """ | | """ + self.style.text("77 Close dev supported func iterator. Api: amdsmi_dev_close_supported_func_iterator ") + """ | @@ -673,7 +673,7 @@ def amdsmi_tool_dev_perf_level_set(dev): result = {} for dev_perf_level in smi_api.AmdSmiDevPerfLevel: try: - value = smi_api. amdsmi_dev_set_perf_level(dev, dev_perf_level) + value = smi_api. amdsmi_set_gpu_perf_level(dev, dev_perf_level) result.update({dev_perf_level.name: value}) except smi_api.AmdSmiException as e: print("{}:\t{}".format(dev_perf_level.name, e)) @@ -684,7 +684,7 @@ def amdsmi_tool_dev_perf_level_set_v1(dev): result = {} for dev_perf_level in smi_api.AmdSmiDevPerfLevel: try: - value = smi_api. amdsmi_dev_set_perf_level_v1(dev, dev_perf_level) + value = smi_api. amdsmi_set_gpu_perf_level_v1(dev, dev_perf_level) result.update({dev_perf_level.name: value}) except smi_api.AmdSmiException as e: print("{}:\t{}".format(dev_perf_level.name, e)) diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 2e31c2930e..2ee4defd5a 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -912,8 +912,8 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, {"rsmi_dev_overdrive_level_get", "amdsmi_dev_get_overdrive_level"}, {"rsmi_dev_power_profile_presets_get", " amdsmi_dev_get_power_profile_presets"}, - {"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_set", " amdsmi_set_gpu_perf_level"}, + {"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"}, @@ -1176,14 +1176,14 @@ amdsmi_status_t amdsmi_get_gpu_perf_level(amdsmi_processor_handle processor_hand reinterpret_cast(perf)); } amdsmi_status_t - amdsmi_dev_set_perf_level(amdsmi_processor_handle processor_handle, + amdsmi_set_gpu_perf_level(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl) { return rsmi_wrapper(rsmi_dev_perf_level_set, processor_handle, static_cast(perf_lvl)); } amdsmi_status_t - amdsmi_dev_set_perf_level_v1(amdsmi_processor_handle processor_handle, + amdsmi_set_gpu_perf_level_v1(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t perf_lvl) { return rsmi_wrapper(rsmi_dev_perf_level_set_v1, processor_handle, static_cast(perf_lvl)); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc index 6c76163a56..b093426c14 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/frequencies_read_write.cc @@ -180,7 +180,7 @@ void TestFrequenciesReadWrite::Run(void) { return; } - ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); + ret = amdsmi_set_gpu_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); if (ret != AMDSMI_STATUS_SUCCESS) { return; } @@ -228,7 +228,7 @@ void TestFrequenciesReadWrite::Run(void) { ret = amdsmi_dev_set_clk_freq(dv_ind, amdsmi_clk, 0xFFFFFFFF); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_set_perf_level(dv_ind, AMDSMI_DEV_PERF_LEVEL_AUTO); + ret = amdsmi_set_gpu_perf_level(dv_ind, AMDSMI_DEV_PERF_LEVEL_AUTO); CHK_ERR_ASRT(ret) #endif } 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 496d279d83..dca78d3bfd 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -258,7 +258,7 @@ void TestMutualExclusion::Run(void) { /* Other functions holding device mutexes. Listed for reference. amdsmi_dev_sku_get - amdsmi_dev_set_perf_level_v1 + amdsmi_set_gpu_perf_level_v1 amdsmi_dev_set_od_clk_info amdsmi_dev_set_od_volt_info amdsmi_dev_firmware_version_get diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc index ffc0b26b66..f08b8e4c17 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc @@ -196,7 +196,7 @@ void TestPciReadWrite::Run(void) { ret = amdsmi_set_gpu_pci_bandwidth(processor_handles_[dv_ind], 0xFFFFFFFF); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); + ret = amdsmi_set_gpu_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); CHK_ERR_ASRT(ret) } } diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc index 6769b0151f..6f0f470563 100644 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc @@ -130,7 +130,7 @@ void TestPerfDeterminism::Run(void) { } std::cout << "\t**Resetting performance determinism" << std::endl; - err = amdsmi_dev_set_perf_level(processor_handles_[i], AMDSMI_DEV_PERF_LEVEL_AUTO);; + err = amdsmi_set_gpu_perf_level(processor_handles_[i], AMDSMI_DEV_PERF_LEVEL_AUTO);; CHK_ERR_ASRT(err) ret = amdsmi_get_gpu_perf_level(processor_handles_[i], &pfl); CHK_ERR_ASRT(ret) diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc index c95727392c..121e7b5a90 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read_write.cc @@ -120,7 +120,7 @@ void TestPerfLevelReadWrite::Run(void) { GetPerfLevelStr(static_cast(pfl_i)) << " ..." << std::endl; } - ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], + ret = amdsmi_set_gpu_perf_level(processor_handles_[dv_ind], static_cast(pfl_i)); if (ret == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << "\t**" << GetPerfLevelStr(static_cast(pfl_i)) @@ -139,7 +139,7 @@ void TestPerfLevelReadWrite::Run(void) { std::cout << "Reset Perf level to " << GetPerfLevelStr(orig_pfl) << " ..." << std::endl; } - ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], orig_pfl); + ret = amdsmi_set_gpu_perf_level(processor_handles_[dv_ind], orig_pfl); CHK_ERR_ASRT(ret) ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl); CHK_ERR_ASRT(ret) diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc index 6337ec5c45..735b468e44 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc @@ -185,7 +185,7 @@ void TestPowerReadWrite::Run(void) { ASSERT_EQ(status.current, new_prof); - ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); + ret = amdsmi_set_gpu_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); CHK_ERR_ASRT(ret) ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl);