From 75a1305080803aa62add484b9d430a2dc9fa11f6 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:01:17 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_gpu_metrics_info to amdsmi_get_gpu_metrics_info grep -rli 'amdsmi_dev_get_gpu_metrics_info' * | xargs -i@ sed -i 's/amdsmi_dev_get_gpu_metrics_info/amdsmi_get_gpu_metrics_info/g' @ Change-Id: Ic4d8095fcfc5f2f5419211bb7155a6bd7116ed29 [ROCm/amdsmi commit: f95a63f21692fc38da9a6fea10afc62dd54b73cf] --- projects/amdsmi/include/amd_smi/amdsmi.h | 2 +- projects/amdsmi/py-interface/README.md | 6 +++--- projects/amdsmi/py-interface/__init__.py | 2 +- .../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 | 18 +++++++++--------- .../functional/gpu_metrics_read.cc | 4 ++-- .../functional/mutual_exclusion.cc | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index e1fbfd8f6e..d6146adb46 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -2291,7 +2291,7 @@ amdsmi_status_t amdsmi_dev_get_od_volt_info(amdsmi_processor_handle processor_h * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_gpu_metrics_info(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_get_gpu_metrics_info(amdsmi_processor_handle processor_handle, amdsmi_gpu_metrics_t *pgpu_metrics); /** diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index fc2b0a44b5..72f3b45f1a 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2106,7 +2106,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_gpu_metrics_info +## amdsmi_get_gpu_metrics_info Description: This function retrieves the gpu metrics information Input parameters: @@ -2151,7 +2151,7 @@ Field | Description `mem_actvity_acc` | mem activity acc `temperature_hbm` | hbm temperature -Exceptions that can be thrown by ` amdsmi_dev_get_gpu_metrics_info` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_metrics_info` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2164,7 +2164,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_get_gpu_metrics_info(dev) + amdsmi_get_gpu_metrics_info(dev) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 1950ffafcf..3e8626c28f 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -111,7 +111,7 @@ from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode from .amdsmi_interface import amdsmi_dev_get_overdrive_level from .amdsmi_interface import amdsmi_get_clk_freq from .amdsmi_interface import amdsmi_dev_get_od_volt_info -from .amdsmi_interface import amdsmi_dev_get_gpu_metrics_info +from .amdsmi_interface import amdsmi_get_gpu_metrics_info from .amdsmi_interface import amdsmi_dev_get_od_volt_curve_regions from .amdsmi_interface import amdsmi_dev_get_power_profile_presets diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 52317f99de..12363de08c 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -2346,7 +2346,7 @@ def amdsmi_dev_get_od_volt_info( } -def amdsmi_dev_get_gpu_metrics_info( +def amdsmi_get_gpu_metrics_info( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2356,7 +2356,7 @@ def amdsmi_dev_get_gpu_metrics_info( gpu_metrics = amdsmi_wrapper.amdsmi_gpu_metrics_t() _check_res( - amdsmi_wrapper. amdsmi_dev_get_gpu_metrics_info( + amdsmi_wrapper. amdsmi_get_gpu_metrics_info( processor_handle, ctypes.byref(gpu_metrics) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index b558cd11b4..43757b11f8 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1538,9 +1538,9 @@ amdsmi_reset_gpu.argtypes = [amdsmi_processor_handle] amdsmi_dev_get_od_volt_info = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_info amdsmi_dev_get_od_volt_info.restype = amdsmi_status_t amdsmi_dev_get_od_volt_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_od_volt_freq_data_t)] -amdsmi_dev_get_gpu_metrics_info = _libraries['libamd_smi.so'].amdsmi_dev_get_gpu_metrics_info -amdsmi_dev_get_gpu_metrics_info.restype = amdsmi_status_t -amdsmi_dev_get_gpu_metrics_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_metrics_t)] +amdsmi_get_gpu_metrics_info = _libraries['libamd_smi.so'].amdsmi_get_gpu_metrics_info +amdsmi_get_gpu_metrics_info.restype = amdsmi_status_t +amdsmi_get_gpu_metrics_info.argtypes = [amdsmi_processor_handle, ctypes.POINTER(struct_c__SA_amdsmi_gpu_metrics_t)] amdsmi_set_gpu_clk_range = _libraries['libamd_smi.so'].amdsmi_set_gpu_clk_range amdsmi_set_gpu_clk_range.restype = amdsmi_status_t amdsmi_set_gpu_clk_range.argtypes = [amdsmi_processor_handle, uint64_t, uint64_t, amdsmi_clk_type_t] @@ -1856,7 +1856,7 @@ __all__ = \ 'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status', 'amdsmi_get_energy_count', 'amdsmi_get_gpu_fan_rpms', 'amdsmi_get_gpu_fan_speed', 'amdsmi_get_gpu_fan_speed_max', - 'amdsmi_get_clk_freq', 'amdsmi_dev_get_gpu_metrics_info', + 'amdsmi_get_clk_freq', 'amdsmi_get_gpu_metrics_info', 'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent', 'amdsmi_get_gpu_memory_reserved_pages', 'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 151bad01b4..5ccc0a6ae5 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -316,7 +316,7 @@ class Formatter: | """ + self.style.text("27 Get device overdrive level. Api: amdsmi_dev_get_overdrive_level ") + """ | | """ + self.style.text("28 Get device gpu clk freq. Api: amdsmi_get_clk_freq ") + """ | | """ + self.style.text("29 Get device od volt. Api: amdsmi_dev_get_od_volt_info ") + """ | - | """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_dev_get_gpu_metrics_info ") + """ | + | """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_get_gpu_metrics_info ") + """ | | """ + self.style.text("31 Get device od volt curve regions. Api: amdsmi_dev_get_od_volt_curve_regions ") + """ | | """ + self.style.text("32 Get device power profile presets. Api: amdsmi_dev_get_power_profile_presets ") + """ | | """ + self.style.text("33 Get the build version. Api: amdsmi_get_version ") + """ | @@ -814,7 +814,7 @@ commands = { 29: [smi_api. amdsmi_dev_get_od_volt_info, { "device_identifier1": [None, True] }], - 30: [smi_api. amdsmi_dev_get_gpu_metrics_info, { + 30: [smi_api. amdsmi_get_gpu_metrics_info, { "device_identifier1": [None, True] }], 31: [amdsmi_tool_dev_od_volt_curve_regions_get, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index 4636c06424..a1fd6550ab 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -332,7 +332,7 @@ amdsmi_status_t amdsmi_get_temp_metric(amdsmi_processor_handle processor_handle // Get the PLX temperature from the gpu_metrics if (sensor_type == TEMPERATURE_TYPE_PLX) { amdsmi_gpu_metrics_t metric_info; - auto r_status = amdsmi_dev_get_gpu_metrics_info( + auto r_status = amdsmi_get_gpu_metrics_info( processor_handle, &metric_info); if (r_status != AMDSMI_STATUS_SUCCESS) return r_status; @@ -929,7 +929,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_xgmi_error_reset", "amdsmi_dev_reset_xgmi_error"}, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, {"rsmi_topo_numa_affinity_get", "amdsmi_get_gpu_topo_numa_affinity"}, - {"rsmi_dev_gpu_metrics_info_get", " amdsmi_dev_get_gpu_metrics_info"}, + {"rsmi_dev_gpu_metrics_info_get", " amdsmi_get_gpu_metrics_info"}, {"rsmi_dev_gpu_reset", "amdsmi_reset_gpu"}, {"rsmi_dev_memory_total_get", "amdsmi_get_gpu_memory_total"}, {"rsmi_dev_memory_usage_get", "amdsmi_get_gpu_memory_usage"}, @@ -1049,7 +1049,7 @@ amdsmi_get_busy_percent(amdsmi_processor_handle processor_handle, return rsmi_wrapper(rsmi_dev_busy_percent_get, processor_handle, busy_percent); } -amdsmi_status_t amdsmi_dev_get_gpu_metrics_info( +amdsmi_status_t amdsmi_get_gpu_metrics_info( amdsmi_processor_handle processor_handle, amdsmi_gpu_metrics_t *pgpu_metrics) { AMDSMI_CHECK_INIT(); @@ -1215,7 +1215,7 @@ amdsmi_status_t amdsmi_get_clk_freq(amdsmi_processor_handle processor_handle, clk_type == CLK_TYPE_DCLK0 || clk_type == CLK_TYPE_DCLK1 ) { amdsmi_gpu_metrics_t metric_info; - auto r_status = amdsmi_dev_get_gpu_metrics_info( + auto r_status = amdsmi_get_gpu_metrics_info( processor_handle, &metric_info); if (r_status != AMDSMI_STATUS_SUCCESS) return r_status; @@ -1480,7 +1480,7 @@ amdsmi_get_gpu_activity(amdsmi_processor_handle processor_handle, amdsmi_engine_ if (r != AMDSMI_STATUS_SUCCESS) return r; amdsmi_status_t status; - status = amdsmi_dev_get_gpu_metrics_info(processor_handle, &metrics); + status = amdsmi_get_gpu_metrics_info(processor_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1510,7 +1510,7 @@ amdsmi_get_clock_measure(amdsmi_processor_handle processor_handle, amdsmi_clk_ty return r; amdsmi_status_t status; - status = amdsmi_dev_get_gpu_metrics_info(processor_handle, &metrics); + status = amdsmi_get_gpu_metrics_info(processor_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1713,7 +1713,7 @@ amdsmi_get_power_measure(amdsmi_processor_handle processor_handle, amdsmi_power_ amdsmi_status_t status; - status = amdsmi_dev_get_gpu_metrics_info(processor_handle, &metrics); + status = amdsmi_get_gpu_metrics_info(processor_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1757,7 +1757,7 @@ amdsmi_get_target_frequency_range(amdsmi_processor_handle processor_handle, amds amdsmi_status_t status; int min = 0, max = 0; - status = amdsmi_dev_get_gpu_metrics_info(processor_handle, &metrics); + status = amdsmi_get_gpu_metrics_info(processor_handle, &metrics); if (status != AMDSMI_STATUS_SUCCESS) { return status; } @@ -1866,7 +1866,7 @@ amdsmi_get_pcie_link_status(amdsmi_processor_handle processor_handle, amdsmi_pci } amdsmi_status_t status = AMDSMI_STATUS_SUCCESS; amdsmi_gpu_metrics_t metric_info = {}; - status = amdsmi_dev_get_gpu_metrics_info( + status = amdsmi_get_gpu_metrics_info( processor_handle, &metric_info); if (status != AMDSMI_STATUS_SUCCESS) return status; diff --git a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc index 0f485ff910..4bfadfca10 100644 --- a/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/gpu_metrics_read.cc @@ -103,7 +103,7 @@ void TestGpuMetricsRead::Run(void) { std::cout << "\t**GPU METRICS:\n"; } amdsmi_gpu_metrics_t smu; - err = amdsmi_dev_get_gpu_metrics_info(processor_handles_[i], &smu); + err = amdsmi_get_gpu_metrics_info(processor_handles_[i], &smu); if (err != AMDSMI_STATUS_SUCCESS) { if (err == AMDSMI_STATUS_NOT_SUPPORTED) { IF_VERB(STANDARD) { @@ -188,7 +188,7 @@ void TestGpuMetricsRead::Run(void) { } // Verify api support checking functionality is working - err = amdsmi_dev_get_gpu_metrics_info(processor_handles_[i], nullptr); + err = amdsmi_get_gpu_metrics_info(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } } 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 5eddc93e6f..62feb84d1a 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -280,7 +280,7 @@ void TestMutualExclusion::Run(void) { amdsmi_set_gpu_fan_speed amdsmi_get_gpu_fan_speed_max amdsmi_dev_get_od_volt_info - amdsmi_dev_get_gpu_metrics_info + amdsmi_get_gpu_metrics_info amdsmi_dev_get_od_volt_curve_regions amdsmi_dev_power_max_get amdsmi_get_power_ave