extend test for opencl

Author: igchor

sycl/source/detail/queue_impl.cpp

@@ -295,7 +295,7 @@ queue_impl::getLastEvent(const std::shared_ptr<queue_impl> &Self) {
   auto &LastEvent = MGraph.expired() ? MDefaultGraphDeps.LastEventPtr
                                      : MExtGraphDeps.LastEventPtr;
   // If the event comes from a graph, we must return it.
-  if (LastEvent && (!LastEvent->isNOP() || LastEvent->hasCommandGraph()))
+  if (LastEvent)
     return detail::createSyclObjFromImpl<event>(LastEvent);
   // We insert a marker to represent an event at end.
   return detail::createSyclObjFromImpl<event>(insertMarkerEvent(Self));
@@ -500,7 +500,8 @@ event queue_impl::submitMemOpHelper(const std::shared_ptr<queue_impl> &Self,
         }
       }
 
-      if (isInOrder() && !isNoEventsMode) {
+      if (isInOrder() &&
+          (!isNoEventsMode || MContext->getBackend() == backend::opencl)) {
         auto &EventToStoreIn = MGraph.expired() ? MDefaultGraphDeps.LastEventPtr
                                                 : MExtGraphDeps.LastEventPtr;
         EventToStoreIn = EventImpl;

sycl/test-e2e/InOrderEventsExt/get_last_event.cpp

@@ -36,10 +36,17 @@ int Check(const sycl::queue &Q, const char *CheckName, const F &CheckFunc) {
               << std::endl;
     return 1;
   }
-  if (LastEvent->get_info<sycl::info::event::command_execution_status>() ==
-          sycl::info::event_command_status::complete &&
-      E->get_info<sycl::info::event::command_execution_status>() !=
-          sycl::info::event_command_status::complete) {
+  if (Q.get_backend() == sycl::backend::opencl) {
+    if (*E != *LastEvent) {
+      std::cout << "opencl backend should store last event in the queue"
+                << std::endl;
+      return 1;
+    }
+  } else if (LastEvent->get_info<
+                 sycl::info::event::command_execution_status>() ==
+                 sycl::info::event_command_status::complete &&
+             E->get_info<sycl::info::event::command_execution_status>() !=
+                 sycl::info::event_command_status::complete) {
     std::cout << "ext_oneapi_get_last_event() returned an event that is "
                  "complete, but the event returned by CheckFunc() is not."
               << std::endl;