From d8e22b9687d61881a4ca247cd0a783341992c7a2 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:41:03 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_pci_replay_counter to amdsmi_get_gpu_pci_replay_counter grep -rli 'amdsmi_dev_get_pci_replay_counter' * | xargs -i@ sed -i 's/amdsmi_dev_get_pci_replay_counter/amdsmi_get_gpu_pci_replay_counter/g' @ Change-Id: Ic6ad26e35cb6cf73f87a71d39abf38d3afac4be4 --- 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/mutual_exclusion.cc | 4 ++-- tests/amd_smi_test/functional/pci_read_write.cc | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 99dabc3bae..1f8ec35353 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -1575,7 +1575,7 @@ amdsmi_status_t amdsmi_get_gpu_pci_throughput(amdsmi_processor_handle processor_ * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_pci_replay_counter(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_pci_replay_counter(amdsmi_processor_handle processor_handle, uint64_t *counter); /** @} End PCIeQuer */ diff --git a/py-interface/README.md b/py-interface/README.md index e825bba770..0bc49c36e5 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -1431,7 +1431,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_pci_replay_counter +## amdsmi_get_gpu_pci_replay_counter Description: Get PCIe replay counter @@ -1442,7 +1442,7 @@ Input parameters: Output: counter value The sum of the NAK's received and generated by the GPU -Exceptions that can be thrown by ` amdsmi_dev_get_pci_replay_counter` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_pci_replay_counter` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1455,7 +1455,7 @@ try: print("No GPUs on machine") else: for device in devices: - counter = amdsmi_dev_get_pci_replay_counter(device) + counter = amdsmi_get_gpu_pci_replay_counter(device) print(counter) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 123d16c1a7..1fc05d6f84 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -140,7 +140,7 @@ from .amdsmi_interface import amdsmi_dev_reset_xgmi_error from .amdsmi_interface import amdsmi_get_gpu_pci_id from .amdsmi_interface import amdsmi_get_gpu_pci_bandwidth from .amdsmi_interface import amdsmi_get_gpu_pci_throughput -from .amdsmi_interface import amdsmi_dev_get_pci_replay_counter +from .amdsmi_interface import amdsmi_get_gpu_pci_replay_counter from .amdsmi_interface import amdsmi_get_gpu_topo_numa_affinity # # Power information diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 3fc1dd33aa..eadcf2d229 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -1785,7 +1785,7 @@ def amdsmi_get_gpu_pci_throughput(processor_handle: amdsmi_wrapper.amdsmi_proces } -def amdsmi_dev_get_pci_replay_counter(processor_handle: amdsmi_wrapper.amdsmi_processor_handle): +def amdsmi_get_gpu_pci_replay_counter(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 @@ -1794,7 +1794,7 @@ def amdsmi_dev_get_pci_replay_counter(processor_handle: amdsmi_wrapper.amdsmi_pr counter = ctypes.c_uint64() _check_res( - amdsmi_wrapper. amdsmi_dev_get_pci_replay_counter( + amdsmi_wrapper. amdsmi_get_gpu_pci_replay_counter( processor_handle, ctypes.byref(counter)) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 1e0e282d71..da0b2fd063 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1451,9 +1451,9 @@ amdsmi_get_gpu_topo_numa_affinity.argtypes = [amdsmi_processor_handle, ctypes.PO amdsmi_get_gpu_pci_throughput = _libraries['libamd_smi.so'].amdsmi_get_gpu_pci_throughput amdsmi_get_gpu_pci_throughput.restype = amdsmi_status_t amdsmi_get_gpu_pci_throughput.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64), ctypes.POINTER(ctypes.c_uint64)] -amdsmi_dev_get_pci_replay_counter = _libraries['libamd_smi.so'].amdsmi_dev_get_pci_replay_counter -amdsmi_dev_get_pci_replay_counter.restype = amdsmi_status_t -amdsmi_dev_get_pci_replay_counter.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_get_gpu_pci_replay_counter = _libraries['libamd_smi.so'].amdsmi_get_gpu_pci_replay_counter +amdsmi_get_gpu_pci_replay_counter.restype = amdsmi_status_t +amdsmi_get_gpu_pci_replay_counter.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_set_pci_bandwidth = _libraries['libamd_smi.so'].amdsmi_dev_set_pci_bandwidth amdsmi_dev_set_pci_bandwidth.restype = amdsmi_status_t amdsmi_dev_set_pci_bandwidth.argtypes = [amdsmi_processor_handle, uint64_t] @@ -1863,7 +1863,7 @@ __all__ = \ 'amdsmi_dev_get_od_volt_curve_regions', 'amdsmi_dev_get_od_volt_info', 'amdsmi_dev_get_overdrive_level', 'amdsmi_get_gpu_pci_bandwidth', 'amdsmi_get_gpu_pci_id', - 'amdsmi_dev_get_pci_replay_counter', + 'amdsmi_get_gpu_pci_replay_counter', 'amdsmi_get_gpu_pci_throughput', 'amdsmi_dev_get_perf_level', 'amdsmi_dev_get_power_ave', 'amdsmi_dev_get_power_profile_presets', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 1be7241e5a..7319b987b1 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -296,7 +296,7 @@ class Formatter: | """ + self.style.text(" 7 Get device pci id. Api: amdsmi_get_gpu_pci_id ") + """ | | """ + self.style.text(" 8 Get device pci bandwidth. Api: amdsmi_get_gpu_pci_bandwidth ") + """ | | """ + self.style.text(" 9 Get device pci throughput. Api: amdsmi_get_gpu_pci_throughput ") + """ | - | """ + self.style.text("10 Get device pci replay counter. Api: amdsmi_dev_get_pci_replay_counter ") + """ | + | """ + self.style.text("10 Get device pci replay counter. Api: amdsmi_get_gpu_pci_replay_counter ") + """ | | """ + self.style.text("11 Get topo numa affinity. Api: amdsmi_get_gpu_topo_numa_affinity ") + """ | | """ + self.style.text("12 Get device power ave. Api: amdsmi_dev_get_power_ave ") + """ | | """ + self.style.text("13 Get device energy count. Api: amdsmi_dev_get_energy_count ") + """ | @@ -749,7 +749,7 @@ commands = { 9: [smi_api.amdsmi_get_gpu_pci_throughput, { "device_identifier1": [None, True] }], - 10: [smi_api. amdsmi_dev_get_pci_replay_counter, { + 10: [smi_api. amdsmi_get_gpu_pci_replay_counter, { "device_identifier1": [None, True] }], 11: [smi_api.amdsmi_get_gpu_topo_numa_affinity, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 4e2ffd9902..597a89d82d 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -904,7 +904,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_pci_bandwidth_get", "amdsmi_get_gpu_pci_bandwidth"}, {"rsmi_dev_pci_id_get", "amdsmi_get_gpu_pci_id"}, {"rsmi_dev_pci_throughput_get", "amdsmi_get_gpu_pci_throughput"}, - {"rsmi_dev_pci_replay_counter_get", " amdsmi_dev_get_pci_replay_counter"}, + {"rsmi_dev_pci_replay_counter_get", " amdsmi_get_gpu_pci_replay_counter"}, {"rsmi_dev_pci_bandwidth_set", " amdsmi_dev_set_pci_bandwidth"}, {"rsmi_dev_power_profile_set", " amdsmi_dev_set_power_profile"}, {"rsmi_dev_memory_busy_percent_get", "amdsmi_dev_get_memory_busy_percent"}, @@ -1290,7 +1290,7 @@ amdsmi_status_t amdsmi_dev_set_overdrive_level( amdsmi_processor_handle processor_handle, uint32_t od) { return rsmi_wrapper(rsmi_dev_overdrive_level_set, processor_handle, od); } -amdsmi_status_t amdsmi_dev_get_pci_replay_counter( +amdsmi_status_t amdsmi_get_gpu_pci_replay_counter( amdsmi_processor_handle processor_handle, uint64_t *counter) { return rsmi_wrapper(rsmi_dev_pci_replay_counter_get, processor_handle, counter); diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index cc1a5309d9..a001b77e2d 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -219,7 +219,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_get_gpu_pci_throughput(processor_handles_[0], &dmy_ui64, &dmy_ui64, &dmy_ui64); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_get_pci_replay_counter(processor_handles_[0], &dmy_ui64); + ret = amdsmi_get_gpu_pci_replay_counter(processor_handles_[0], &dmy_ui64); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_set_pci_bandwidth(processor_handles_[0], 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); @@ -295,7 +295,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_get_busy_percent amdsmi_dev_vbios_version_get amdsmi_dev_serial_number_get - amdsmi_dev_get_pci_replay_counter + amdsmi_get_gpu_pci_replay_counter amdsmi_dev_unique_id_get amdsmi_dev_create_counter amdsmi_counter_get_available_counters diff --git a/tests/amd_smi_test/functional/pci_read_write.cc b/tests/amd_smi_test/functional/pci_read_write.cc index 16f7122a53..4ec684b790 100755 --- a/tests/amd_smi_test/functional/pci_read_write.cc +++ b/tests/amd_smi_test/functional/pci_read_write.cc @@ -100,15 +100,15 @@ void TestPciReadWrite::Run(void) { for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { PrintDeviceHeader(processor_handles_[dv_ind]); - ret = amdsmi_dev_get_pci_replay_counter(processor_handles_[dv_ind], &u64int); + ret = amdsmi_get_gpu_pci_replay_counter(processor_handles_[dv_ind], &u64int); if (ret == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << - "\t** amdsmi_dev_get_pci_replay_counter() is not supported" + "\t** amdsmi_get_gpu_pci_replay_counter() is not supported" " on this machine" << std::endl; // Verify api support checking functionality is working - ret = amdsmi_dev_get_pci_replay_counter(processor_handles_[dv_ind], nullptr); + ret = amdsmi_get_gpu_pci_replay_counter(processor_handles_[dv_ind], nullptr); ASSERT_EQ(ret, AMDSMI_STATUS_NOT_SUPPORTED); } else { CHK_ERR_ASRT(ret) @@ -116,7 +116,7 @@ void TestPciReadWrite::Run(void) { std::cout << "\tPCIe Replay Counter: " << u64int << std::endl; } // Verify api support checking functionality is working - ret = amdsmi_dev_get_pci_replay_counter(processor_handles_[dv_ind], nullptr); + ret = amdsmi_get_gpu_pci_replay_counter(processor_handles_[dv_ind], nullptr); ASSERT_EQ(ret, AMDSMI_STATUS_INVAL); }