From 4347ad6a0ca65dfe35ecf04bf2d56c1688b5cb57 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:29:02 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_ecc_enabled to amdsmi_dev_get_gpu_ecc_enabled grep -rli 'amdsmi_dev_get_ecc_enabled' * | xargs -i@ sed -i 's/amdsmi_dev_get_ecc_enabled/amdsmi_dev_get_gpu_ecc_enabled/g' @ Change-Id: I8cb31a2fc4128758a3545e1d17f743a6eff152a0 --- 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/err_cnt_read.cc | 6 +++--- tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 6ee1af9f78..3ff5e536e9 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -2706,7 +2706,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_ecc_count(amdsmi_processor_handle processor_ * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ -amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_dev_get_gpu_ecc_enabled(amdsmi_processor_handle processor_handle, uint64_t *enabled_blocks); /** diff --git a/py-interface/README.md b/py-interface/README.md index 4874ea24d7..9ca68d834e 100644 --- a/py-interface/README.md +++ b/py-interface/README.md @@ -2664,7 +2664,7 @@ except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_ecc_enabled +## amdsmi_dev_get_gpu_ecc_enabled Description: Retrieve the enabled ECC bit-mask Input parameters: @@ -2672,7 +2672,7 @@ Input parameters: Output: Enabled ECC bit-mask -Exceptions that can be thrown by ` amdsmi_dev_get_ecc_enabled` function: +Exceptions that can be thrown by ` amdsmi_dev_get_gpu_ecc_enabled` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2685,7 +2685,7 @@ try: print("No GPUs on machine") else: for device in devices: - enabled = amdsmi_dev_get_ecc_enabled(device) + enabled = amdsmi_dev_get_gpu_ecc_enabled(device) print(enabled) except AmdSmiException as e: print(e) diff --git a/py-interface/__init__.py b/py-interface/__init__.py index 171e721a9b..b111102b29 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -125,7 +125,7 @@ from .amdsmi_interface import amdsmi_counter_get_available_counters # # Error Query from .amdsmi_interface import amdsmi_dev_get_gpu_ecc_count -from .amdsmi_interface import amdsmi_dev_get_ecc_enabled +from .amdsmi_interface import amdsmi_dev_get_gpu_ecc_enabled from .amdsmi_interface import amdsmi_dev_get_ecc_status from .amdsmi_interface import amdsmi_status_string diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 19c8de8bb5..10721fbe5e 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -2485,7 +2485,7 @@ def amdsmi_dev_get_gpu_ecc_count( } -def amdsmi_dev_get_ecc_enabled( +def amdsmi_dev_get_gpu_ecc_enabled( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> int: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2495,7 +2495,7 @@ def amdsmi_dev_get_ecc_enabled( blocks = ctypes.c_uint64(0) _check_res( - amdsmi_wrapper. amdsmi_dev_get_ecc_enabled( + amdsmi_wrapper. amdsmi_dev_get_gpu_ecc_enabled( processor_handle, ctypes.byref(blocks)) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 6fb1c1cd12..7560192c51 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1580,9 +1580,9 @@ amdsmi_get_version_str.argtypes = [amdsmi_sw_component_t, ctypes.POINTER(ctypes. amdsmi_dev_get_gpu_ecc_count = _libraries['libamd_smi.so'].amdsmi_dev_get_gpu_ecc_count amdsmi_dev_get_gpu_ecc_count.restype = amdsmi_status_t amdsmi_dev_get_gpu_ecc_count.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(struct_c__SA_amdsmi_error_count_t)] -amdsmi_dev_get_ecc_enabled = _libraries['libamd_smi.so'].amdsmi_dev_get_ecc_enabled -amdsmi_dev_get_ecc_enabled.restype = amdsmi_status_t -amdsmi_dev_get_ecc_enabled.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] +amdsmi_dev_get_gpu_ecc_enabled = _libraries['libamd_smi.so'].amdsmi_dev_get_gpu_ecc_enabled +amdsmi_dev_get_gpu_ecc_enabled.restype = amdsmi_status_t +amdsmi_dev_get_gpu_ecc_enabled.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint64)] amdsmi_dev_get_ecc_status = _libraries['libamd_smi.so'].amdsmi_dev_get_ecc_status amdsmi_dev_get_ecc_status.restype = amdsmi_status_t amdsmi_dev_get_ecc_status.argtypes = [amdsmi_processor_handle, amdsmi_gpu_block_t, ctypes.POINTER(c__EA_amdsmi_ras_err_state_t)] @@ -1853,7 +1853,7 @@ __all__ = \ 'amdsmi_dev_counter_group_supported', 'amdsmi_dev_create_counter', 'amdsmi_dev_destroy_counter', 'amdsmi_get_busy_percent', 'amdsmi_get_gpu_drm_render_minor', 'amdsmi_dev_get_gpu_ecc_count', - 'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status', + 'amdsmi_dev_get_gpu_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_get_gpu_metrics_info', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 4dff80901d..1fea97ba02 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -322,7 +322,7 @@ class Formatter: | """ + self.style.text("33 Get the build version. Api: amdsmi_get_version ") + """ | | """ + self.style.text("34 Get version string. Api: amdsmi_get_version_str ") + """ | | """ + self.style.text("35 Get device ecc counter. Api: amdsmi_dev_get_gpu_ecc_count ") + """ | - | """ + self.style.text("36 Get device ecc enable. Api: amdsmi_dev_get_ecc_enabled ") + """ | + | """ + self.style.text("36 Get device ecc enable. Api: amdsmi_dev_get_gpu_ecc_enabled ") + """ | | """ + self.style.text("37 Get device ecc status. Api: amdsmi_dev_get_ecc_status ") + """ | | """ + self.style.text("38 Get status string. Api: amdsmi_status_string ") + """ | | """ + self.style.text("39 Get compute process info. Api: amdsmi_get_compute_process_info ") + """ | @@ -830,7 +830,7 @@ commands = { 35: [amdsmi_tool_dev_ecc_count_get, { "device_identifier1": [None, True] }], - 36: [smi_api. amdsmi_dev_get_ecc_enabled, { + 36: [smi_api. amdsmi_dev_get_gpu_ecc_enabled, { "device_identifier1": [None, True] }], 37: [amdsmi_tool_dev_ecc_status_get, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index 6f22455f71..d6f28ac345 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -921,7 +921,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_od_volt_info_get", " amdsmi_dev_get_od_volt_info"}, {"rsmi_dev_od_volt_info_set", " amdsmi_dev_set_od_volt_info"}, {"rsmi_dev_od_volt_curve_regions_get", " amdsmi_dev_get_od_volt_curve_regions"}, - {"rsmi_dev_ecc_enabled_get", " amdsmi_dev_get_ecc_enabled"}, + {"rsmi_dev_ecc_enabled_get", " amdsmi_dev_get_gpu_ecc_enabled"}, {"rsmi_dev_ecc_status_get", " amdsmi_dev_get_ecc_status"}, {"rsmi_dev_counter_group_supported", "amdsmi_dev_counter_group_supported"}, {"rsmi_dev_counter_create", "amdsmi_dev_create_counter"}, @@ -1018,7 +1018,7 @@ amdsmi_status_t amdsmi_dev_get_gpu_ecc_count(amdsmi_processor_handle processor_ static_cast(block), reinterpret_cast(ec)); } -amdsmi_status_t amdsmi_dev_get_ecc_enabled(amdsmi_processor_handle processor_handle, +amdsmi_status_t amdsmi_dev_get_gpu_ecc_enabled(amdsmi_processor_handle processor_handle, uint64_t *enabled_blocks) { AMDSMI_CHECK_INIT(); diff --git a/tests/amd_smi_test/functional/err_cnt_read.cc b/tests/amd_smi_test/functional/err_cnt_read.cc index 2ff4630459..82ee0d6a48 100755 --- a/tests/amd_smi_test/functional/err_cnt_read.cc +++ b/tests/amd_smi_test/functional/err_cnt_read.cc @@ -100,7 +100,7 @@ void TestErrCntRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); - err = amdsmi_dev_get_ecc_enabled(processor_handles_[i], &enabled_mask); + err = amdsmi_dev_get_gpu_ecc_enabled(processor_handles_[i], &enabled_mask); if (err == AMDSMI_STATUS_NOT_SUPPORTED) { IF_VERB(STANDARD) { std::cout << @@ -108,7 +108,7 @@ void TestErrCntRead::Run(void) { << std::endl; } // Verify api support checking functionality is working - err = amdsmi_dev_get_ecc_enabled(processor_handles_[i], nullptr); + err = amdsmi_dev_get_gpu_ecc_enabled(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); continue; @@ -116,7 +116,7 @@ void TestErrCntRead::Run(void) { CHK_ERR_ASRT(err) // Verify api support checking functionality is working - err = amdsmi_dev_get_ecc_enabled(processor_handles_[i], nullptr); + err = amdsmi_dev_get_gpu_ecc_enabled(processor_handles_[i], nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); IF_VERB(STANDARD) { diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index 021caa3372..b64114b09e 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -251,7 +251,7 @@ void TestMutualExclusion::Run(void) { CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_gpu_ecc_count(processor_handles_[0], AMDSMI_GPU_BLOCK_UMC, &dmy_err_cnt); CHECK_RET(ret, AMDSMI_STATUS_BUSY); - ret = amdsmi_dev_get_ecc_enabled(processor_handles_[0], &dmy_ui64); + ret = amdsmi_dev_get_gpu_ecc_enabled(processor_handles_[0], &dmy_ui64); CHECK_RET(ret, AMDSMI_STATUS_BUSY); ret = amdsmi_dev_get_ecc_status(processor_handles_[0], AMDSMI_GPU_BLOCK_UMC, &dmy_ras_err_st); CHECK_RET(ret, AMDSMI_STATUS_BUSY);