Refactor appendExecutionWaits function

Author: Fabio Mestre

source/adapters/level_zero/command_buffer.cpp

@@ -589,42 +589,27 @@ bool canBeInOrder(ur_context_handle_t Context,
 
 /**
  * Append the initial barriers to the Compute and Copy command-lists.
- * These barriers wait for all the events to be reset before starting execution
- * of the command-buffer
  * @param CommandBuffer The CommandBuffer
- * @param UseImmediateAppendPath true if the adapter is using the
- * zeCommandListImmediateAppendCommandListsExp() API to launch the
- * command-buffer.
  * @return UR_RESULT_SUCCESS or an error code on failure.
  */
-ur_result_t appendExecutionWaits(ur_exp_command_buffer_handle_t CommandBuffer,
-                                 bool UseImmediateAppendPath) {
+ur_result_t appendExecutionWaits(ur_exp_command_buffer_handle_t CommandBuffer) {
 
-  if (UseImmediateAppendPath && CommandBuffer->ZeCommandListResetEvents) {
-    ZE2UR_CALL(zeCommandListAppendBarrier,
-               (CommandBuffer->ZeComputeCommandList, nullptr, 1,
-                &CommandBuffer->AllResetEvent->ZeEvent));
-
-    if (CommandBuffer->ZeCopyCommandList) {
-      ZE2UR_CALL(zeCommandListAppendBarrier,
-                 (CommandBuffer->ZeCopyCommandList, nullptr, 1,
-                  &CommandBuffer->AllResetEvent->ZeEvent));
-    }
+  std::vector<ze_event_handle_t> PrecondEvents;
+  if (CommandBuffer->ZeCommandListResetEvents) {
+    PrecondEvents.push_back(CommandBuffer->AllResetEvent->ZeEvent);
+  }
+  if (!CommandBuffer->UseImmediateAppendPath) {
+    PrecondEvents.push_back(CommandBuffer->WaitEvent->ZeEvent);
   }
 
-  if (!UseImmediateAppendPath) {
-    std::vector<ze_event_handle_t> PrecondEvents = {
-        CommandBuffer->WaitEvent->ZeEvent,
-        CommandBuffer->AllResetEvent->ZeEvent};
-    ZE2UR_CALL(zeCommandListAppendBarrier,
-               (CommandBuffer->ZeComputeCommandList, nullptr,
-                PrecondEvents.size(), PrecondEvents.data()));
+  ZE2UR_CALL(zeCommandListAppendBarrier,
+             (CommandBuffer->ZeComputeCommandList, nullptr,
+              PrecondEvents.size(), PrecondEvents.data()));
 
-    if (CommandBuffer->ZeCopyCommandList) {
-      ZE2UR_CALL(zeCommandListAppendBarrier,
-                 (CommandBuffer->ZeCopyCommandList, nullptr,
-                  PrecondEvents.size(), PrecondEvents.data()));
-    }
+  if (CommandBuffer->ZeCopyCommandList) {
+    ZE2UR_CALL(zeCommandListAppendBarrier,
+               (CommandBuffer->ZeCopyCommandList, nullptr, PrecondEvents.size(),
+                PrecondEvents.data()));
   }
 
   return UR_RESULT_SUCCESS;
@@ -651,6 +636,22 @@ urCommandBufferCreateExp(ur_context_handle_t Context, ur_device_handle_t Device,
   ze_command_list_handle_t ZeComputeCommandList = nullptr;
   ze_command_list_handle_t ZeCopyCommandList = nullptr;
   ze_command_list_handle_t ZeCommandListResetEvents = nullptr;
+  ze_command_list_handle_t ZeComputeCommandListTranslated = nullptr;
+
+  UR_CALL(createMainCommandList(Context, Device, IsInOrder, IsUpdatable, false,
+                                ZeComputeCommandList));
+
+  // Create a list for copy commands. Note that to simplify the implementation,
+  // the current implementation only uses the main copy engine and does not use
+  // the link engine even if available.
+  if (Device->hasMainCopyEngine()) {
+    UR_CALL(createMainCommandList(Context, Device, false, false, true,
+                                  ZeCopyCommandList));
+  }
+
+  ZE2UR_CALL(zelLoaderTranslateHandle,
+             (ZEL_HANDLE_COMMAND_LIST, ZeComputeCommandList,
+              (void **)&ZeComputeCommandListTranslated));
 
   // The CopyFinishedEvent and ComputeFinishedEvent are needed only when using
   // the ImmediateAppend Path.
@@ -697,22 +698,6 @@ urCommandBufferCreateExp(ur_context_handle_t Context, ur_device_handle_t Device,
                         false /*CounterBasedEventEnabled*/, !EnableProfiling));
   }
 
-  UR_CALL(createMainCommandList(Context, Device, IsInOrder, IsUpdatable, false,
-                                ZeComputeCommandList));
-
-  // Create a list for copy commands. Note that to simplify the implementation,
-  // the current implementation only uses the main copy engine and does not use
-  // the link engine even if available.
-  if (Device->hasMainCopyEngine()) {
-    UR_CALL(createMainCommandList(Context, Device, false, false, true,
-                                  ZeCopyCommandList));
-  }
-
-  ze_command_list_handle_t ZeComputeCommandListTranslated = nullptr;
-  ZE2UR_CALL(zelLoaderTranslateHandle,
-             (ZEL_HANDLE_COMMAND_LIST, ZeComputeCommandList,
-              (void **)&ZeComputeCommandListTranslated));
-
   try {
     *CommandBuffer = new ur_exp_command_buffer_handle_t_(
         Context, Device, ZeComputeCommandList, ZeComputeCommandListTranslated,
@@ -725,9 +710,7 @@ urCommandBufferCreateExp(ur_context_handle_t Context, ur_device_handle_t Device,
     return UR_RESULT_ERROR_UNKNOWN;
   }
 
-  if (ZeCommandListResetEvents) {
-    UR_CALL(appendExecutionWaits(*CommandBuffer, ImmediateAppendPath));
-  }
+  UR_CALL(appendExecutionWaits(*CommandBuffer));
 
   return UR_RESULT_SUCCESS;
 }