diff --git a/include/amd_smi/amdsmi.h b/include/amd_smi/amdsmi.h index 9f47efdc55..233ba5459b 100644 --- a/include/amd_smi/amdsmi.h +++ b/include/amd_smi/amdsmi.h @@ -3500,7 +3500,7 @@ amdsmi_init_event_notification(amdsmi_processor_handle processor_handle); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_set_event_notification_mask(amdsmi_processor_handle processor_handle, uint64_t mask); + amdsmi_set_gpu_event_notification_mask(amdsmi_processor_handle processor_handle, uint64_t mask); /** * @brief Collect event notifications, waiting a specified amount of time @@ -3517,9 +3517,9 @@ amdsmi_status_t * buffer available to write any new events that would be found. * * This function requires prior calls to ::amdsmi_init_event_notification() and - * :: amdsmi_set_event_notification_mask(). This function polls for the + * :: 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_event_notification_mask(). + * specified by :: amdsmi_set_gpu_event_notification_mask(). * * @param[in] timeout_ms number of milliseconds to wait for an event * to occur diff --git a/py-interface/amdsmi_interface.py b/py-interface/amdsmi_interface.py index 9cee241c2b..a9a6f898f8 100644 --- a/py-interface/amdsmi_interface.py +++ b/py-interface/amdsmi_interface.py @@ -316,7 +316,7 @@ class AmdSmiEventReader: mask |= (1 << (int(event_type) - 1)) _check_res(amdsmi_wrapper.amdsmi_init_event_notification(processor_handle)) - _check_res(amdsmi_wrapper. amdsmi_set_event_notification_mask( + _check_res(amdsmi_wrapper. amdsmi_set_gpu_event_notification_mask( processor_handle, ctypes.c_uint64(mask))) def read(self, timestamp, num_elem=10): diff --git a/py-interface/amdsmi_wrapper.py b/py-interface/amdsmi_wrapper.py index d66f27dcd3..9832088a7a 100644 --- a/py-interface/amdsmi_wrapper.py +++ b/py-interface/amdsmi_wrapper.py @@ -1655,9 +1655,9 @@ amdsmi_get_func_iter_value.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POIN 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_set_event_notification_mask = _libraries['libamd_smi.so'].amdsmi_set_event_notification_mask -amdsmi_set_event_notification_mask.restype = amdsmi_status_t -amdsmi_set_event_notification_mask.argtypes = [amdsmi_processor_handle, uint64_t] +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] amdsmi_get_gpu_event_notification = _libraries['libamd_smi.so'].amdsmi_get_gpu_event_notification amdsmi_get_gpu_event_notification.restype = amdsmi_status_t amdsmi_get_gpu_event_notification.argtypes = [ctypes.c_int32, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_evt_notification_data_t)] @@ -1932,7 +1932,7 @@ __all__ = \ 'amdsmi_range_t', 'amdsmi_ras_err_state_t', 'amdsmi_ras_err_state_t__enumvalues', 'amdsmi_read_counter', 'amdsmi_retired_page_record_t', - 'amdsmi_set_event_notification_mask', + 'amdsmi_set_gpu_event_notification_mask', 'amdsmi_set_gpu_perf_determinism_mode', 'amdsmi_shut_down', 'amdsmi_socket_handle', 'amdsmi_status_string', 'amdsmi_status_t', 'amdsmi_status_t__enumvalues', 'amdsmi_stop_gpu_event_notification', diff --git a/py-interface/rocm_smi_tool.py b/py-interface/rocm_smi_tool.py index 9f5bba9858..eee2d9cffd 100644 --- a/py-interface/rocm_smi_tool.py +++ b/py-interface/rocm_smi_tool.py @@ -339,7 +339,7 @@ class Formatter: | """ + 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("53 Set event notification mask. Api: amdsmi_set_event_notification_mask ") + """ | + | """ + 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 ") + """ | | """ + self.style.text("56 Shut down. Api: amdsmi_shut_down ") + """ | @@ -568,7 +568,7 @@ def amdsmi_tool_event_notification_init(dev): def amdsmi_tool_event_notification_mask_set(dev, dic): mask = dic["mask"] - return smi_api.amdsmi_wrapper. amdsmi_set_event_notification_mask(dev, ctypes.c_uint64(mask)) + return smi_api.amdsmi_wrapper. amdsmi_set_gpu_event_notification_mask(dev, ctypes.c_uint64(mask)) def amdsmi_tool_event_notification_stop(dev): return smi_api.amdsmi_wrapper.amdsmi_stop_gpu_event_notification(dev) diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc index e1213061ce..c92197b21a 100644 --- a/src/amd_smi/amd_smi.cc +++ b/src/amd_smi/amd_smi.cc @@ -649,7 +649,7 @@ amdsmi_init_event_notification(amdsmi_processor_handle processor_handle) { } amdsmi_status_t - amdsmi_set_event_notification_mask(amdsmi_processor_handle processor_handle, + amdsmi_set_gpu_event_notification_mask(amdsmi_processor_handle processor_handle, uint64_t mask) { return rsmi_wrapper(rsmi_event_notification_mask_set, processor_handle, mask); } diff --git a/tests/amd_smi_test/functional/evt_notif_read_write.cc b/tests/amd_smi_test/functional/evt_notif_read_write.cc index e9bc9b2482..c7aeda8ab1 100755 --- a/tests/amd_smi_test/functional/evt_notif_read_write.cc +++ b/tests/amd_smi_test/functional/evt_notif_read_write.cc @@ -119,7 +119,7 @@ void TestEvtNotifReadWrite::Run(void) { return; } ASSERT_EQ(ret, AMDSMI_STATUS_SUCCESS); - ret = amdsmi_set_event_notification_mask(processor_handles_[dv_ind], mask); + ret = amdsmi_set_gpu_event_notification_mask(processor_handles_[dv_ind], mask); ASSERT_EQ(ret, AMDSMI_STATUS_SUCCESS); } diff --git a/tests/amd_smi_test/functional/mutual_exclusion.cc b/tests/amd_smi_test/functional/mutual_exclusion.cc index fb8af2fc35..7a56ee4285 100755 --- a/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -305,7 +305,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_reset_xgmi_error amdsmi_dev_xgmi_hive_id_get amdsmi_topo_get_link_weight - amdsmi_set_event_notification_mask + amdsmi_set_gpu_event_notification_mask amdsmi_init_event_notification amdsmi_stop_gpu_event_notification */