Merge pull request #965 from Bensuo/ewan/L0_internal_event_fix

[Command-buffer][L0] Reset sync-point events

Author: kbenzie

source/adapters/level_zero/command_buffer.cpp

@@ -38,6 +38,8 @@
 
   There is also a WaitEvent used by the `ur_exp_command_buffer_handle_t` class
   in the prefix to wait on any dependencies passed in the enqueue wait-list.
+  This WaitEvent is reset at the end of the suffix, along with reset commands
+  to reset the L0 events used to implement the UR sync-points.
 
   ┌──────────┬────────────────────────────────────────────────┬─────────┐
   │  Prefix  │ Commands added to UR command-buffer by UR user │ Suffix  │
@@ -47,10 +49,10 @@
   Prefix    │Reset signal event │ Barrier waiting on wait event│
             └───────────────────┴──────────────────────────────┘
 
-            ┌─────────────────────────────────────────┐
-  Suffix    │Signal the UR command-buffer signal event│
-            └─────────────────────────────────────────┘
-
+            ┌─────────────────────────────────────────────┐──────────────┐
+  Suffix    │Barrier waiting on sync-point event,         │ Reset events │
+            │signalling the UR command-buffer signal event│              │
+            └─────────────────────────────────────────────┘──────────────┘
 
   For a call to `urCommandBufferEnqueueExp` with an event_list `EL`,
   command-buffer `CB`, and return event `RE` our implementation has to create
@@ -293,7 +295,7 @@ static ur_result_t enqueueCommandBufferMemCopyHelper(
                                   SyncPointWaitList, ZeEventList));
 
   ur_event_handle_t LaunchEvent;
-  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, true, &LaunchEvent));
+  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, false, &LaunchEvent));
   LaunchEvent->CommandType = CommandType;
 
   // Get sync point and register the event with it.
@@ -358,7 +360,7 @@ static ur_result_t enqueueCommandBufferMemCopyRectHelper(
                                   SyncPointWaitList, ZeEventList));
 
   ur_event_handle_t LaunchEvent;
-  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, true, &LaunchEvent));
+  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, false, &LaunchEvent));
   LaunchEvent->CommandType = CommandType;
 
   // Get sync point and register the event with it.
@@ -407,7 +409,7 @@ urCommandBufferCreateExp(ur_context_handle_t Context, ur_device_handle_t Device,
   // Create signal & wait events to be used in the command-list for sync
   // on command-buffer enqueue.
   auto RetCommandBuffer = *CommandBuffer;
-  UR_CALL(EventCreate(Context, nullptr, true, &RetCommandBuffer->SignalEvent));
+  UR_CALL(EventCreate(Context, nullptr, false, &RetCommandBuffer->SignalEvent));
   UR_CALL(EventCreate(Context, nullptr, false, &RetCommandBuffer->WaitEvent));
 
   // Add prefix commands
@@ -437,11 +439,31 @@ urCommandBufferReleaseExp(ur_exp_command_buffer_handle_t CommandBuffer) {
 
 UR_APIEXPORT ur_result_t UR_APICALL
 urCommandBufferFinalizeExp(ur_exp_command_buffer_handle_t CommandBuffer) {
-  // We need to append signal that will indicate that command-buffer has
-  // finished executing.
-  ZE2UR_CALL(
-      zeCommandListAppendSignalEvent,
-      (CommandBuffer->ZeCommandList, CommandBuffer->SignalEvent->ZeEvent));
+  // Create a list of events for our signal event to wait on
+  const size_t NumEvents = CommandBuffer->SyncPoints.size();
+  std::vector<ze_event_handle_t> WaitEventList{NumEvents};
+  for (size_t i = 0; i < NumEvents; i++) {
+    WaitEventList[i] = CommandBuffer->SyncPoints[i]->ZeEvent;
+  }
+
+  // Wait for all the user added commands to complete, and signal the
+  // command-buffer signal-event when they are done.
+  ZE2UR_CALL(zeCommandListAppendBarrier,
+             (CommandBuffer->ZeCommandList, CommandBuffer->SignalEvent->ZeEvent,
+              NumEvents, WaitEventList.data()));
+
+  // Reset the wait-event for the UR command-buffer that is signalled when its
+  // submission dependencies have been satisfied.
+  ZE2UR_CALL(zeCommandListAppendEventReset,
+             (CommandBuffer->ZeCommandList, CommandBuffer->WaitEvent->ZeEvent));
+
+  // Reset the L0 events we use for command-buffer internal sync-points to the
+  // non-signalled state
+  for (auto Event : WaitEventList) {
+    ZE2UR_CALL(zeCommandListAppendEventReset,
+               (CommandBuffer->ZeCommandList, Event));
+  }
+
   // Close the command list and have it ready for dispatch.
   ZE2UR_CALL(zeCommandListClose, (CommandBuffer->ZeCommandList));
   return UR_RESULT_SUCCESS;
@@ -497,7 +519,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
   UR_CALL(getEventsFromSyncPoints(CommandBuffer, NumSyncPointsInWaitList,
                                   SyncPointWaitList, ZeEventList));
   ur_event_handle_t LaunchEvent;
-  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, true, &LaunchEvent));
+  UR_CALL(EventCreate(CommandBuffer->Context, nullptr, false, &LaunchEvent));
   LaunchEvent->CommandType = UR_COMMAND_KERNEL_LAUNCH;
 
   // Get sync point and register the event with it.
@@ -727,7 +749,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urCommandBufferEnqueueExp(
                (WaitCommandList->first, CommandBuffer->WaitEvent->ZeEvent));
   }
 
-  // Execution event for this enqueue of the PI command-buffer
+  // Execution event for this enqueue of the UR command-buffer
   ur_event_handle_t RetEvent{};
   // Create a command-list to signal RetEvent on completion
   ur_command_list_ptr_t SignalCommandList{};