From 575856eeee75b1dd4002bb22c388f4a331b15128 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:30:34 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_busy_percent to amdsmi_get_busy_percent grep -rli 'amdsmi_dev_get_busy_percent' * | xargs -i@ sed -i 's/amdsmi_dev_get_busy_percent/amdsmi_get_busy_percent/g' @ Change-Id: I02ff8f86d2e7a6c38e7f56d40a07b27e90835152 --- include/amd_smi/amdsmi.h | 2 +- py-interface/README.md | 6 +++--- py-interface/__init__.py | 2 +- py-interface/amdsmi_interface.py | 4 ++-- py-interface/amdsmi_wrapper.py | 8 ++++---- py-interface/rocm_smi_tool.py | 4 ++-- src/amd_smi/amd_smi.cc | 4 ++-- tests/amd_smi_test/functional/gpu_busy_read.cc | 2 +- tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index e30e3d0d43..8ecec991ae 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2098,7 +2098,7 @@ amdsmi_status_t amdsmi_set_gpu_fan_speed(amdsmi_processor_handle processor_handl * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_busy_percent(amdsmi_processor_handle processor_handle, uint32_t *busy_percent); +amdsmi_get_busy_percent(amdsmi_processor_handle processor_handle, uint32_t *busy_percent); /** * @brief Get coarse grain utilization counter of the specified device diff --git a/py-interface/README.md b/py-interface/README.md index 9bd56d763f..fc9d08a9ea 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -1892,7 +1892,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_busy_percent +## amdsmi_get_busy_percent Description: Get percentage of time device is busy doing any processing Input parameters: @@ -1900,7 +1900,7 @@ Input parameters: Output: How busy the device is (as percentage of time) -Exceptions that can be thrown by `amdsmi_dev_get_busy_percent` function: +Exceptions that can be thrown by `amdsmi_get_busy_percent` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1913,7 +1913,7 @@ try: print("No GPUs on machine") else: for device in devices: - busy = amdsmi_dev_get_busy_percent(dev) + busy = amdsmi_get_busy_percent(dev) print(busy) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index f7d8131327..d82e4fa6f1 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -104,7 +104,7 @@ from .amdsmi_interface import amdsmi_get_temp_metric from .amdsmi_interface import amdsmi_get_gpu_volt_metric # # Clock, Power and Performance Query -from .amdsmi_interface import amdsmi_dev_get_busy_percent +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_set_perf_determinism_mode diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 00519adf55..1b4fca79e4 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -2165,7 +2165,7 @@ def amdsmi_get_gpu_volt_metric( return voltage.value -def amdsmi_dev_get_busy_percent( +def amdsmi_get_busy_percent( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2175,7 +2175,7 @@ def amdsmi_dev_get_busy_percent( busy_percent = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_dev_get_busy_percent( + amdsmi_wrapper.amdsmi_get_busy_percent( processor_handle, ctypes.byref(busy_percent) ) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index b500b24353..ff48c25e66 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1508,9 +1508,9 @@ amdsmi_reset_gpu_fan.argtypes = [amdsmi_processor_handle, uint32_t] amdsmi_set_gpu_fan_speed = _libraries['libamd_smi.so'].amdsmi_set_gpu_fan_speed amdsmi_set_gpu_fan_speed.restype = amdsmi_status_t amdsmi_set_gpu_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, uint64_t] -amdsmi_dev_get_busy_percent = _libraries['libamd_smi.so'].amdsmi_dev_get_busy_percent -amdsmi_dev_get_busy_percent.restype = amdsmi_status_t -amdsmi_dev_get_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_busy_percent = _libraries['libamd_smi.so'].amdsmi_get_busy_percent +amdsmi_get_busy_percent.restype = amdsmi_status_t +amdsmi_get_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_utilization_count = _libraries['libamd_smi.so'].amdsmi_get_utilization_count amdsmi_get_utilization_count.restype = amdsmi_status_t amdsmi_get_utilization_count.argtypes = [amdsmi_processor_handle, struct_c__SA_amdsmi_utilization_counter_t * 0, uint32_t, ctypes.POINTER(ctypes.c_uint64)] @@ -1851,7 +1851,7 @@ __all__ = \ 'amdsmi_counter_get_available_counters', 'amdsmi_counter_value_t', 'amdsmi_dev_close_supported_func_iterator', 'amdsmi_dev_counter_group_supported', 'amdsmi_dev_create_counter', - 'amdsmi_dev_destroy_counter', 'amdsmi_dev_get_busy_percent', + 'amdsmi_dev_destroy_counter', 'amdsmi_get_busy_percent', 'amdsmi_get_gpu_drm_render_minor', 'amdsmi_dev_get_ecc_count', 'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status', 'amdsmi_get_energy_count', 'amdsmi_get_gpu_fan_rpms', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 17b18db529..a5ae279dfe 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -309,7 +309,7 @@ class Formatter: | """ + self.style.text("20 Get device fan speed max. Api: amdsmi_get_gpu_fan_speed_max ") + """ | | """ + self.style.text("21 Get device temp metric. Api: amdsmi_get_temp_metric ") + """ | | """ + self.style.text("22 Get device volt metric. Api: amdsmi_get_gpu_volt_metric ") + """ | - | """ + self.style.text("23 Get device busy percent. Api: amdsmi_dev_get_busy_percent ") + """ | + | """ + 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("26 Set perf determinism mode. Api: amdsmi_set_perf_determinism_mode ") + """ | @@ -792,7 +792,7 @@ commands = { 22: [amdsmi_tool_dev_volt_metric_get, { "device_identifier1": [None, True], }], - 23: [smi_api.amdsmi_dev_get_busy_percent, { + 23: [smi_api.amdsmi_get_busy_percent, { "device_identifier1": [None, True] }], 24: [amdsmi_tool_utilization_count_get, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 1ea5ff7788..202b54b2d5 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -908,7 +908,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_pci_bandwidth_set", " amdsmi_set_gpu_pci_bandwidth"}, {"rsmi_dev_power_profile_set", " amdsmi_set_gpu_power_profile"}, {"rsmi_dev_memory_busy_percent_get", "amdsmi_get_gpu_memory_busy_percent"}, - {"rsmi_dev_busy_percent_get", "amdsmi_dev_get_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_power_profile_presets_get", " amdsmi_dev_get_power_profile_presets"}, @@ -1040,7 +1040,7 @@ amdsmi_status_t amdsmi_dev_get_ecc_status(amdsmi_processor_handle processor_han } amdsmi_status_t -amdsmi_dev_get_busy_percent(amdsmi_processor_handle processor_handle, +amdsmi_get_busy_percent(amdsmi_processor_handle processor_handle, uint32_t *busy_percent) { AMDSMI_CHECK_INIT(); diff --git a/tests/amd_smi_test/functional/gpu_busy_read.cc b/tests/amd_smi_test/functional/gpu_busy_read.cc index 2ad6058ba9..636b0cec88 100755 --- a/tests/amd_smi_test/functional/gpu_busy_read.cc +++ b/tests/amd_smi_test/functional/gpu_busy_read.cc @@ -99,7 +99,7 @@ void TestGPUBusyRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); - err = amdsmi_dev_get_busy_percent(processor_handles_[i], &val_ui32); + err = amdsmi_get_busy_percent(processor_handles_[i], &val_ui32); if (err != AMDSMI_STATUS_SUCCESS) { if (err == AMDSMI_STATUS_FILE_ERROR) { IF_VERB(STANDARD) { diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 1f00f4e6e6..17bcc667a2 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -292,7 +292,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_memory_total amdsmi_get_gpu_memory_usage amdsmi_get_gpu_memory_busy_percent - amdsmi_dev_get_busy_percent + amdsmi_get_busy_percent amdsmi_dev_vbios_version_get amdsmi_dev_serial_number_get amdsmi_get_gpu_pci_replay_counter