Merge branch 'alignHandleWithProducesPiEvent' into HT_user_events_1

Author: KseniyaTikhomirova

sycl/source/detail/scheduler/commands.cpp

@@ -1091,6 +1091,14 @@ void AllocaCommand::emitInstrumentationData() {
 #endif
 }
 
+bool AllocaCommand::producesPiEvent() const {
+  // for reference see enqueueImp()
+  auto TypedSyclMemObj = static_cast<detail::SYCLMemObjT *>(getSYCLMemObj());
+  // Event presence implies interop context esistence
+  return (TypedSyclMemObj->hasInteropEvent() &&
+          (getContext(MQueue) == TypedSyclMemObj->getInteropContext()));
+}
+
 ur_result_t AllocaCommand::enqueueImp() {
   waitForPreparedHostEvents();
   std::vector<EventImplPtr> EventImpls = MPreparedDepsEvents;
@@ -1119,9 +1127,9 @@ ur_result_t AllocaCommand::enqueueImp() {
       Result != UR_RESULT_SUCCESS)
     return Result;
 
-  // MemoryManager::allocate doesn't always provide native event, it is returned
-  // only for interop case with presence of host pointer and interop event. Not
-  // feasible to check it from command.
+  assert((!!UREvent == producesPiEvent()) &&
+         "AllocaCommand: native event is expected only when it is for interop "
+         "memory object with native event provided.");
 
   MEvent->setHandle(UREvent);
   return UR_RESULT_SUCCESS;

sycl/source/detail/scheduler/commands.hpp

@@ -501,6 +501,7 @@ class AllocaCommand : public AllocaCommandBase {
   void *getMemAllocation() const final { return MMemAllocation; }
   void printDot(std::ostream &Stream) const final;
   void emitInstrumentationData() override;
+  bool producesPiEvent() const final;
 
 private:
   ur_result_t enqueueImp() final;

sycl/source/detail/sycl_mem_obj_t.cpp

@@ -244,6 +244,10 @@ void SYCLMemObjT::handleWriteAccessorCreation() {
   }
 }
 
+bool SYCLMemObjT::hasInteropEvent() const {
+  return MInteropEvent && MInteropEvent->getHandle();
+}
+
 } // namespace detail
 } // namespace _V1
 } // namespace sycl

sycl/source/detail/sycl_mem_obj_t.hpp

@@ -159,6 +159,8 @@ class SYCLMemObjT : public SYCLMemObjI {
     MHostPtrProvided = true;
   }
 
+  bool hasInteropEvent() const;
+
 protected:
   void updateHostMemory(void *const Ptr);