From a248959ad9093bdd0eeafd7ffacb1bc2640ae1e5 Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Sat, 25 Feb 2023 08:11:53 -0500 Subject: [PATCH] Renamed API amdsmi_dev_get_memory_reserved_pages to amdsmi_get_gpu_memory_reserved_pages grep -rli 'amdsmi_dev_get_memory_reserved_pages' * | xargs -i@ sed -i 's/amdsmi_dev_get_memory_reserved_pages/amdsmi_get_gpu_memory_reserved_pages/g' @ Change-Id: I1b17fe4540f39c820b9e3e8102440cc91a27ee16 --- include/amd_smi/amdsmi.h | 2 +- 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 | 6 +++--- tests/amd_smi_test/functional/mem_page_info_read.cc | 8 ++++---- tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 95d01d032a..8da0f7d383 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -1878,7 +1878,7 @@ amdsmi_get_gpu_memory_busy_percent(amdsmi_processor_handle processor_handle, uin * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages(amdsmi_processor_handle processor_handle, uint32_t *num_pages, +amdsmi_get_gpu_memory_reserved_pages(amdsmi_processor_handle processor_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *records); /** @} End MemQuer */ diff --git a/py-interface/__init__.py b/py-interface/__init__.py index e4f3c162f4..1d6f5f0e4c 100644 --- a/py-interface/__init__.py +++ b/py-interface/__init__.py @@ -151,7 +151,7 @@ from .amdsmi_interface import amdsmi_get_energy_count from .amdsmi_interface import amdsmi_get_gpu_memory_total from .amdsmi_interface import amdsmi_get_gpu_memory_usage from .amdsmi_interface import amdsmi_get_gpu_memory_busy_percent -from .amdsmi_interface import amdsmi_dev_get_memory_reserved_pages +from .amdsmi_interface import amdsmi_get_gpu_memory_reserved_pages # # Events from .amdsmi_interface import AmdSmiEventReader diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 4d0d3352b2..6563eb14e4 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -2631,7 +2631,7 @@ def amdsmi_dev_reset_xgmi_error( _check_res(amdsmi_wrapper.amdsmi_dev_reset_xgmi_error(processor_handle)) -def amdsmi_dev_get_memory_reserved_pages( +def amdsmi_get_gpu_memory_reserved_pages( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> Union[list, str]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2643,7 +2643,7 @@ def amdsmi_dev_get_memory_reserved_pages( retired_page_record = ctypes.POINTER( amdsmi_wrapper.amdsmi_retired_page_record_t)() _check_res( - amdsmi_wrapper.amdsmi_dev_get_memory_reserved_pages( + amdsmi_wrapper.amdsmi_get_gpu_memory_reserved_pages( processor_handle, ctypes.byref(num_pages), retired_page_record ) ) diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index 14c02e3c79..abf73dc4c8 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1484,9 +1484,9 @@ amdsmi_get_ras_block_features_enabled.argtypes = [amdsmi_processor_handle, amdsm amdsmi_get_gpu_memory_busy_percent = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_busy_percent amdsmi_get_gpu_memory_busy_percent.restype = amdsmi_status_t amdsmi_get_gpu_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32)] -amdsmi_dev_get_memory_reserved_pages = _libraries['libamd_smi.so'].amdsmi_dev_get_memory_reserved_pages -amdsmi_dev_get_memory_reserved_pages.restype = amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] +amdsmi_get_gpu_memory_reserved_pages = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_reserved_pages +amdsmi_get_gpu_memory_reserved_pages.restype = amdsmi_status_t +amdsmi_get_gpu_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)] amdsmi_dev_get_fan_rpms = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_rpms amdsmi_dev_get_fan_rpms.restype = amdsmi_status_t amdsmi_dev_get_fan_rpms.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)] @@ -1858,7 +1858,7 @@ __all__ = \ 'amdsmi_dev_get_fan_speed', 'amdsmi_dev_get_fan_speed_max', 'amdsmi_dev_get_gpu_clk_freq', 'amdsmi_dev_get_gpu_metrics_info', 'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent', - 'amdsmi_dev_get_memory_reserved_pages', + 'amdsmi_get_gpu_memory_reserved_pages', 'amdsmi_get_gpu_memory_total', 'amdsmi_get_gpu_memory_usage', 'amdsmi_dev_get_od_volt_curve_regions', 'amdsmi_dev_get_od_volt_info', 'amdsmi_dev_get_overdrive_level', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 9bbe72ea47..3d0a1867e2 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -303,7 +303,7 @@ class Formatter: | """ + self.style.text("14 Get device memory total. Api: amdsmi_get_gpu_memory_total ") + """ | | """ + self.style.text("15 Get device memory usage. Api: amdsmi_get_gpu_memory_usage ") + """ | | """ + self.style.text("16 Get device memory busy percent. Api: amdsmi_get_gpu_memory_busy_percent ") + """ | - | """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_dev_get_memory_reserved_pages ") + """ | + | """ + self.style.text("17 Get device memory reserved pages. Api: amdsmi_get_gpu_memory_reserved_pages ") + """ | | """ + self.style.text("18 Get device fan rpms. Api: amdsmi_dev_get_fan_rpms ") + """ | | """ + self.style.text("19 Get device fan speed. Api: amdsmi_dev_get_fan_speed ") + """ | | """ + self.style.text("20 Get device fan speed max. Api: amdsmi_dev_get_fan_speed_max ") + """ | @@ -771,7 +771,7 @@ commands = { 16: [smi_api.amdsmi_get_gpu_memory_busy_percent, { "device_identifier1": [None, True] }], - 17: [smi_api.amdsmi_dev_get_memory_reserved_pages, { + 17: [smi_api.amdsmi_get_gpu_memory_reserved_pages, { "device_identifier1": [None, True] }], 18: [amdsmi_tool_dev_fan_rpms_get, { diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index af4f37d410..a5b92e12a0 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -909,7 +909,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_power_profile_set", " amdsmi_set_gpu_power_profile"}, {"rsmi_dev_memory_busy_percent_get", "amdsmi_get_gpu_memory_busy_percent"}, {"rsmi_dev_busy_percent_get", "amdsmi_dev_get_busy_percent"}, - {"rsmi_dev_memory_reserved_pages_get", "amdsmi_dev_get_memory_reserved_pages"}, + {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, {"rsmi_dev_overdrive_level_get", "amdsmi_dev_get_overdrive_level"}, {"rsmi_dev_power_profile_presets_get", " amdsmi_dev_get_power_profile_presets"}, {"rsmi_dev_perf_level_set", " amdsmi_dev_set_perf_level"}, @@ -927,7 +927,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_counter_create", "amdsmi_dev_create_counter"}, {"rsmi_dev_xgmi_error_status", "amdsmi_dev_xgmi_error_status"}, {"rsmi_dev_xgmi_error_reset", "amdsmi_dev_reset_xgmi_error"}, - {"rsmi_dev_memory_reserved_pages_get", "amdsmi_dev_get_memory_reserved_pages"}, + {"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_reset", "amdsmi_dev_reset_gpu"}, @@ -1262,7 +1262,7 @@ amdsmi_status_t amdsmi_dev_set_clk_freq(amdsmi_processor_handle processor_handl static_cast(clk_type), freq_bitmask); } amdsmi_status_t -amdsmi_dev_get_memory_reserved_pages(amdsmi_processor_handle processor_handle, +amdsmi_get_gpu_memory_reserved_pages(amdsmi_processor_handle processor_handle, uint32_t *num_pages, amdsmi_retired_page_record_t *records) { return rsmi_wrapper(rsmi_dev_memory_reserved_pages_get, processor_handle, diff --git a/tests/amd_smi_test/functional/mem_page_info_read.cc b/tests/amd_smi_test/functional/mem_page_info_read.cc index 7a9f5d9626..d706f83722 100755 --- a/tests/amd_smi_test/functional/mem_page_info_read.cc +++ b/tests/amd_smi_test/functional/mem_page_info_read.cc @@ -96,7 +96,7 @@ void TestMemPageInfoRead::Run(void) { for (uint32_t i = 0; i < num_monitor_devs(); ++i) { PrintDeviceHeader(processor_handles_[i]); - err = amdsmi_dev_get_memory_reserved_pages(processor_handles_[i], &num_pages, nullptr); + err = amdsmi_get_gpu_memory_reserved_pages(processor_handles_[i], &num_pages, nullptr); if (err == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << @@ -104,7 +104,7 @@ void TestMemPageInfoRead::Run(void) { << std::endl; // Verify api support checking functionality is working - err = amdsmi_dev_get_memory_reserved_pages(processor_handles_[i], nullptr, nullptr); + err = amdsmi_get_gpu_memory_reserved_pages(processor_handles_[i], nullptr, nullptr); ASSERT_EQ(err, AMDSMI_STATUS_NOT_SUPPORTED); continue; @@ -115,7 +115,7 @@ void TestMemPageInfoRead::Run(void) { std::endl; } // Verify api support checking functionality is working - err = amdsmi_dev_get_memory_reserved_pages(processor_handles_[i], nullptr, nullptr); + err = amdsmi_get_gpu_memory_reserved_pages(processor_handles_[i], nullptr, nullptr); ASSERT_EQ(err, AMDSMI_STATUS_INVAL); } @@ -124,7 +124,7 @@ void TestMemPageInfoRead::Run(void) { assert(records != nullptr); - err = amdsmi_dev_get_memory_reserved_pages(processor_handles_[i], &num_pages, records); + err = amdsmi_get_gpu_memory_reserved_pages(processor_handles_[i], &num_pages, records); if (err == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << "\t**Getting Memory Page Retirement Status not " "supported for this device" << std::endl; diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index fbdd7a36b8..72291de3c2 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -300,7 +300,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_create_counter amdsmi_counter_get_available_counters amdsmi_dev_counter_group_supported - amdsmi_dev_get_memory_reserved_pages + amdsmi_get_gpu_memory_reserved_pages amdsmi_dev_xgmi_error_status amdsmi_dev_reset_xgmi_error amdsmi_dev_xgmi_hive_id_get