Fix event status handling 2

Signed-off-by: Tikhomirova, Kseniya <[email protected]>

Author: KseniyaTikhomirova

sycl/source/detail/event_impl.cpp

@@ -322,14 +322,18 @@ event_impl::get_info<info::event::command_execution_status>() const {
   if (MState == HES_Discarded)
     return info::event_command_status::ext_oneapi_unknown;
 
-  if (!MHostEvent && MEvent) {
-    return get_event_info<info::event::command_execution_status>::get(
-        this->getHandleRef(), this->getPlugin());
+  if (!MHostEvent) {
+    // Command is enqueued and PiEvent is ready
+    if (MEvent)
+      return get_event_info<info::event::command_execution_status>::get(
+          this->getHandleRef(), this->getPlugin());
+    // Command is blocked and not enqueued, PiEvent is not assigned yet
+    else if (MCommand)
+      return sycl::info::event_command_status::submitted;
   }
-  if (MHostEvent && MState.load() == HES_Complete)
-    return info::event_command_status::complete;
-
-  return sycl::info::event_command_status::submitted;
+  return MHostEvent && MState.load() != HES_Complete
+             ? sycl::info::event_command_status::submitted
+             : info::event_command_status::complete;
 }
 
 static uint64_t getTimestamp() {

sycl/unittests/scheduler/EnqueueWithDependsOnDeps.cpp

@@ -104,8 +104,6 @@ TEST_F(SchedulerTest, EnqueueNoMemObjTwoHostTasks) {
     std::cout << "Not run due to host-only environment\n";
     return;
   }
-  unittest::PiMock Mock{Plt};
-  setupDefaultMockAPIs(Mock);
 
   queue QueueDev(context(Plt), Selector);
   MockScheduler MS;