Address review comments

Author: againull

sycl/source/detail/event_impl.cpp

@@ -153,7 +153,6 @@ const AdapterPtr &event_impl::getAdapter() {
 void event_impl::setStateIncomplete() { MState = HES_NotComplete; }
 
 void event_impl::setContextImpl(const ContextImplPtr &Context) {
-  MIsHostEvent = Context == nullptr;
   MContext = Context;
 }
 
@@ -208,12 +207,7 @@ void event_impl::initHostProfilingInfo() {
   assert(QueuePtr->MIsProfilingEnabled && "Queue must have profiling enabled");
 
   MIsProfilingEnabled = true;
-  MHostProfilingInfo.reset(new HostProfilingInfo());
-  if (!MHostProfilingInfo)
-    throw sycl::exception(sycl::make_error_code(sycl::errc::runtime),
-                          "Out of host memory " +
-                              codeToString(UR_RESULT_ERROR_OUT_OF_HOST_MEMORY));
-
+  MHostProfilingInfo = std::make_unique<HostProfilingInfo>();
   device_impl &Device = QueuePtr->getDeviceImpl();
   MHostProfilingInfo->setDevice(&Device);
 }
@@ -620,9 +614,6 @@ bool event_impl::isCompleted() {
 
 void event_impl::setCommand(void *Cmd) {
   MCommand = Cmd;
-  auto TypedCommand = static_cast<Command *>(Cmd);
-  if (TypedCommand)
-    MIsHostEvent = TypedCommand->getWorkerContext() == nullptr;
 }
 
 } // namespace detail

sycl/source/detail/scheduler/commands.cpp

@@ -1956,13 +1956,15 @@ ExecCGCommand::ExecCGCommand(
               Dependencies),
       MEventNeeded(EventNeeded), MCommandGroup(std::move(CommandGroup)) {
   if (MCommandGroup->getType() == detail::CGType::CodeplayHostTask) {
-    const auto &SubmitQueue =
-        static_cast<detail::CGHostTask *>(MCommandGroup.get())->MQueue;
-    MEvent->setSubmittedQueue(SubmitQueue);
+    queue_impl *SubmitQueue =
+        static_cast<detail::CGHostTask *>(MCommandGroup.get())->MQueue.get();
+    assert(SubmitQueue &&
+           "Host task command group must have a valid submit queue");
+
+    MEvent->setSubmittedQueue(SubmitQueue->weak_from_this());
     // Initialize host profiling info if the queue has profiling enabled.
-    if (SubmitQueue && SubmitQueue->MIsProfilingEnabled) {
+    if (SubmitQueue->MIsProfilingEnabled)
       MEvent->initHostProfilingInfo();
-    }
   }
   if (MCommandGroup->getType() == detail::CGType::ProfilingTag)
     MEvent->markAsProfilingTagEvent();