diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 905c1deb5a..4c6d50962e 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2219,7 +2219,7 @@ amdsmi_set_gpu_perf_determinism_mode(amdsmi_processor_handle processor_handle, u * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_overdrive_level(amdsmi_processor_handle processor_handle, uint32_t *od); +amdsmi_status_t amdsmi_get_gpu_overdrive_level(amdsmi_processor_handle processor_handle, uint32_t *od); /** * @brief Get the list of possible system clock speeds of device for a diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 800cafebd7..d744c37549 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2011,7 +2011,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_overdrive_level +## amdsmi_get_gpu_overdrive_level Description: Get the overdrive percent associated with the device with provided device handle @@ -2020,7 +2020,7 @@ Input parameters: Output: Overdrive percentage as integer -Exceptions that can be thrown by `amdsmi_dev_get_overdrive_level` function: +Exceptions that can be thrown by `amdsmi_get_gpu_overdrive_level` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2033,7 +2033,7 @@ try: print("No GPUs on machine") else: for device in devices: - od_level = amdsmi_dev_get_overdrive_level(dev) + od_level = amdsmi_get_gpu_overdrive_level(dev) print(od_level) except AmdSmiException as e: print(e) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 6bd79150b0..5b22c3313e 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -108,7 +108,7 @@ from .amdsmi_interface import amdsmi_get_busy_percent from .amdsmi_interface import amdsmi_get_utilization_count from .amdsmi_interface import amdsmi_get_gpu_perf_level from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode -from .amdsmi_interface import amdsmi_dev_get_overdrive_level +from .amdsmi_interface import amdsmi_get_gpu_overdrive_level from .amdsmi_interface import amdsmi_get_clk_freq from .amdsmi_interface import amdsmi_dev_get_od_volt_info from .amdsmi_interface import amdsmi_get_gpu_metrics_info diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index bec164965a..e0c37d830e 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2267,7 +2267,7 @@ def amdsmi_set_gpu_perf_determinism_mode( processor_handle, clkvalue)) -def amdsmi_dev_get_overdrive_level( +def amdsmi_get_gpu_overdrive_level( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2277,7 +2277,7 @@ def amdsmi_dev_get_overdrive_level( od_level = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_dev_get_overdrive_level( + amdsmi_wrapper.amdsmi_get_gpu_overdrive_level( processor_handle, ctypes.byref(od_level) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 0adf0eba36..5b1161910f 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1526,9 +1526,9 @@ amdsmi_get_gpu_perf_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(c_ amdsmi_set_gpu_perf_determinism_mode = _libraries['libamd_smi.so'].amdsmi_set_gpu_perf_determinism_mode amdsmi_set_gpu_perf_determinism_mode.restype = amdsmi_status_t amdsmi_set_gpu_perf_determinism_mode.argtypes = [amdsmi_processor_handle, uint64_t] -amdsmi_dev_get_overdrive_level = _libraries['libamd_smi.so'].amdsmi_dev_get_overdrive_level -amdsmi_dev_get_overdrive_level.restype = amdsmi_status_t -amdsmi_dev_get_overdrive_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_gpu_overdrive_level = _libraries['libamd_smi.so'].amdsmi_get_gpu_overdrive_level +amdsmi_get_gpu_overdrive_level.restype = amdsmi_status_t +amdsmi_get_gpu_overdrive_level.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_clk_freq = _libraries['libamd_smi.so'].amdsmi_get_clk_freq amdsmi_get_clk_freq.restype = amdsmi_status_t amdsmi_get_clk_freq.argtypes = [amdsmi_processor_handle, amdsmi_clk_type_t, ctypes.POINTER(struct_c__SA_amdsmi_frequencies_t)] @@ -1861,7 +1861,7 @@ __all__ = \ 'amdsmi_get_gpu_memory_reserved_pages', 'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage', 'amdsmi_dev_get_od_volt_curve_regions', - 'amdsmi_dev_get_od_volt_info', 'amdsmi_dev_get_overdrive_level', + 'amdsmi_dev_get_od_volt_info', 'amdsmi_get_gpu_overdrive_level', 'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id', 'amdsmi_get_gpu_pci_replay_counter', 'amdsmi_get_gpu_pci_throughput', 'amdsmi_get_gpu_perf_level', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 3a385b23b6..8eb4513690 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -313,7 +313,7 @@ class Formatter: | """ + self.style.text("24 Get utilization count. Api: amdsmi_get_utilization_count ") + """ | | """ + 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_gpu_perf_determinism_mode ") + """ | - | """ + self.style.text("27 Get device overdrive level. Api: amdsmi_dev_get_overdrive_level ") + """ | + | """ + self.style.text("27 Get device overdrive level. Api: amdsmi_get_gpu_overdrive_level ") + """ | | """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_get_clk_freq ") + """ | | """ + self.style.text("29 Get device od volt. Api: amdsmi_dev_get_od_volt_info ") + """ | | """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_get_gpu_metrics_info ") + """ | @@ -805,7 +805,7 @@ commands = { "device_identifier1": [None, True], "clock_value": [int, True] }], - 27: [smi_api.amdsmi_dev_get_overdrive_level, { + 27: [smi_api.amdsmi_get_gpu_overdrive_level, { "device_identifier1": [None, True] }], 28: [amdsmi_tool_dev_gpu_clk_freq_get, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 3103fc0a0a..7a19173469 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -910,7 +910,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_memory_busy_percent_get", "amdsmi_get_gpu_memory_busy_percent"}, {"rsmi_dev_busy_percent_get", "amdsmi_get_busy_percent"}, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, - {"rsmi_dev_overdrive_level_get", "amdsmi_dev_get_overdrive_level"}, + {"rsmi_dev_overdrive_level_get", "amdsmi_get_gpu_overdrive_level"}, {"rsmi_dev_power_profile_presets_get", " amdsmi_get_gpu_power_profile_presets"}, {"rsmi_dev_perf_level_set", " amdsmi_set_gpu_perf_level"}, {"rsmi_dev_perf_level_set_v1", " amdsmi_set_gpu_perf_level_v1"}, @@ -1280,7 +1280,7 @@ amdsmi_status_t amdsmi_get_gpu_memory_usage(amdsmi_processor_handle processor_ha static_cast(mem_type), used); } -amdsmi_status_t amdsmi_dev_get_overdrive_level( +amdsmi_status_t amdsmi_get_gpu_overdrive_level( amdsmi_processor_handle processor_handle, uint32_t *od) { return rsmi_wrapper(rsmi_dev_overdrive_level_get, processor_handle, od); 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 770234b053..09588bafe5 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -237,7 +237,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); 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); + ret = amdsmi_get_gpu_overdrive_level(processor_handles_[0], &dmy_ui32); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_clk_freq(processor_handles_[0], CLK_TYPE_SYS, &dmy_freqs); CHECK_RET(ret, AMDSMI_STATUS_BUSY); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc index 2aa7e45e39..ccc3df1eb7 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read.cc @@ -98,12 +98,12 @@ void TestOverdriveRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); - err = amdsmi_dev_get_overdrive_level(processor_handles_[i], &val_ui32); + err = amdsmi_get_gpu_overdrive_level(processor_handles_[i], &val_ui32); CHK_ERR_ASRT(err) IF_VERB(STANDARD) { std::cout << "\t**OverDrive Level:" << val_ui32 << std::endl; // Verify api support checking functionality is working - err = amdsmi_dev_get_overdrive_level(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_overdrive_level(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } } diff --git a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc index 08f700ec2a..e389409787 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/overdrive_read_write.cc @@ -107,7 +107,7 @@ void TestOverdriveReadWrite::Run(void) { } ret = amdsmi_dev_set_overdrive_level(processor_handles_[dv_ind], 10); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_get_overdrive_level(processor_handles_[dv_ind], &val); + ret = amdsmi_get_gpu_overdrive_level(processor_handles_[dv_ind], &val); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "\t**New OverDrive Level:" << val << std::endl; @@ -115,7 +115,7 @@ void TestOverdriveReadWrite::Run(void) { } ret = amdsmi_dev_set_overdrive_level(processor_handles_[dv_ind], 0); CHK_ERR_ASRT(ret) - ret = amdsmi_dev_get_overdrive_level(processor_handles_[dv_ind], &val); + ret = amdsmi_get_gpu_overdrive_level(processor_handles_[dv_ind], &val); CHK_ERR_ASRT(ret) IF_VERB(STANDARD) { std::cout << "\t**New OverDrive Level:" << val << std::endl;