callbacks create a new event for setting lastEvent

CHIP-SPV · Sep 4, 2024 · 6a2266c · 6a2266c
1 parent 1b38713
commit 6a2266c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/CHIPBackend.hh b/src/CHIPBackend.hh
@@ -2352,7 +2352,9 @@ public:
       const std::vector<std::shared_ptr<chipstar::Event>> &EventsToWaitFor) = 0;
   virtual std::shared_ptr<chipstar::Event> enqueueBarrier(
       const std::vector<std::shared_ptr<chipstar::Event>> &EventsToWaitFor);
-
+  virtual std::shared_ptr<chipstar::Event> enqueueBarrier() {
+    return enqueueBarrier({});
+  }
   virtual std::shared_ptr<chipstar::Event> enqueueMarkerImpl() = 0;
   std::shared_ptr<chipstar::Event> enqueueMarker();
 

diff --git a/src/backend/Level0/CHIPBackendLevel0.cc b/src/backend/Level0/CHIPBackendLevel0.cc
@@ -576,7 +576,16 @@ CHIPCallbackDataLevel0::CHIPCallbackDataLevel0(hipStreamCallback_t CallbackF,
                                  &CpuCallbackCompleteLz->get());
   CHIPERR_CHECK_LOG_AND_THROW_TABLE(zeCommandListAppendBarrier);
 
-  ChipQueueLz->executeCommandList(CommandList, GpuAck);
+  // Need to create another event as GpuAck will be destroyed once callback is
+  // complete
+  auto CallbackComplete = BackendLz->createEventShared(ChipContextLz);
+  CallbackComplete->Msg = "CallbackComplete";
+  auto CallbackCompleteLz =
+      std::static_pointer_cast<CHIPEventLevel0>(CallbackComplete);
+  zeStatus = zeCommandListAppendBarrier(CommandList->getCmdList(),
+                                        CallbackCompleteLz->get(), 0, nullptr);
+  CHIPERR_CHECK_LOG_AND_THROW_TABLE(zeCommandListAppendBarrier);
+  ChipQueueLz->executeCommandList(CommandList, CallbackComplete);
 }
 
 // End CHIPCallbackDataLevel0