[llvm] [OFFLOAD][L0] Move dataFence logic to L0Queue (PR #201046)

via llvm-commits llvm-commits at lists.llvm.org
Tue Jun 2 00:35:33 PDT 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-offload

Author: Alex Duran (adurang)

<details>
<summary>Changes</summary>

The dataFence device operation logic was still on L0Device. With this all the operations working on command lists have their logic consolidated in L0Queue.

---
Full diff: https://github.com/llvm/llvm-project/pull/201046.diff


4 Files Affected:

- (modified) offload/plugins-nextgen/level_zero/include/L0CmdListManager.h (+9) 
- (modified) offload/plugins-nextgen/level_zero/include/L0Queue.h (+6-2) 
- (modified) offload/plugins-nextgen/level_zero/src/L0Device.cpp (+1-12) 
- (modified) offload/plugins-nextgen/level_zero/src/L0Queue.cpp (+4) 


``````````diff
diff --git a/offload/plugins-nextgen/level_zero/include/L0CmdListManager.h b/offload/plugins-nextgen/level_zero/include/L0CmdListManager.h
index 32236787a1865..d3a4c235156ec 100644
--- a/offload/plugins-nextgen/level_zero/include/L0CmdListManager.h
+++ b/offload/plugins-nextgen/level_zero/include/L0CmdListManager.h
@@ -126,6 +126,15 @@ class L0CmdListManagerTy {
                       NumWaitEvents, WaitEvents);
     return Plugin::success();
   }
+
+  Error appendBarrier(ze_event_handle_t SignalEvent = nullptr,
+                      uint32_t NumWaitEvents = 0,
+                      ze_event_handle_t *WaitEvents = nullptr) {
+    std::lock_guard<std::mutex> Lock(Mtx);
+    CALL_ZE_RET_ERROR(zeCommandListAppendBarrier, CmdList, SignalEvent,
+                      NumWaitEvents, WaitEvents);
+    return Plugin::success();
+  }
 };
 
 } // namespace llvm::omp::target::plugin
diff --git a/offload/plugins-nextgen/level_zero/include/L0Queue.h b/offload/plugins-nextgen/level_zero/include/L0Queue.h
index 3534c90421af3..4f888b997e120 100644
--- a/offload/plugins-nextgen/level_zero/include/L0Queue.h
+++ b/offload/plugins-nextgen/level_zero/include/L0Queue.h
@@ -46,8 +46,6 @@ class L0QueueTy {
   /// Clear data.
   void reset() { resetImpl(); }
 
-  ze_command_list_handle_t getCmdList() const { return CmdList->getCmdList(); }
-
   Error init();
   Error deinit();
   Error synchronize() { return synchronizeImpl(); }
@@ -83,6 +81,8 @@ class L0QueueTy {
     return launchKernelImpl(Kernel, KEnv);
   }
 
+  Error dataFence() { return dataFenceImpl(); }
+
   virtual Error initImpl() { return Plugin::success(); }
   virtual Error deinitImpl() { return Plugin::success(); }
   virtual void resetImpl() {}
@@ -104,6 +104,7 @@ class L0QueueTy {
                                size_t PatternSize, size_t Size) {
     return CmdList->appendMemoryFill(Ptr, Pattern, PatternSize, Size);
   }
+  virtual Error dataFenceImpl() = 0;
 };
 
 class L0AsyncQueueTy : public L0QueueTy {
@@ -150,6 +151,7 @@ class L0AsyncQueueTy : public L0QueueTy {
                          L0LaunchEnvTy &KEnv) override;
   Error memoryFillImpl(void *Ptr, const void *Pattern, size_t PatternSize,
                        size_t Size) override;
+  Error dataFenceImpl() override;
 };
 
 class L0AsyncOrderedQueueTy : public L0AsyncQueueTy {
@@ -165,6 +167,7 @@ class L0AsyncOrderedQueueTy : public L0AsyncQueueTy {
   Error synchronizeImpl() override;
   std::tuple<size_t, ze_event_handle_t *> getMemCopyEvents() override;
   std::tuple<size_t, ze_event_handle_t *> getLaunchKernelEvents() override;
+  Error dataFenceImpl() override { return Plugin::success(); }
 };
 
 class L0InorderQueueTy : public L0QueueTy {
@@ -182,6 +185,7 @@ class L0InorderQueueTy : public L0QueueTy {
   Error memoryCopyImpl(void *Dst, const void *Src, size_t Size) override;
   Error launchKernelImpl(ze_kernel_handle_t Kernel,
                          L0LaunchEnvTy &KEnv) override;
+  Error dataFenceImpl() override { return Plugin::success(); }
 };
 
 class L0SyncQueueTy : public L0InorderQueueTy {
diff --git a/offload/plugins-nextgen/level_zero/src/L0Device.cpp b/offload/plugins-nextgen/level_zero/src/L0Device.cpp
index ac8795b1624d5..1afed11b965f0 100644
--- a/offload/plugins-nextgen/level_zero/src/L0Device.cpp
+++ b/offload/plugins-nextgen/level_zero/src/L0Device.cpp
@@ -729,23 +729,12 @@ L0DeviceTy::createImmCmdList(uint32_t Ordinal, uint32_t Index, bool InOrder) {
   return CmdList;
 }
 
-// TODO: logic from this function should be moved to L0QueueTy
 Error L0DeviceTy::dataFence(__tgt_async_info *Async) {
-  const bool Ordered =
-      (getPlugin().getOptions().CommandMode == CommandModeTy::AsyncOrdered);
-
-  // Nothing to do if everything is ordered.
-  if (Ordered)
-    return Plugin::success();
-
   auto QueueOrErr = getOrCreateQueue(Async);
   if (!QueueOrErr)
     return QueueOrErr.takeError();
   L0QueueTy *Queue = *QueueOrErr;
-  ze_command_list_handle_t CmdList = Queue->getCmdList();
-  CALL_ZE_RET_ERROR(zeCommandListAppendBarrier, CmdList, nullptr, 0, nullptr);
-
-  return Plugin::success();
+  return Queue->dataFence();
 }
 
 Expected<bool> L0DeviceTy::isAccessiblePtrImpl(const void *Ptr, size_t Size) {
diff --git a/offload/plugins-nextgen/level_zero/src/L0Queue.cpp b/offload/plugins-nextgen/level_zero/src/L0Queue.cpp
index d91b3cf630c96..5f255c02516fe 100644
--- a/offload/plugins-nextgen/level_zero/src/L0Queue.cpp
+++ b/offload/plugins-nextgen/level_zero/src/L0Queue.cpp
@@ -221,6 +221,10 @@ Error L0AsyncQueueTy::dataSubmitImpl(void *TgtPtr, const void *HstPtr,
   return memoryCopy(TgtPtr, SrcPtr, Size);
 }
 
+Error L0AsyncQueueTy::dataFenceImpl() {
+  return CmdList->appendBarrier();
+}
+
 Error L0AsyncQueueTy::launchKernelImpl(ze_kernel_handle_t Kernel,
                                        L0LaunchEnvTy &KEnv) {
   auto EventOrError = Device.getEvent();

``````````

</details>


https://github.com/llvm/llvm-project/pull/201046


More information about the llvm-commits mailing list