From 2dbe69b5678d244591faa0f00cbdac676d990f47 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:10:14 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_memory_busy_percent to amdsmi_get_gpu_memory_busy_percent grep -rli 'amdsmi_dev_get_memory_busy_percent' * | xargs -i@ sed -i 's/amdsmi_dev_get_memory_busy_percent/amdsmi_get_gpu_memory_busy_percent/g' @ Change-Id: I379d8a31074635cd086c1bb0d0e231d3b352725c [ROCm/amdsmi commit: ed45afc51241df996cadc6f071ce16eacad1efef] --- 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 ++-- .../amdsmi/tests/amd_smi_test/functional/mem_util_read.cc | 4 ++-- .../tests/amd_smi_test/functional/mutual_exclusion.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 d1459792bf..95d01d032a 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -1845,7 +1845,7 @@ amdsmi_get_ras_block_features_enabled(amdsmi_processor_handle processor_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_busy_percent(amdsmi_processor_handle processor_handle, uint32_t *busy_percent); +amdsmi_get_gpu_memory_busy_percent(amdsmi_processor_handle processor_handle, uint32_t *busy_percent); /** * @brief Get information about reserved ("retired") memory pages diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index cf897ca39c..24b05246fb 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1688,7 +1688,7 @@ except AmdSmiException as e: ``` -## amdsmi_dev_get_memory_busy_percent +## amdsmi_get_gpu_memory_busy_percent Description: Get percentage of time any device memory is being used @@ -1698,7 +1698,7 @@ Input parameters: Output: percentage of time that any device memory is being used for the specified device. -Exceptions that can be thrown by `amdsmi_dev_get_memory_busy_percent` function: +Exceptions that can be thrown by `amdsmi_get_gpu_memory_busy_percent` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1711,7 +1711,7 @@ try: print("No GPUs on machine") else: for device in devices: - busy_percent = amdsmi_dev_get_memory_busy_percent(device) + busy_percent = amdsmi_get_gpu_memory_busy_percent(device) print(busy_percent) except AmdSmiException as e: print(e) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index f9771902cf..e4f3c162f4 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -150,7 +150,7 @@ from .amdsmi_interface import amdsmi_get_energy_count # # Memory information from .amdsmi_interface import amdsmi_get_gpu_memory_total from .amdsmi_interface import amdsmi_get_gpu_memory_usage -from .amdsmi_interface import amdsmi_dev_get_memory_busy_percent +from .amdsmi_interface import amdsmi_get_gpu_memory_busy_percent from .amdsmi_interface import amdsmi_dev_get_memory_reserved_pages # # Events diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index ff5b799e24..4d0d3352b2 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2028,7 +2028,7 @@ def amdsmi_dev_set_od_volt_info( ) -def amdsmi_dev_get_memory_busy_percent(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): +def amdsmi_get_gpu_memory_busy_percent(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): raise AmdSmiParameterException( processor_handle, amdsmi_wrapper.amdsmi_processor_handle @@ -2037,7 +2037,7 @@ def amdsmi_dev_get_memory_busy_percent(processor_handle: amdsmi_wrapper.amdsmi_p busy_percent = ctypes.c_uint32() _check_res( - amdsmi_wrapper.amdsmi_dev_get_memory_busy_percent( + amdsmi_wrapper.amdsmi_get_gpu_memory_busy_percent( processor_handle, ctypes.byref(busy_percent)) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 290e036a13..14c02e3c79 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1481,9 +1481,9 @@ amdsmi_get_bad_page_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(cty amdsmi_get_ras_block_features_enabled = _libraries['libamd_smi.so'].amdsmi_get_ras_block_features_enabled amdsmi_get_ras_block_features_enabled.restype = amdsmi_status_t amdsmi_get_ras_block_features_enabled.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] -amdsmi_dev_get_memory_busy_percent = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_busy_percent -amdsmi_dev_get_memory_busy_percent.restype = amdsmi_status_t -amdsmi_dev_get_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_gpu_memory_busy_percent = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_busy_percent +amdsmi_get_gpu_memory_busy_percent.restype = amdsmi_status_t +amdsmi_get_gpu_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] amdsmi_dev_get_memory_reserved_pages = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_reserved_pages amdsmi_dev_get_memory_reserved_pages.restype = amdsmi_status_t amdsmi_dev_get_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] @@ -1857,7 +1857,7 @@ __all__ = \ 'amdsmi_get_energy_count', 'amdsmi_dev_get_fan_rpms', 'amdsmi_dev_get_fan_speed', 'amdsmi_dev_get_fan_speed_max', 'amdsmi_dev_get_gpu_clk_freq', 'amdsmi_dev_get_gpu_metrics_info', - 'amdsmi_get_gpu_id', 'amdsmi_dev_get_memory_busy_percent', + 'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent', 'amdsmi_dev_get_memory_reserved_pages', 'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage', 'amdsmi_dev_get_od_volt_curve_regions', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index dbf44aa392..9bbe72ea47 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -302,7 +302,7 @@ class Formatter: | """ + self.style.text("13 Get device energy count. Api: amdsmi_get_energy_count ") + """ | | """ + self.style.text("14 Get device memory total. Api: amdsmi_get_gpu_memory_total ") + """ | | """ + self.style.text("15 Get device memory usage. Api: amdsmi_get_gpu_memory_usage ") + """ | - | """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_dev_get_memory_busy_percent ") + """ | + | """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_get_gpu_memory_busy_percent ") + """ | | """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_dev_get_memory_reserved_pages ") + """ | | """ + self.style.text("18 Get device fan rpms. Api: amdsmi_dev_get_fan_rpms ") + """ | | """ + self.style.text("19 Get device fan speed. Api: amdsmi_dev_get_fan_speed ") + """ | @@ -768,7 +768,7 @@ commands = { 15: [amdsmi_tool_dev_memory_usage_get, { "device_identifier1": [None, True] }], - 16: [smi_api.amdsmi_dev_get_memory_busy_percent, { + 16: [smi_api.amdsmi_get_gpu_memory_busy_percent, { "device_identifier1": [None, True] }], 17: [smi_api.amdsmi_dev_get_memory_reserved_pages, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index ea0c932974..af4f37d410 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -907,7 +907,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_pci_replay_counter_get", " amdsmi_get_gpu_pci_replay_counter"}, {"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_dev_get_memory_busy_percent"}, + {"rsmi_dev_memory_busy_percent_get", "amdsmi_get_gpu_memory_busy_percent"}, {"rsmi_dev_busy_percent_get", "amdsmi_dev_get_busy_percent"}, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_dev_get_memory_reserved_pages"}, {"rsmi_dev_overdrive_level_get", "amdsmi_dev_get_overdrive_level"}, @@ -1366,7 +1366,7 @@ amdsmi_status_t amdsmi_get_utilization_count(amdsmi_processor_handle processor_h reinterpret_cast(utilization_counters), count, timestamp); } -amdsmi_status_t amdsmi_dev_get_memory_busy_percent( +amdsmi_status_t amdsmi_get_gpu_memory_busy_percent( amdsmi_processor_handle processor_handle, uint32_t *busy_percent) { return rsmi_wrapper(rsmi_dev_memory_busy_percent_get, processor_handle, diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc index 9e7e242b22..1a5701f1d8 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mem_util_read.cc @@ -119,8 +119,8 @@ void TestMemUtilRead::Run(void) { PrintDeviceHeader(processor_handles_[i]); #if 0 - err = amdsmi_dev_get_memory_busy_percent(i, &mem_busy_percent); - err_chk("amdsmi_dev_get_memory_busy_percent()"); + err = amdsmi_get_gpu_memory_busy_percent(i, &mem_busy_percent); + err_chk("amdsmi_get_gpu_memory_busy_percent()"); if (err != AMDSMI_STATUS_SUCCESS) { return; } 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 4de73fd8a4..fbdd7a36b8 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -291,7 +291,7 @@ void TestMutualExclusion::Run(void) { amdsmi_set_gpu_power_profile amdsmi_get_gpu_memory_total amdsmi_get_gpu_memory_usage - amdsmi_dev_get_memory_busy_percent + amdsmi_get_gpu_memory_busy_percent amdsmi_dev_get_busy_percent amdsmi_dev_vbios_version_get amdsmi_dev_serial_number_get