diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 8ecec991ae..01caddfe2b 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2176,7 +2176,7 @@ amdsmi_status_t amdsmi_get_pcie_link_caps(amdsmi_processor_handle processor_hand * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_perf_level(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t *perf); /** diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index fc9d08a9ea..a57384ccfe 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1959,7 +1959,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_perf_level +## amdsmi_get_gpu_perf_level Description: Get the performance level of the device with provided device handle Input parameters: @@ -1967,7 +1967,7 @@ Input parameters: Output: Performance level as enum value of dev_perf_level_t -Exceptions that can be thrown by `amdsmi_dev_get_perf_level` function: +Exceptions that can be thrown by `amdsmi_get_gpu_perf_level` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1980,7 +1980,7 @@ try: print("No GPUs on machine") else: for device in devices: - perf_level = amdsmi_dev_get_perf_level(dev) + perf_level = amdsmi_get_gpu_perf_level(dev) print(perf_level) except AmdSmiException as e: print(e) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index d82e4fa6f1..3a0db953ea 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -106,7 +106,7 @@ from .amdsmi_interface import amdsmi_get_gpu_volt_metric # # Clock, Power and Performance Query from .amdsmi_interface import amdsmi_get_busy_percent from .amdsmi_interface import amdsmi_get_utilization_count -from .amdsmi_interface import amdsmi_dev_get_perf_level +from .amdsmi_interface import amdsmi_get_gpu_perf_level from .amdsmi_interface import amdsmi_set_perf_determinism_mode from .amdsmi_interface import amdsmi_dev_get_overdrive_level from .amdsmi_interface import amdsmi_dev_get_gpu_clk_freq diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 1b4fca79e4..9d3d677d34 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2229,7 +2229,7 @@ def amdsmi_get_utilization_count( return result -def amdsmi_dev_get_perf_level( +def amdsmi_get_gpu_perf_level( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> str: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2240,7 +2240,7 @@ def amdsmi_dev_get_perf_level( perf = amdsmi_wrapper.amdsmi_dev_perf_level_t() _check_res( - amdsmi_wrapper.amdsmi_dev_get_perf_level( + amdsmi_wrapper.amdsmi_get_gpu_perf_level( processor_handle, ctypes.byref(perf)) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index ff48c25e66..14afd9dc80 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1520,9 +1520,9 @@ amdsmi_get_pcie_link_status.argtypes = [amdsmi_processor_handle, ctypes.POINTER( amdsmi_get_pcie_link_caps = _libraries['libamd_smi.so'].amdsmi_get_pcie_link_caps amdsmi_get_pcie_link_caps.restype = amdsmi_status_t amdsmi_get_pcie_link_caps.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_pcie_info_t)] -amdsmi_dev_get_perf_level = _libraries['libamd_smi.so'].amdsmi_dev_get_perf_level -amdsmi_dev_get_perf_level.restype = amdsmi_status_t -amdsmi_dev_get_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_dev_perf_level_t)] +amdsmi_get_gpu_perf_level = _libraries['libamd_smi.so'].amdsmi_get_gpu_perf_level +amdsmi_get_gpu_perf_level.restype = amdsmi_status_t +amdsmi_get_gpu_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c__EA_amdsmi_dev_perf_level_t)] amdsmi_set_perf_determinism_mode = _libraries['libamd_smi.so'].amdsmi_set_perf_determinism_mode amdsmi_set_perf_determinism_mode.restype = amdsmi_status_t amdsmi_set_perf_determinism_mode.argtypes = [amdsmi_processor_handle, uint64_t] @@ -1864,7 +1864,7 @@ __all__ = \ 'amdsmi_dev_get_od_volt_info', 'amdsmi_dev_get_overdrive_level', 'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id', 'amdsmi_get_gpu_pci_replay_counter', - 'amdsmi_get_gpu_pci_throughput', 'amdsmi_dev_get_perf_level', + 'amdsmi_get_gpu_pci_throughput', 'amdsmi_get_gpu_perf_level', 'amdsmi_get_power_ave', 'amdsmi_dev_get_power_profile_presets', 'amdsmi_get_gpu_subsystem_id', 'amdsmi_get_gpu_subsystem_name', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index a5ae279dfe..849e27b05b 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -311,7 +311,7 @@ class Formatter: | """ + self.style.text("22 Get device volt metric. Api: amdsmi_get_gpu_volt_metric ") + """ | | """ + self.style.text("23 Get device busy percent. Api: amdsmi_get_busy_percent ") + """ | | """ + self.style.text("24 Get utilization count. Api: amdsmi_get_utilization_count ") + """ | - | """ + self.style.text("25 Get device perf level. Api: amdsmi_dev_get_perf_level ") + """ | + | """ + self.style.text("25 Get device perf level. Api: amdsmi_get_gpu_perf_level ") + """ | | """ + self.style.text("26 Set perf determinism mode. Api: amdsmi_set_perf_determinism_mode ") + """ | | """ + self.style.text("27 Get device overdrive level. Api: amdsmi_dev_get_overdrive_level ") + """ | | """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_dev_get_gpu_clk_freq ") + """ | @@ -798,7 +798,7 @@ commands = { 24: [amdsmi_tool_utilization_count_get, { "device_identifier1": [None, True], }], - 25: [smi_api.amdsmi_dev_get_perf_level, { + 25: [smi_api.amdsmi_get_gpu_perf_level, { "device_identifier1": [None, True] }], 26: [amdsmi_tool_perf_determinism_mode_set, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 202b54b2d5..a2f9206f86 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -914,7 +914,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"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_get", "amdsmi_dev_get_perf_level"}, + {"rsmi_dev_perf_level_get", "amdsmi_get_gpu_perf_level"}, {"rsmi_perf_determinism_mode_set", "amdsmi_set_perf_determinism_mode"}, {"rsmi_dev_overdrive_level_set", " amdsmi_dev_set_overdrive_level"}, {"rsmi_dev_vbios_version_get", "amdsmi_get_gpu_vbios_info"}, @@ -1166,7 +1166,7 @@ amdsmi_status_t reserved, static_cast(profile)); } -amdsmi_status_t amdsmi_dev_get_perf_level(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_perf_level(amdsmi_processor_handle processor_handle, amdsmi_dev_perf_level_t *perf) { AMDSMI_CHECK_INIT(); 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 17bcc667a2..790359641a 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -235,7 +235,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_set_gpu_fan_speed(processor_handles_[0], dmy_ui32, 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_get_perf_level(processor_handles_[0], &dmy_perf_lvl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[0], &dmy_perf_lvl); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_overdrive_level(processor_handles_[0], &dmy_ui32); CHECK_RET(ret, AMDSMI_STATUS_BUSY); 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 77c45ae5ca..7c51d8e889 100644 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_determinism.cc @@ -121,7 +121,7 @@ void TestPerfDeterminism::Run(void) { } return; } else { - ret = amdsmi_dev_get_perf_level(processor_handles_[i], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[i], &pfl); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "\t**New Perf Level:" << GetPerfLevelStr(pfl) << @@ -132,7 +132,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);; CHK_ERR_ASRT(err) - ret = amdsmi_dev_get_perf_level(processor_handles_[i], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[i], &pfl); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "\t**New Perf Level:" << GetPerfLevelStr(pfl) << diff --git a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc index 0b27f421c7..bb8d996120 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/perf_level_read.cc @@ -98,14 +98,14 @@ void TestPerfLevelRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); - err = amdsmi_dev_get_perf_level(processor_handles_[i], &pfl); + err = amdsmi_get_gpu_perf_level(processor_handles_[i], &pfl); CHK_ERR_ASRT(err) IF_VERB(STANDARD) { std::cout << "\t**Performance Level:" << std::dec << (uint32_t)pfl << std::endl; } // Verify api support checking functionality is working - err = amdsmi_dev_get_perf_level(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_perf_level(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } } 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 71ff372b89..c95727392c 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 @@ -101,7 +101,7 @@ void TestPerfLevelReadWrite::Run(void) { for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { PrintDeviceHeader(processor_handles_[dv_ind]); - ret = amdsmi_dev_get_perf_level(processor_handles_[dv_ind], &orig_pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &orig_pfl); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { @@ -127,7 +127,7 @@ void TestPerfLevelReadWrite::Run(void) { << " returned AMDSMI_STATUS_NOT_SUPPORTED" << std::endl; } else { CHK_ERR_ASRT(ret) - ret = amdsmi_dev_get_perf_level(processor_handles_[dv_ind], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "\t**New Perf Level:" << GetPerfLevelStr(pfl) << @@ -141,7 +141,7 @@ void TestPerfLevelReadWrite::Run(void) { } ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], orig_pfl); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_get_perf_level(processor_handles_[dv_ind], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { 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 0cba5c0b83..6337ec5c45 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 @@ -176,7 +176,7 @@ void TestPowerReadWrite::Run(void) { CHK_ERR_ASRT(ret) amdsmi_dev_perf_level_t pfl; - ret = amdsmi_dev_get_perf_level(processor_handles_[dv_ind], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl); CHK_ERR_ASRT(ret) ASSERT_EQ(pfl, AMDSMI_DEV_PERF_LEVEL_MANUAL); @@ -188,7 +188,7 @@ void TestPowerReadWrite::Run(void) { ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_get_perf_level(processor_handles_[dv_ind], &pfl); + ret = amdsmi_get_gpu_perf_level(processor_handles_[dv_ind], &pfl); CHK_ERR_ASRT(ret) ASSERT_EQ(pfl, AMDSMI_DEV_PERF_LEVEL_AUTO);