From 370168e42cdc574fdbd508ca457efb8b2f1e6f6a Mon Sep 17 00:00:00 2001 From: Deepak Mewar Date: Mon, 27 Feb 2023 01:50:25 -0500 Subject: [PATCH] Renamed API amdsmi_init_event_notification to amdsmi_init_gpu_event_notification grep -rli 'amdsmi_init_event_notification' * | xargs -i@ sed -i 's/amdsmi_init_event_notification/amdsmi_init_gpu_event_notification/g' @ Change-Id: I6a45d38836f9d4221e3e5159370d4b6791fecca5 [ROCm/amdsmi commit: 2ad8b91e0e504fabc783dfbfdddd4707d85b3e60] --- projects/amdsmi/include/amd_smi/amdsmi.h | 8 ++++---- projects/amdsmi/py-interface/amdsmi_interface.py | 2 +- 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 | 2 +- .../tests/amd_smi_test/functional/evt_notif_read_write.cc | 2 +- .../tests/amd_smi_test/functional/mutual_exclusion.cc | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 233ba5459b..2d845a1475 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3471,7 +3471,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_init_event_notification(amdsmi_processor_handle processor_handle); +amdsmi_init_gpu_event_notification(amdsmi_processor_handle processor_handle); /** * @brief Specify which events to collect for a device @@ -3494,7 +3494,7 @@ amdsmi_init_event_notification(amdsmi_processor_handle processor_handle); * AMDSMI_EVT_NOTIF_THERMAL_THROTTLE event (which has a value of 2). * * @note ::AMDSMI_STATUS_INIT_ERROR is returned if - * ::amdsmi_init_event_notification() has not been called before a call to this + * ::amdsmi_init_gpu_event_notification() has not been called before a call to this * function * * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail @@ -3516,7 +3516,7 @@ amdsmi_status_t * to the buffer then poll for new events if there is still caller-provided * buffer available to write any new events that would be found. * - * This function requires prior calls to ::amdsmi_init_event_notification() and + * This function requires prior calls to ::amdsmi_init_gpu_event_notification() and * :: amdsmi_set_gpu_event_notification_mask(). This function polls for the * occurrance of the events on the respective devices that were previously * specified by :: amdsmi_set_gpu_event_notification_mask(). @@ -3548,7 +3548,7 @@ amdsmi_status_t * @details Any resources used by event notification for the GPU with * processor handle @p processor_handle will be free with this * function. This includes freeing any memory and closing file handles. This - * should be called for every call to ::amdsmi_init_event_notification() + * should be called for every call to ::amdsmi_init_gpu_event_notification() * * @param[in] processor_handle The processor handle of the GPU for which event * notification resources will be free diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index a9a6f898f8..305bf68f29 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -315,7 +315,7 @@ class AmdSmiEventReader: for event_type in event_types: mask |= (1 << (int(event_type) - 1)) - _check_res(amdsmi_wrapper.amdsmi_init_event_notification(processor_handle)) + _check_res(amdsmi_wrapper.amdsmi_init_gpu_event_notification(processor_handle)) _check_res(amdsmi_wrapper. amdsmi_set_gpu_event_notification_mask( processor_handle, ctypes.c_uint64(mask))) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 9832088a7a..7c4e97a631 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1652,9 +1652,9 @@ amdsmi_dev_close_supported_func_iterator.argtypes = [ctypes.POINTER(ctypes.POINT amdsmi_get_func_iter_value = _libraries['libamd_smi.so'].amdsmi_get_func_iter_value amdsmi_get_func_iter_value.restype = amdsmi_status_t amdsmi_get_func_iter_value.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(union_c__UA_amdsmi_func_id_value_t)] -amdsmi_init_event_notification = _libraries['libamd_smi.so'].amdsmi_init_event_notification -amdsmi_init_event_notification.restype = amdsmi_status_t -amdsmi_init_event_notification.argtypes = [amdsmi_processor_handle] +amdsmi_init_gpu_event_notification = _libraries['libamd_smi.so'].amdsmi_init_gpu_event_notification +amdsmi_init_gpu_event_notification.restype = amdsmi_status_t +amdsmi_init_gpu_event_notification.argtypes = [amdsmi_processor_handle] amdsmi_set_gpu_event_notification_mask = _libraries['libamd_smi.so'].amdsmi_set_gpu_event_notification_mask amdsmi_set_gpu_event_notification_mask.restype = amdsmi_status_t amdsmi_set_gpu_event_notification_mask.argtypes = [amdsmi_processor_handle, uint64_t] @@ -1916,7 +1916,7 @@ __all__ = \ 'amdsmi_get_gpu_vram_usage', 'amdsmi_get_xgmi_info', 'amdsmi_gpu_block_t', 'amdsmi_gpu_block_t__enumvalues', 'amdsmi_gpu_caps_t', 'amdsmi_gpu_metrics_t', 'amdsmi_init', - 'amdsmi_init_event_notification', 'amdsmi_init_flags_t', + 'amdsmi_init_gpu_event_notification', 'amdsmi_init_flags_t', 'amdsmi_init_flags_t__enumvalues', 'amdsmi_is_P2P_accessible', 'amdsmi_memory_page_status_t', 'amdsmi_memory_page_status_t__enumvalues', 'amdsmi_memory_type_t', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index eee2d9cffd..6fdb0aaf36 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -338,7 +338,7 @@ class Formatter: | """ + self.style.text("49 Get asic info. Api: amdsmi_get_gpu_asic_info ") + """ | | """ + self.style.text("50 Get processor_handles. Api: amdsmi_get_processor_handles ") + """ | | """ + self.style.text("51 Get event notification. Api: amdsmi_get_gpu_event_notification ") + """ | - | """ + self.style.text("52 Init event notification. Api: amdsmi_init_event_notification ") + """ | + | """ + self.style.text("52 Init event notification. Api: amdsmi_init_gpu_event_notification ") + """ | | """ + self.style.text("53 Set event notification mask. Api: amdsmi_set_gpu_event_notification_mask ") + """ | | """ + self.style.text("54 Get event notification. Api: amdsmi_stop_gpu_event_notification ") + """ | | """ + self.style.text("55 Init. Api: amdsmi_init ") + """ | @@ -564,7 +564,7 @@ def amdsmi_tool_event_notification_get(dev): return result def amdsmi_tool_event_notification_init(dev): - return smi_api.amdsmi_wrapper.amdsmi_init_event_notification(dev) + return smi_api.amdsmi_wrapper.amdsmi_init_gpu_event_notification(dev) def amdsmi_tool_event_notification_mask_set(dev, dic): mask = dic["mask"] diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index c92197b21a..2da8a8ef73 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -644,7 +644,7 @@ amdsmi_status_t amdsmi_get_gpu_vram_vendor(amdsmi_processor_handle processor_han } amdsmi_status_t -amdsmi_init_event_notification(amdsmi_processor_handle processor_handle) { +amdsmi_init_gpu_event_notification(amdsmi_processor_handle processor_handle) { return rsmi_wrapper(rsmi_event_notification_init, processor_handle); } diff --git a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc index c7aeda8ab1..5061c6f097 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/evt_notif_read_write.cc @@ -109,7 +109,7 @@ void TestEvtNotifReadWrite::Run(void) { } for (dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { - ret = amdsmi_init_event_notification(processor_handles_[dv_ind]); + ret = amdsmi_init_gpu_event_notification(processor_handles_[dv_ind]); if (ret == AMDSMI_STATUS_NOT_SUPPORTED) { IF_VERB(STANDARD) { std::cout << 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 7a56ee4285..1599546925 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -306,7 +306,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_xgmi_hive_id_get amdsmi_topo_get_link_weight amdsmi_set_gpu_event_notification_mask - amdsmi_init_event_notification + amdsmi_init_gpu_event_notification amdsmi_stop_gpu_event_notification */