From 0cb9e157db84be127528ec7aebdacf7c2da3eaec Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 02:08:28 -0500 Subject: [PATCH] Renamed API amdsmi_counter_get_available_counters to amdsmi_get_gpu_available_counters grep -rli 'amdsmi_counter_get_available_counters' * | xargs -i@ sed -i 's/amdsmi_counter_get_available_counters/amdsmi_get_gpu_available_counters/g' @ Change-Id: Ief60be6c95f2ea4d0f6f91b153263d95710e6942 --- include/amd_smi/amdsmi.h | 6 +++--- 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/mutual_exclusion.cc | 2 +- tests/amd_smi_test/functional/perf_cntr_read_write.cc | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 0bd44732fd..307871e89a 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2769,7 +2769,7 @@ amdsmi_status_string(amdsmi_status_t status, const char **status_string); * (::amdsmi_event_group_t) are supported for a given device. Assuming a device * supports a given event type, we can then check to see if there are counters * available to count a specific event with - * :: amdsmi_counter_get_available_counters(). Counters may be occupied by other + * :: amdsmi_get_gpu_available_counters(). Counters may be occupied by other * perf based programs. * * Once it is determined that events are supported and counters are available, @@ -2816,7 +2816,7 @@ amdsmi_status_string(amdsmi_status_t status, const char **status_string); * // See if there are counters available for device dv_ind for event * // AMDSMI_EVNT_GRP_XGMI * - * ret = amdsmi_counter_get_available_counters(dv_ind, + * ret = amdsmi_get_gpu_available_counters(dv_ind, * AMDSMI_EVNT_GRP_XGMI, &counters_available); * * // Assuming AMDSMI_EVNT_GRP_XGMI is supported and there is at least 1 @@ -2971,7 +2971,7 @@ amdsmi_gpu_read_counter(amdsmi_event_handle_t evt_handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_counter_get_available_counters(amdsmi_processor_handle processor_handle, + amdsmi_get_gpu_available_counters(amdsmi_processor_handle processor_handle, amdsmi_event_group_t grp, uint32_t *available); /** @} End PerfCntr */ diff --git a/py-interface/README.md b/py-interface/README.md index d5a8b2f4f2..217823592a 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2377,7 +2377,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_counter_get_available_counters +## amdsmi_get_gpu_available_counters Description: Get the number of currently available counters Input parameters: @@ -2387,7 +2387,7 @@ Input parameters: Output: Number of available counters for the given device of the inputted event group -Exceptions that can be thrown by ` amdsmi_counter_get_available_counters` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_available_counters` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2400,7 +2400,7 @@ try: print("No GPUs on machine") else: for device in devices: - available_counters = amdsmi_counter_get_available_counters(device, AmdSmiEventGroup.XGMI) + available_counters = amdsmi_get_gpu_available_counters(device, AmdSmiEventGroup.XGMI) print(available_counters) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index a0dd3bf969..1151cb4684 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -121,7 +121,7 @@ from .amdsmi_interface import amdsmi_gpu_create_counter from .amdsmi_interface import amdsmi_gpu_destroy_counter from .amdsmi_interface import amdsmi_gpu_control_counter from .amdsmi_interface import amdsmi_gpu_read_counter -from .amdsmi_interface import amdsmi_counter_get_available_counters +from .amdsmi_interface import amdsmi_get_gpu_available_counters # # Error Query from .amdsmi_interface import amdsmi_dev_get_gpu_ecc_count diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 5e19b47266..314439ebc0 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1431,7 +1431,7 @@ def amdsmi_gpu_read_counter( } -def amdsmi_counter_get_available_counters( +def amdsmi_get_gpu_available_counters( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, event_group: AmdSmiEventGroup, ) -> int: @@ -1444,7 +1444,7 @@ def amdsmi_counter_get_available_counters( available = ctypes.c_uint32() _check_res( - amdsmi_wrapper. amdsmi_counter_get_available_counters( + amdsmi_wrapper. amdsmi_get_gpu_available_counters( processor_handle, event_group, ctypes.byref(available) ) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 226e9da9b4..9e578fc414 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1604,9 +1604,9 @@ amdsmi_gpu_control_counter.argtypes = [amdsmi_event_handle_t, amdsmi_counter_com amdsmi_gpu_read_counter = _libraries['libamd_smi.so'].amdsmi_gpu_read_counter amdsmi_gpu_read_counter.restype = amdsmi_status_t amdsmi_gpu_read_counter.argtypes = [amdsmi_event_handle_t, ctypes.POINTER(struct_c__SA_amdsmi_counter_value_t)] -amdsmi_counter_get_available_counters = _libraries['libamd_smi.so'].amdsmi_counter_get_available_counters -amdsmi_counter_get_available_counters.restype = amdsmi_status_t -amdsmi_counter_get_available_counters.argtypes = [amdsmi_processor_handle, amdsmi_event_group_t, ctypes.POINTER(ctypes.c_uint32)] +amdsmi_get_gpu_available_counters = _libraries['libamd_smi.so'].amdsmi_get_gpu_available_counters +amdsmi_get_gpu_available_counters.restype = amdsmi_status_t +amdsmi_get_gpu_available_counters.argtypes = [amdsmi_processor_handle, amdsmi_event_group_t, ctypes.POINTER(ctypes.c_uint32)] amdsmi_get_gpu_compute_process_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_compute_process_info amdsmi_get_gpu_compute_process_info.restype = amdsmi_status_t amdsmi_get_gpu_compute_process_info.argtypes = [ctypes.POINTER(struct_c__SA_amdsmi_process_info_t), ctypes.POINTER(ctypes.c_uint32)] @@ -1848,7 +1848,7 @@ __all__ = \ 'amdsmi_container_types_t__enumvalues', 'amdsmi_gpu_control_counter', 'amdsmi_counter_command_t', 'amdsmi_counter_command_t__enumvalues', - 'amdsmi_counter_get_available_counters', 'amdsmi_counter_value_t', + 'amdsmi_get_gpu_available_counters', 'amdsmi_counter_value_t', 'amdsmi_dev_close_supported_func_iterator', 'amdsmi_gpu_counter_group_supported', 'amdsmi_gpu_create_counter', 'amdsmi_gpu_destroy_counter', 'amdsmi_get_busy_percent', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index e18f7dbcf8..5a644ef271 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -345,7 +345,7 @@ class Formatter: | """ + self.style.text("56 Shut down. Api: amdsmi_shut_down ") + """ | | """ + self.style.text("57 Get fw info. Api: amdsmi_get_fw_info ") + """ | | """ + self.style.text("58 Get vbios info. Api: amdsmi_get_gpu_vbios_info ") + """ | - | """ + self.style.text("59 Get counter available counters. Api: amdsmi_counter_get_available_counters ") + """ | + | """ + self.style.text("59 Get counter available counters. Api: amdsmi_get_gpu_available_counters ") + """ | | """ + self.style.text("60 Get counter control. Api: amdsmi_gpu_control_counter ") + """ | | """ + self.style.text("61 Get counter read. Api: amdsmi_gpu_read_counter ") + """ | | """ + self.style.text("62 Set dev clk range. Api: amdsmi_set_gpu_clk_range ") + """ | @@ -582,7 +582,7 @@ def amdsmi_tool_counter_available_counters_get(dev): result = {} for event_group in smi_api.AmdSmiEventGroup: try: - value = smi_api. amdsmi_counter_get_available_counters(dev, event_group) + value = smi_api. amdsmi_get_gpu_available_counters(dev, event_group) result.update({event_group.name: value}) except smi_api.AmdSmiException as e: print("{}:\t{}".format(event_group.name, e)) diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index a0cfb46d93..e9bdad0057 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -727,7 +727,7 @@ amdsmi_gpu_read_counter(amdsmi_event_handle_t evt_handle, } amdsmi_status_t - amdsmi_counter_get_available_counters(amdsmi_processor_handle processor_handle, + amdsmi_get_gpu_available_counters(amdsmi_processor_handle processor_handle, amdsmi_event_group_t grp, uint32_t *available) { return rsmi_wrapper(rsmi_counter_available_counters_get, processor_handle, static_cast(grp), @@ -937,7 +937,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_gpu_clk_freq_set", " amdsmi_set_clk_freq"}, {"rsmi_dev_firmware_version_get", "amdsmi_get_fw_info"}, {"rsmi_dev_ecc_count_get", " amdsmi_dev_get_gpu_ecc_count"}, - {"rsmi_counter_available_counters_get", " amdsmi_counter_get_available_counters"}, + {"rsmi_counter_available_counters_get", " amdsmi_get_gpu_available_counters"}, {"rsmi_dev_power_ave_get", "amdsmi_get_power_ave"}, {"rsmi_dev_power_cap_get", "amdsmi_get_power_cap_info"}, {"rsmi_dev_power_cap_default_get", "amdsmi_get_power_cap_info"}, diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 627eac2922..71eebf63d6 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -298,7 +298,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_pci_replay_counter amdsmi_dev_unique_id_get amdsmi_gpu_create_counter - amdsmi_counter_get_available_counters + amdsmi_get_gpu_available_counters amdsmi_gpu_counter_group_supported amdsmi_get_gpu_memory_reserved_pages amdsmi_dev_xgmi_error_status diff --git a/tests/amd_smi_test/functional/perf_cntr_read_write.cc b/tests/amd_smi_test/functional/perf_cntr_read_write.cc index 0f6a5a1b23..804b462a54 100755 --- a/tests/amd_smi_test/functional/perf_cntr_read_write.cc +++ b/tests/amd_smi_test/functional/perf_cntr_read_write.cc @@ -261,7 +261,7 @@ TestPerfCntrReadWrite::testEventsSimultaneously(amdsmi_processor_handle dv_ind) std::cout << "Testing Event Group " << grp.name() << std::endl; } - ret = amdsmi_counter_get_available_counters(dv_ind, grp.group(), + ret = amdsmi_get_gpu_available_counters(dv_ind, grp.group(), &avail_counters); IF_VERB(STANDARD) { std::cout << "Available Counters: " << avail_counters << std::endl; @@ -311,7 +311,7 @@ TestPerfCntrReadWrite::testEventsSimultaneously(amdsmi_processor_handle dv_ind) nullptr); CHK_ERR_ASRT(ret) - ret = amdsmi_counter_get_available_counters(dv_ind, grp.group(), + ret = amdsmi_get_gpu_available_counters(dv_ind, grp.group(), &tmp_cntrs); CHK_ERR_ASRT(ret) ASSERT_EQ(tmp_cntrs, (avail_counters - j - 1));