From a8d932a9bb9b7f6950aeda421593cefb7f51659c Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 07:43:32 -0500 Subject: [PATCH] Renamed API amdsmi_dev_set_pci_bandwidth to amdsmi_set_gpu_pci_bandwidth grep -rli 'amdsmi_dev_set_pci_bandwidth' * | xargs -i@ sed -i 's/amdsmi_dev_set_pci_bandwidth/amdsmi_set_gpu_pci_bandwidth/g' @ Change-Id: Id4312cfe5fddb63c42c4c6ca0a9a1d94b83f7164 [ROCm/amdsmi commit: 24c0005e15da4728cf938584cd33014134cc1cc6] --- 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 ++-- .../tests/amd_smi_test/functional/mutual_exclusion.cc | 4 ++-- .../tests/amd_smi_test/functional/pci_read_write.cc | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 1f8ec35353..2b76e70218 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -1615,7 +1615,7 @@ amdsmi_status_t amdsmi_get_gpu_pci_replay_counter(amdsmi_processor_handle proce * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_processor_handle processor_handle, uint64_t bw_bitmask); +amdsmi_status_t amdsmi_set_gpu_pci_bandwidth(amdsmi_processor_handle processor_handle, uint64_t bw_bitmask); /** @} End PCIeCont */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 0bc49c36e5..3339b38eef 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1196,7 +1196,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_dev_set_pci_bandwidth +## amdsmi_set_gpu_pci_bandwidth Description: Control the set of allowed PCIe bandwidths that can be used Input parameters: @@ -1206,7 +1206,7 @@ to be enabled (1) and disabled (0) Output: None -Exceptions that can be thrown by ` amdsmi_dev_set_pci_bandwidth` function: +Exceptions that can be thrown by ` amdsmi_set_gpu_pci_bandwidth` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1219,7 +1219,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_set_pci_bandwidth(device, 0) + amdsmi_set_gpu_pci_bandwidth(device, 0) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 1fc05d6f84..43f3844ff8 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -79,7 +79,7 @@ from .amdsmi_interface import amdsmi_next_func_iter from .amdsmi_interface import amdsmi_get_func_iter_value # # Unsupported Functions In Virtual Environment -from .amdsmi_interface import amdsmi_dev_set_pci_bandwidth +from .amdsmi_interface import amdsmi_set_gpu_pci_bandwidth from .amdsmi_interface import amdsmi_dev_set_power_cap from .amdsmi_interface import amdsmi_dev_set_power_profile from .amdsmi_interface import amdsmi_dev_set_clk_range diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index eadcf2d229..33e8f9c795 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1716,7 +1716,7 @@ def amdsmi_get_func_iter_value( } -def amdsmi_dev_set_pci_bandwidth( +def amdsmi_set_gpu_pci_bandwidth( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, bitmask: int ) -> None: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1728,7 +1728,7 @@ def amdsmi_dev_set_pci_bandwidth( raise AmdSmiParameterException(bitmask, int) _check_res( - amdsmi_wrapper. amdsmi_dev_set_pci_bandwidth( + amdsmi_wrapper. amdsmi_set_gpu_pci_bandwidth( processor_handle, ctypes.c_uint64(bitmask) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index da0b2fd063..9d3831a447 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1454,9 +1454,9 @@ amdsmi_get_gpu_pci_throughput.argtypes = [amdsmi_processor_handle, ctypes.POINTE 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] +amdsmi_set_gpu_pci_bandwidth = _libraries['libamd_smi.so'].amdsmi_set_gpu_pci_bandwidth +amdsmi_set_gpu_pci_bandwidth.restype = amdsmi_status_t +amdsmi_set_gpu_pci_bandwidth.argtypes = [amdsmi_processor_handle, uint64_t] amdsmi_dev_get_power_ave = _libraries['libamd_smi.so'].amdsmi_dev_get_power_ave amdsmi_dev_get_power_ave.restype = amdsmi_status_t amdsmi_dev_get_power_ave.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_uint64)] @@ -1879,7 +1879,7 @@ __all__ = \ 'amdsmi_dev_set_od_clk_info', 'amdsmi_dev_set_od_volt_info', 'amdsmi_dev_set_overdrive_level', 'amdsmi_dev_set_overdrive_level_v1', - 'amdsmi_dev_set_pci_bandwidth', 'amdsmi_dev_set_perf_level', + 'amdsmi_set_gpu_pci_bandwidth', 'amdsmi_dev_set_perf_level', 'amdsmi_dev_set_perf_level_v1', 'amdsmi_dev_set_power_cap', 'amdsmi_dev_set_power_profile', 'amdsmi_dev_xgmi_error_status', 'amdsmi_processor_handle', 'amdsmi_engine_usage_t', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 7319b987b1..16bbd483b8 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -358,7 +358,7 @@ class Formatter: | """ + self.style.text("69 Set dev od volt info. Api: amdsmi_dev_set_od_volt_info ") + """| | """ + self.style.text("70 Set dev overdrive level. Api: amdsmi_dev_set_overdrive_level ") + """ | | """ + self.style.text("71 Set v1 dev overdrive level. Api: amdsmi_dev_set_overdrive_level_v1 ") + """ | - | """ + self.style.text("72 Set dev pci bandwidth. Api: amdsmi_dev_set_pci_bandwidth ") + """ | + | """ + self.style.text("72 Set dev pci bandwidth. Api: amdsmi_set_gpu_pci_bandwidth ") + """ | | """ + self.style.text("73 Set dev perf level. Api: amdsmi_dev_set_perf_level ") + """ | | """ + self.style.text("74 Set dev perf level v1. Api: amdsmi_dev_set_perf_level_v1 ") + """ | | """ + self.style.text("75 Set dev power cap. Api: amdsmi_dev_set_power_cap ") + """ | @@ -486,7 +486,7 @@ def amdsmi_tool_dev_overdrive_level_set_v1(dev, dic): def amdsmi_tool_dev_pci_bandwidth_set(dev, dic): bitmask = dic["bitmask"] - return smi_api. amdsmi_dev_set_pci_bandwidth(dev, bitmask) + return smi_api. amdsmi_set_gpu_pci_bandwidth(dev, bitmask) def amdsmi_tool_dev_gpu_clk_freq_get(dev): diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 597a89d82d..7785b640ff 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -905,7 +905,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"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_get_gpu_pci_replay_counter"}, - {"rsmi_dev_pci_bandwidth_set", " amdsmi_dev_set_pci_bandwidth"}, + {"rsmi_dev_pci_bandwidth_set", " amdsmi_set_gpu_pci_bandwidth"}, {"rsmi_dev_power_profile_set", " amdsmi_dev_set_power_profile"}, {"rsmi_dev_memory_busy_percent_get", "amdsmi_dev_get_memory_busy_percent"}, {"rsmi_dev_busy_percent_get", "amdsmi_dev_get_busy_percent"}, @@ -1189,7 +1189,7 @@ amdsmi_status_t static_cast(perf_lvl)); } -amdsmi_status_t amdsmi_dev_set_pci_bandwidth(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_set_gpu_pci_bandwidth(amdsmi_processor_handle processor_handle, uint64_t bw_bitmask) { return rsmi_wrapper(rsmi_dev_pci_bandwidth_set, processor_handle, bw_bitmask); 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 a001b77e2d..ecea990b48 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -221,7 +221,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); 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); + ret = amdsmi_set_gpu_pci_bandwidth(processor_handles_[0], 0); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_fan_rpms(processor_handles_[0], dmy_ui32, &dmy_i64); CHECK_RET(ret, AMDSMI_STATUS_BUSY); @@ -270,7 +270,7 @@ void TestMutualExclusion::Run(void) { amdsmi_get_gpu_drm_render_minor amdsmi_get_gpu_vendor_name amdsmi_get_gpu_pci_bandwidth - amdsmi_dev_set_pci_bandwidth + amdsmi_set_gpu_pci_bandwidth amdsmi_get_gpu_pci_throughput amdsmi_dev_get_temp_metric amdsmi_dev_get_volt_metric diff --git a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc index 4ec684b790..ffc0b26b66 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/pci_read_write.cc @@ -182,7 +182,7 @@ void TestPciReadWrite::Run(void) { std::cout << "\tSetting bandwidth mask to " << "0b" << freq_bm_str << " ..." << std::endl; } - ret = amdsmi_dev_set_pci_bandwidth(processor_handles_[dv_ind], freq_bitmask); + ret = amdsmi_set_gpu_pci_bandwidth(processor_handles_[dv_ind], freq_bitmask); CHK_ERR_ASRT(ret) ret = amdsmi_get_gpu_pci_bandwidth(processor_handles_[dv_ind], &bw); @@ -193,7 +193,7 @@ void TestPciReadWrite::Run(void) { std::endl; std::cout << "\tResetting mask to all bandwidths." << std::endl; } - ret = amdsmi_dev_set_pci_bandwidth(processor_handles_[dv_ind], 0xFFFFFFFF); + ret = amdsmi_set_gpu_pci_bandwidth(processor_handles_[dv_ind], 0xFFFFFFFF); CHK_ERR_ASRT(ret) ret = amdsmi_dev_set_perf_level(processor_handles_[dv_ind], AMDSMI_DEV_PERF_LEVEL_AUTO);