Always Store last event if scheduler was not bypassed

Author: igchor

sycl/source/detail/queue_impl.hpp

@@ -750,7 +750,9 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
 
     synchronizeWithExternalEvent(Handler);
 
-    return parseEvent(Handler.finalize());
+    auto Event = parseEvent(Handler.finalize());
+    storeLastEventIfNeeded(Event);
+    return Event;
   }
 
   template <typename HandlerType = handler>
@@ -786,6 +788,17 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
     return EventToBuildDeps;
   }
 
+  void storeLastEventIfNeeded(const EventImplPtr &Event) {
+    if (!Event || Scheduler::CheckEventReadiness(MContext, Event))
+      return;
+
+    auto &EventToBuildDeps = MGraph.expired() ? MDefaultGraphDeps.LastEventPtr
+                                              : MExtGraphDeps.LastEventPtr;
+
+    EventToBuildDeps = Event;
+    MNoLastEventMode = false;
+  }
+
   template <typename HandlerType = handler>
   detail::EventImplPtr
   finalizeHandlerInOrderWithDepsUnlocked(HandlerType &Handler) {
@@ -816,16 +829,15 @@ class queue_impl : public std::enable_shared_from_this<queue_impl> {
 
     synchronizeWithExternalEvent(Handler);
 
-    EventToBuildDeps = parseEvent(Handler.finalize());
-    if (EventToBuildDeps)
-      MNoLastEventMode = false;
+    auto Event = parseEvent(Handler.finalize());
+    storeLastEventIfNeeded(Event);
 
     // TODO: if the event is NOP we should be able to discard it.
     // However, NOP events are used to describe ordering for graph operations
     // Once https://github.com/intel/llvm/issues/18330 is fixed, we can
     // start relying on command buffer in-order property instead.
 
-    return EventToBuildDeps;
+    return Event;
   }
 
   template <typename HandlerType = handler>