[UR][Offload] Fixes to make offload adapter compile

In response to some changes from upstream LLVM.

Author: RossBrunton

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

@@ -53,12 +53,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
 
   ol_kernel_launch_size_args_t LaunchArgs;
   LaunchArgs.Dimensions = workDim;
-  LaunchArgs.NumGroupsX = GlobalSize[0] / GroupSize[0];
-  LaunchArgs.NumGroupsY = GlobalSize[1] / GroupSize[1];
-  LaunchArgs.NumGroupsZ = GlobalSize[2] / GroupSize[2];
-  LaunchArgs.GroupSizeX = GroupSize[0];
-  LaunchArgs.GroupSizeY = GroupSize[1];
-  LaunchArgs.GroupSizeZ = GroupSize[2];
+  LaunchArgs.NumGroups.x = GlobalSize[0] / GroupSize[0];
+  LaunchArgs.NumGroups.y = GlobalSize[1] / GroupSize[1];
+  LaunchArgs.NumGroups.z = GlobalSize[2] / GroupSize[2];
+  LaunchArgs.GroupSize.x = GroupSize[0];
+  LaunchArgs.GroupSize.y = GroupSize[1];
+  LaunchArgs.GroupSize.z = GroupSize[2];
   LaunchArgs.DynSharedMemory = 0;
 
   ol_event_handle_t EventOut;
@@ -103,7 +103,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferRead(
 
   ol_event_handle_t EventOut = nullptr;
 
-  void *DevPtr = std::get<BufferMem>(hBuffer->Mem).Ptr;
+  char *DevPtr =
+      reinterpret_cast<char *>(std::get<BufferMem>(hBuffer->Mem).Ptr);
 
   olMemcpy(hQueue->OffloadQueue, pDst, Adapter.HostDevice, DevPtr + offset,
            hQueue->OffloadDevice, size, phEvent ? &EventOut : nullptr);
@@ -133,7 +134,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueMemBufferWrite(
 
   ol_event_handle_t EventOut = nullptr;
 
-  void *DevPtr = std::get<BufferMem>(hBuffer->Mem).Ptr;
+  char *DevPtr =
+      reinterpret_cast<char *>(std::get<BufferMem>(hBuffer->Mem).Ptr);
 
   auto Res =
       olMemcpy(hQueue->OffloadQueue, DevPtr + offset, hQueue->OffloadDevice,