From bf4ddf03f52e6d39e52057228d9222e4261a1ae3 Mon Sep 17 00:00:00 2001
From: Piotr Balcer <piotr.balcer@intel.com>
Date: Tue, 17 Sep 2024 10:31:44 +0200
Subject: [PATCH] Merge pull request #2087 from
 nrspruit/fix_driver_inorder_event_wait

[L0] Fix urEnqueueEventsWaitWithBarrier for driver in order lists
---
 source/adapters/level_zero/context.cpp | 2 ++
 source/adapters/level_zero/event.cpp   | 4 +++-
 source/adapters/level_zero/queue.cpp   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/adapters/level_zero/context.cpp b/source/adapters/level_zero/context.cpp
index 041f088d04..98c99f0685 100644
--- a/source/adapters/level_zero/context.cpp
+++ b/source/adapters/level_zero/context.cpp
@@ -529,6 +529,8 @@ ur_result_t ur_context_handle_t_::getFreeSlotInExistingOrNewPool(
         counterBasedExt.flags =
             ZE_EVENT_POOL_COUNTER_BASED_EXP_FLAG_NON_IMMEDIATE;
       }
+      logger::debug("ze_event_pool_desc_t counter based flags set to: {}",
+                    counterBasedExt.flags);
       ZeEventPoolDesc.pNext = &counterBasedExt;
     }
 
diff --git a/source/adapters/level_zero/event.cpp b/source/adapters/level_zero/event.cpp
index e5516fa816..7c040ccde3 100644
--- a/source/adapters/level_zero/event.cpp
+++ b/source/adapters/level_zero/event.cpp
@@ -197,7 +197,9 @@ ur_queue_handle_legacy_t_::enqueueEventsWaitWithBarrier( ///< [in] handle of the
         //
         if (Queue->isInOrderQueue() && InOrderBarrierBySignal &&
             !Queue->isProfilingEnabled()) {
-          if (EventWaitList.Length) {
+          // If we are using driver in order lists, then append wait on events
+          // is unnecessary and we can signal the event created.
+          if (EventWaitList.Length && !CmdList->second.IsInOrderList) {
             ZE2UR_CALL(zeCommandListAppendWaitOnEvents,
                        (CmdList->first, EventWaitList.Length,
                         EventWaitList.ZeEventList));
diff --git a/source/adapters/level_zero/queue.cpp b/source/adapters/level_zero/queue.cpp
index 34da252c74..1a25851514 100644
--- a/source/adapters/level_zero/queue.cpp
+++ b/source/adapters/level_zero/queue.cpp
@@ -2371,6 +2371,7 @@ ur_queue_handle_legacy_t_::ur_queue_group_t::getImmCmdList() {
   ZeCommandQueueDesc.ordinal = QueueOrdinal;
   ZeCommandQueueDesc.index = QueueIndex;
   ZeCommandQueueDesc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
+  bool isInOrderList = false;
   const char *Priority = "Normal";
   if (Queue->isPriorityLow()) {
     ZeCommandQueueDesc.priority = ZE_COMMAND_QUEUE_PRIORITY_PRIORITY_LOW;
@@ -2386,6 +2387,7 @@ ur_queue_handle_legacy_t_::ur_queue_group_t::getImmCmdList() {
   }
 
   if (Queue->Device->useDriverInOrderLists() && Queue->isInOrderQueue()) {
+    isInOrderList = true;
     ZeCommandQueueDesc.flags |= ZE_COMMAND_QUEUE_FLAG_IN_ORDER;
   }
 
@@ -2434,7 +2436,7 @@ ur_queue_handle_legacy_t_::ur_queue_group_t::getImmCmdList() {
               ZeCommandList,
               ur_command_list_info_t(
                   nullptr, true, false, nullptr, ZeCommandQueueDesc,
-                  Queue->useCompletionBatching(), true, false, true)})
+                  Queue->useCompletionBatching(), true, isInOrderList, true)})
           .first;
 
   return ImmCmdLists[Index];