signal host as usual

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

Author: KseniyaTikhomirova

sycl/source/detail/event_impl.cpp

@@ -54,7 +54,7 @@ event_impl::~event_impl() {
 
 void event_impl::waitInternal(bool *Success) {
   auto Handle = this->getHandle();
-  if (Handle) {
+  if (!MIsHostEvent && Handle) {
     // Wait for the native event
     ur_result_t Err =
         getAdapter()->call_nocheck<UrApiKind::urEventWait>(1, &Handle);
@@ -92,7 +92,7 @@ void event_impl::waitInternal(bool *Success) {
 }
 
 void event_impl::setComplete() {
-  if (!this->getHandle()) {
+  if (MIsHostEvent || !this->getHandle()) {
     {
       std::unique_lock<std::mutex> lock(MMutex);
 #ifndef NDEBUG

sycl/source/detail/scheduler/scheduler.cpp

@@ -469,17 +469,15 @@ void Scheduler::NotifyHostTaskCompletion(Command *Cmd) {
       ToCleanUp.push_back(Cmd);
       Cmd->MMarkedForCleanup = true;
     }
-
+    {
+      std::lock_guard<std::mutex> Guard(Cmd->MBlockedUsersMutex);
+      // update self-event status
+      CmdEvent->setComplete();
+    }
     if (auto NativeEvent = CmdEvent->getHandle()) {
       QueueImpl->getAdapter()->call<UrApiKind::urEventHostSignal>(NativeEvent);
-    } else {
-      {
-        std::lock_guard<std::mutex> Guard(Cmd->MBlockedUsersMutex);
-        // update self-event status
-        CmdEvent->setComplete();
-      }
+    } else
       Scheduler::enqueueUnblockedCommands(Cmd->MBlockedUsers, Lock, ToCleanUp);
-    }
   }
   QueueImpl->revisitUnenqueuedCommandsState(CmdEvent);
 

sycl/unittests/scheduler/InOrderQueueHostTaskDeps.cpp

@@ -83,8 +83,7 @@ template <sycl::backend Backend> void InOrderQueueHostTaskDepsTestBody() {
   InOrderQueue.submit([&](sycl::handler &CGH) { CGH.host_task([=] {}); })
       .wait();
   EXPECT_EQ(EventCreated, Backend == sycl::backend::ext_oneapi_level_zero);
-  EXPECT_EQ(GEventsWaitCounter,
-            1u + size_t(Backend == sycl::backend::ext_oneapi_level_zero));
+  EXPECT_EQ(GEventsWaitCounter, 1u);
   EXPECT_EQ(EventSignaled, Backend == sycl::backend::ext_oneapi_level_zero);
 }