cleanup only for internal events

Signed-off-by: Zhang, Winston <[email protected]>

Author: winstonzhang-intel

unified-runtime/source/adapters/level_zero/context.cpp

@@ -406,7 +406,7 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
     ze_event_pool_handle_t &Pool, size_t &Index, bool HostVisible,
     bool ProfilingEnabled, ur_device_handle_t Device,
     bool CounterBasedEventEnabled, bool UsingImmCmdList,
-    bool InterruptBasedEventEnabled, ur_queue_handle_t Queue) {
+    bool InterruptBasedEventEnabled, ur_queue_handle_t Queue, bool IsInternal) {
 
   ze_device_handle_t ZeDevice = nullptr;
   if (Device) {
@@ -464,17 +464,19 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
     ze_result_t Result = ZE_CALL_NOCHECK(
         zeEventPoolCreate,
         (ZeContext, &ZeEventPoolDesc, ZeDevices.size(), &ZeDevices[0], &Pool));
-    if (ze2urResult(Result) == UR_RESULT_ERROR_OUT_OF_RESOURCES && Queue &&
-        !Queue->isInOrderQueue()) {
-      if (Queue->UsingImmCmdLists) {
-        UR_CALL(CleanupEventsInImmCmdLists(Queue, true /*QueueLocked*/,
-                                           false /*QueueSynced*/,
-                                           nullptr /*CompletedEvent*/));
-      } else {
-        UR_CALL(resetCommandLists(Queue));
+    if (IsInternal && ze2urResult(Result) == UR_RESULT_ERROR_OUT_OF_RESOURCES &&
+        Queue) {
+      if (!Queue->isInOrderQueue()) {
+        if (Queue->UsingImmCmdLists) {
+          UR_CALL(CleanupEventsInImmCmdLists(Queue, true /*QueueLocked*/,
+                                             false /*QueueSynced*/,
+                                             nullptr /*CompletedEvent*/));
+        } else {
+          UR_CALL(resetCommandLists(Queue));
+        }
+        ZE2UR_CALL(zeEventPoolCreate, (ZeContext, &ZeEventPoolDesc,
+                                       ZeDevices.size(), &ZeDevices[0], &Pool));
       }
-      ZE2UR_CALL(zeEventPoolCreate, (ZeContext, &ZeEventPoolDesc,
-                                     ZeDevices.size(), &ZeDevices[0], &Pool));
     } else if (ze2urResult(Result) != UR_RESULT_SUCCESS) {
       return ze2urResult(Result);
     }
@@ -564,17 +566,19 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
     ze_result_t Result = ZE_CALL_NOCHECK(
         zeEventPoolCreate,
         (ZeContext, &ZeEventPoolDesc, ZeDevices.size(), &ZeDevices[0], &Pool));
-    if (ze2urResult(Result) == UR_RESULT_ERROR_OUT_OF_RESOURCES && Queue &&
-        !Queue->isInOrderQueue()) {
-      if (Queue->UsingImmCmdLists) {
-        UR_CALL(CleanupEventsInImmCmdLists(Queue, true /*QueueLocked*/,
-                                           false /*QueueSynced*/,
-                                           nullptr /*CompletedEvent*/));
-      } else {
-        UR_CALL(resetCommandLists(Queue));
+    if (IsInternal && ze2urResult(Result) == UR_RESULT_ERROR_OUT_OF_RESOURCES &&
+        Queue) {
+      if (!Queue->isInOrderQueue()) {
+        if (Queue->UsingImmCmdLists) {
+          UR_CALL(CleanupEventsInImmCmdLists(Queue, true /*QueueLocked*/,
+                                             false /*QueueSynced*/,
+                                             nullptr /*CompletedEvent*/));
+        } else {
+          UR_CALL(resetCommandLists(Queue));
+        }
+        ZE2UR_CALL(zeEventPoolCreate, (ZeContext, &ZeEventPoolDesc,
+                                       ZeDevices.size(), &ZeDevices[0], &Pool));
       }
-      ZE2UR_CALL(zeEventPoolCreate, (ZeContext, &ZeEventPoolDesc,
-                                     ZeDevices.size(), &ZeDevices[0], &Pool));
     } else if (ze2urResult(Result) != UR_RESULT_SUCCESS) {
       return ze2urResult(Result);
     }

unified-runtime/source/adapters/level_zero/context.hpp

@@ -206,7 +206,8 @@ struct ur_context_handle_t_ : ur_object {
       ze_event_pool_handle_t &, size_t &, bool HostVisible,
       bool ProfilingEnabled, ur_device_handle_t Device,
       bool CounterBasedEventEnabled, bool UsingImmCmdList,
-      bool InterruptBasedEventEnabled, ur_queue_handle_t Queue);
+      bool InterruptBasedEventEnabled, ur_queue_handle_t Queue,
+      bool IsInternal);
 
   // Get ur_event_handle_t from cache.
   ur_event_handle_t getEventFromContextCache(bool HostVisible,

unified-runtime/source/adapters/level_zero/event.cpp

@@ -1349,16 +1349,18 @@ ur_result_t CleanupCompletedEvent(ur_event_handle_t Event, bool QueueLocked,
 // The "HostVisible" argument specifies if event needs to be allocated from
 // a host-visible pool.
 //
-ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
-                        bool IsMultiDevice, bool HostVisible,
-                        ur_event_handle_t *RetEvent,
-                        bool CounterBasedEventEnabled,
-                        bool ForceDisableProfiling,
-                        bool InterruptBasedEventEnabled) {
+ur_result_t
+EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
+            bool IsMultiDevice, bool HostVisible, ur_event_handle_t *RetEvent,
+            bool CounterBasedEventEnabled, bool ForceDisableProfiling,
+            bool InterruptBasedEventEnabled, std::optional<bool> IsInternal) {
   bool ProfilingEnabled =
       ForceDisableProfiling ? false : (!Queue || Queue->isProfilingEnabled());
   bool UsingImmediateCommandlists = !Queue || Queue->UsingImmCmdLists;
 
+  // Handle optional IsInternal parameter - default to false if not provided
+  bool isInternalValue = IsInternal.value_or(false);
+
   ur_device_handle_t Device = nullptr;
 
   if (!IsMultiDevice && Queue) {
@@ -1380,7 +1382,7 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
   if (auto Res = Context->getFreeSlotInExistingOrNewPool(
           ZeEventPool, Index, HostVisible, ProfilingEnabled, Device,
           CounterBasedEventEnabled, UsingImmediateCommandlists,
-          InterruptBasedEventEnabled, Queue))
+          InterruptBasedEventEnabled, Queue, isInternalValue))
     return Res;
 
   ZeStruct<ze_event_desc_t> ZeEventDesc;

unified-runtime/source/adapters/level_zero/event.hpp

@@ -37,7 +37,8 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
                         ur_event_handle_t *RetEvent,
                         bool CounterBasedEventEnabled,
                         bool ForceDisableProfiling,
-                        bool InterruptBasedEventEnabled);
+                        bool InterruptBasedEventEnabled,
+                        std::optional<bool> IsInternal = std::nullopt);
 } // extern "C"
 
 // This is an experimental option that allows to disable caching of events in

unified-runtime/source/adapters/level_zero/queue.cpp

@@ -1904,7 +1904,7 @@ ur_result_t createEventAndAssociateQueue(ur_queue_handle_t Queue,
     UR_CALL(EventCreate(
         Queue->Context, Queue, IsMultiDevice, HostVisible.value(), Event,
         Queue->CounterBasedEventsEnabled, false /*ForceDisableProfiling*/,
-        Queue->InterruptBasedEventsEnabled));
+        Queue->InterruptBasedEventsEnabled, IsInternal));
 
   (*Event)->UrQueue = Queue;
   (*Event)->CommandType = CommandType;