Check ol* results

Author: callumfare

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

@@ -137,12 +137,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferWrite(
   void *DevPtr = std::get<BufferMem>(hBuffer->Mem).Ptr;
 
   // TODO: olMemcpy src should be const
-  olMemcpy(hQueue->OffloadQueue, DevPtr + offset, hQueue->OffloadDevice,
-           const_cast<void *>(pSrc), hQueue->Context->OffloadHost, size,
-           phEvent ? &EventOut : nullptr);
+  auto Res =
+      olMemcpy(hQueue->OffloadQueue, DevPtr + offset, hQueue->OffloadDevice,
+               const_cast<void *>(pSrc), hQueue->Context->OffloadHost, size,
+               phEvent ? &EventOut : nullptr);
+  if (Res) {
+    return offloadResultToUR(Res);
+  }
 
   if (blockingWrite) {
-    olWaitQueue(hQueue->OffloadQueue);
+    auto Res = olWaitQueue(hQueue->OffloadQueue);
+    if (Res) {
+      return offloadResultToUR(Res);
+    }
   }
 
   if (phEvent) {

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

@@ -16,6 +16,7 @@
 #include "context.hpp"
 #include "device.hpp"
 #include "memory.hpp"
+#include "ur2offload.hpp"
 
 UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
     ur_context_handle_t hContext, ur_mem_flags_t flags, size_t size,
@@ -33,14 +34,20 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
   auto AllocMode = BufferMem::AllocMode::Default;
 
   if (flags & UR_MEM_FLAG_ALLOC_HOST_POINTER) {
-    olMemAlloc(OffloadDevice, OL_ALLOC_TYPE_HOST, size, &HostPtr);
+    auto Res = olMemAlloc(OffloadDevice, OL_ALLOC_TYPE_HOST, size, &HostPtr);
+    if (Res) {
+      return offloadResultToUR(Res);
+    }
     // TODO: We (probably) need something like cuMemHostGetDevicePointer
     // for this to work everywhere. For now assume the managed host pointer is
     // device-accessible.
     Ptr = HostPtr;
     AllocMode = BufferMem::AllocMode::AllocHostPtr;
   } else {
-    olMemAlloc(OffloadDevice, OL_ALLOC_TYPE_DEVICE, size, &Ptr);
+    auto Res = olMemAlloc(OffloadDevice, OL_ALLOC_TYPE_DEVICE, size, &Ptr);
+    if (Res) {
+      return offloadResultToUR(Res);
+    }
     if (flags & UR_MEM_FLAG_ALLOC_COPY_HOST_POINTER) {
       AllocMode = BufferMem::AllocMode::CopyIn;
     }
@@ -51,8 +58,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
       hContext, ParentBuffer, flags, AllocMode, Ptr, HostPtr, size});
 
   if (PerformInitialCopy) {
-    olMemcpy(nullptr, Ptr, OffloadDevice, HostPtr, hContext->OffloadHost, size,
-             nullptr);
+    auto Res = olMemcpy(nullptr, Ptr, OffloadDevice, HostPtr,
+                        hContext->OffloadHost, size, nullptr);
+    if (Res) {
+      return offloadResultToUR(Res);
+    }
   }
 
   *phBuffer = URMemObj.release();
@@ -74,7 +84,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemRelease(ur_mem_handle_t hMem) {
   if (hMem->MemType == ur_mem_handle_t_::Type::Buffer) {
     // TODO: Handle registered host memory
     auto &BufferImpl = std::get<BufferMem>(MemObjPtr->Mem);
-    olMemFree(BufferImpl.Ptr);
+    auto Res = olMemFree(BufferImpl.Ptr);
+    if (Res) {
+      return offloadResultToUR(Res);
+    }
   }
 
   return UR_RESULT_SUCCESS;