Don't pass the host device around

Author: callumfare

unified-runtime/source/adapters/offload/context.hpp

@@ -20,12 +20,9 @@
 struct ur_context_handle_t_ : RefCounted {
   ur_context_handle_t_(ur_device_handle_t hDevice) : Device{hDevice} {
     urDeviceRetain(Device);
-    // For convenience, store the host device in the context
-    OffloadHost = Adapter.HostDevice;
   }
   ~ur_context_handle_t_() { urDeviceRelease(Device); }
 
   ur_device_handle_t Device;
   std::unordered_map<void *, ol_alloc_type_t> AllocTypeMap;
-  ol_device_handle_t OffloadHost;
 };

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

@@ -105,9 +105,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferRead(
 
   void *DevPtr = std::get<BufferMem>(hBuffer->Mem).Ptr;
 
-  olMemcpy(hQueue->OffloadQueue, pDst, hQueue->Context->OffloadHost,
-           DevPtr + offset, hQueue->OffloadDevice, size,
-           phEvent ? &EventOut : nullptr);
+  olMemcpy(hQueue->OffloadQueue, pDst, Adapter.HostDevice, DevPtr + offset,
+           hQueue->OffloadDevice, size, phEvent ? &EventOut : nullptr);
 
   if (blockingRead) {
     olWaitQueue(hQueue->OffloadQueue);
@@ -137,10 +136,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferWrite(
   void *DevPtr = std::get<BufferMem>(hBuffer->Mem).Ptr;
 
   // TODO: olMemcpy src should be const
-  auto Res =
-      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),
+                      Adapter.HostDevice, size, phEvent ? &EventOut : nullptr);
   if (Res) {
     return offloadResultToUR(Res);
   }

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

@@ -13,6 +13,7 @@
 #include <ur/ur.hpp>
 #include <ur_api.h>
 
+#include "adapter.hpp"
 #include "context.hpp"
 #include "device.hpp"
 #include "memory.hpp"
@@ -59,7 +60,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
 
   if (PerformInitialCopy) {
     auto Res = olMemcpy(nullptr, Ptr, OffloadDevice, HostPtr,
-                        hContext->OffloadHost, size, nullptr);
+                        Adapter.HostDevice, size, nullptr);
     if (Res) {
       return offloadResultToUR(Res);
     }

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

@@ -31,7 +31,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urQueueCreate(
   }
 
   Queue->OffloadDevice = hDevice->OffloadDevice;
-  Queue->Context = hContext;
 
   *phQueue = Queue;
 

unified-runtime/source/adapters/offload/queue.hpp

@@ -18,5 +18,4 @@
 struct ur_queue_handle_t_ : RefCounted {
   ol_queue_handle_t OffloadQueue;
   ol_device_handle_t OffloadDevice;
-  ur_context_handle_t Context;
 };