[L0] Fix counting event usage in the cache and discard event use cases

Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
oneapi-src · Mar 29, 2024 · f6c1083 · f6c1083
1 parent 6a817d3
commit f6c1083
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/source/adapters/level_zero/context.cpp b/source/adapters/level_zero/context.cpp
@@ -550,14 +550,18 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
 }
 
 ur_event_handle_t ur_context_handle_t_::getEventFromContextCache(
-    bool HostVisible, bool WithProfiling, ur_device_handle_t Device) {
+    bool HostVisible, bool WithProfiling, ur_device_handle_t Device,
+    bool CounterBasedEventEnabled) {
   std::scoped_lock<ur_mutex> Lock(EventCacheMutex);
   auto Cache = getEventCache(HostVisible, WithProfiling, Device);
   if (Cache->empty())
     return nullptr;
 
   auto It = Cache->begin();
   ur_event_handle_t Event = *It;
+  if (Event->CounterBasedEventsEnabled != CounterBasedEventEnabled) {
+    return nullptr;
+  }
   Cache->erase(It);
   // We have to reset event before using it.
   Event->reset();

diff --git a/source/adapters/level_zero/context.hpp b/source/adapters/level_zero/context.hpp
@@ -201,7 +201,8 @@ struct ur_context_handle_t_ : _ur_object {
   // Get ur_event_handle_t from cache.
   ur_event_handle_t getEventFromContextCache(bool HostVisible,
                                              bool WithProfiling,
-                                             ur_device_handle_t Device);
+                                             ur_device_handle_t Device,
+                                             bool CounterBasedEventEnabled);
 
   // Add ur_event_handle_t to cache.
   void addEventToContextCache(ur_event_handle_t);

diff --git a/source/adapters/level_zero/event.cpp b/source/adapters/level_zero/event.cpp
@@ -1073,7 +1073,7 @@ ur_result_t EventCreate(ur_context_handle_t Context, ur_queue_handle_t Queue,
   }
 
   if (auto CachedEvent = Context->getEventFromContextCache(
-          HostVisible, ProfilingEnabled, Device)) {
+          HostVisible, ProfilingEnabled, Device, CounterBasedEventEnabled)) {
     *RetEvent = CachedEvent;
     return UR_RESULT_SUCCESS;
   }

diff --git a/source/adapters/level_zero/queue.cpp b/source/adapters/level_zero/queue.cpp
@@ -1247,12 +1247,13 @@ bool ur_queue_handle_t_::doReuseDiscardedEvents() {
 
 ur_result_t
 ur_queue_handle_t_::resetDiscardedEvent(ur_command_list_ptr_t CommandList) {
-  if (!CounterBasedEventsEnabled && LastCommandEvent &&
-      LastCommandEvent->IsDiscarded) {
+  if (LastCommandEvent && LastCommandEvent->IsDiscarded) {
     ZE2UR_CALL(zeCommandListAppendBarrier,
                (CommandList->first, nullptr, 1, &(LastCommandEvent->ZeEvent)));
-    ZE2UR_CALL(zeCommandListAppendEventReset,
-               (CommandList->first, LastCommandEvent->ZeEvent));
+    if (!CounterBasedEventsEnabled) {
+      ZE2UR_CALL(zeCommandListAppendEventReset,
+                 (CommandList->first, LastCommandEvent->ZeEvent));
+    }
 
     // Create new ur_event_handle_t but with the same ze_event_handle_t. We are
     // going to use this ur_event_handle_t for the next command with discarded
@@ -1896,10 +1897,8 @@ ur_result_t ur_queue_handle_t_::createCommandList(
   std::tie(CommandList, std::ignore) = CommandListMap.insert(
       std::pair<ze_command_list_handle_t, ur_command_list_info_t>(
           ZeCommandList, {ZeFence, false, false, ZeCommandQueue, ZeQueueDesc}));
-  if (!CounterBasedEventsEnabled) {
-    UR_CALL(insertStartBarrierIfDiscardEventsMode(CommandList));
-    UR_CALL(insertActiveBarriers(CommandList, UseCopyEngine));
-  }
+  UR_CALL(insertStartBarrierIfDiscardEventsMode(CommandList));
+  UR_CALL(insertActiveBarriers(CommandList, UseCopyEngine));
   return UR_RESULT_SUCCESS;
 }