[UR][Offload] Port to new event interface (#19578)

Author: RossBrunton

unified-runtime/source/adapters/offload/enqueue.cpp

@@ -67,17 +67,18 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
   LaunchArgs.GroupSize.z = GroupSize[2];
   LaunchArgs.DynSharedMemory = 0;
 
-  ol_event_handle_t EventOut;
   ol_queue_handle_t Queue;
   OL_RETURN_ON_ERR(hQueue->nextQueue(Queue));
-  OL_RETURN_ON_ERR(
-      olLaunchKernel(Queue, hQueue->OffloadDevice, hKernel->OffloadKernel,
-                     hKernel->Args.getStorage(), hKernel->Args.getStorageSize(),
-                     &LaunchArgs, &EventOut));
+  OL_RETURN_ON_ERR(olLaunchKernel(
+      Queue, hQueue->OffloadDevice, hKernel->OffloadKernel,
+      hKernel->Args.getStorage(), hKernel->Args.getStorageSize(), &LaunchArgs));
 
   if (phEvent) {
     auto *Event = new ur_event_handle_t_(UR_COMMAND_KERNEL_LAUNCH, hQueue);
-    Event->OffloadEvent = EventOut;
+    if (auto Res = olCreateEvent(Queue, &Event->OffloadEvent)) {
+      delete Event;
+      return offloadResultToUR(Res);
+    };
     *phEvent = Event;
   }
   return UR_RESULT_SUCCESS;
@@ -108,22 +109,24 @@ ur_result_t doMemcpy(ur_command_t Command, ur_queue_handle_t hQueue,
   //
 
   if (blocking) {
-    OL_RETURN_ON_ERR(olMemcpy(nullptr, DestPtr, DestDevice, SrcPtr, SrcDevice,
-                              size, nullptr));
+    OL_RETURN_ON_ERR(
+        olMemcpy(nullptr, DestPtr, DestDevice, SrcPtr, SrcDevice, size));
     if (phEvent) {
       *phEvent = ur_event_handle_t_::createEmptyEvent(Command, hQueue);
     }
     return UR_RESULT_SUCCESS;
   }
 
-  ol_event_handle_t EventOut = nullptr;
   ol_queue_handle_t Queue;
   OL_RETURN_ON_ERR(hQueue->nextQueue(Queue));
-  OL_RETURN_ON_ERR(olMemcpy(Queue, DestPtr, DestDevice, SrcPtr, SrcDevice, size,
-                            phEvent ? &EventOut : nullptr));
+  OL_RETURN_ON_ERR(
+      olMemcpy(Queue, DestPtr, DestDevice, SrcPtr, SrcDevice, size));
   if (phEvent) {
     auto *Event = new ur_event_handle_t_(Command, hQueue);
-    Event->OffloadEvent = EventOut;
+    if (auto Res = olCreateEvent(Queue, &Event->OffloadEvent)) {
+      delete Event;
+      return offloadResultToUR(Res);
+    };
     *phEvent = Event;
   }
 

unified-runtime/source/adapters/offload/memory.cpp

@@ -57,7 +57,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
 
   if (PerformInitialCopy) {
     OL_RETURN_ON_ERR(olMemcpy(nullptr, Ptr, OffloadDevice, HostPtr,
-                              Adapter->HostDevice, size, nullptr));
+                              Adapter->HostDevice, size));
   }
 
   *phBuffer = URMemObj.release();