Fixed crashes, but results are incorrect

Author: AlexeySachkov

sycl/source/handler.cpp

@@ -1851,21 +1851,10 @@ void handler::ext_oneapi_copy(
   MSrcPtr = const_cast<void *>(Src);
   MDstPtr = Dest;
 
-  ur_exp_image_copy_flags_t ImageCopyFlags = detail::getUrImageCopyFlags(
-      get_pointer_type(Src,
-                       createSyclObjFromImpl<context>(impl->get_context())),
-      get_pointer_type(Dest,
-                       createSyclObjFromImpl<context>(impl->get_context())));
-
-  if (ImageCopyFlags == UR_EXP_IMAGE_COPY_FLAG_DEVICE_TO_DEVICE ||
-      ImageCopyFlags == UR_EXP_IMAGE_COPY_FLAG_HOST_TO_HOST) {
-    detail::fill_copy_args(get_impl(), SrcImgDesc, DestImgDesc, ImageCopyFlags,
-                           SrcRowPitch, DestRowPitch);
-  } else {
-    throw sycl::exception(make_error_code(errc::invalid),
-                          "Copy Error: This copy function only performs device "
-                          "to device or host to host copies!");
-  }
+  ur_exp_image_copy_flags_t ImageCopyFlags =
+      UR_EXP_IMAGE_COPY_FLAG_HOST_TO_HOST;
+  detail::fill_copy_args(get_impl(), SrcImgDesc, DestImgDesc, ImageCopyFlags,
+                         SrcRowPitch, DestRowPitch);
 
   setType(detail::CGType::CopyImage);
 }
@@ -1880,22 +1869,11 @@ void handler::ext_oneapi_copy(
   MSrcPtr = const_cast<void *>(Src);
   MDstPtr = Dest;
 
-  ur_exp_image_copy_flags_t ImageCopyFlags = detail::getUrImageCopyFlags(
-      get_pointer_type(Src,
-                       createSyclObjFromImpl<context>(impl->get_context())),
-      get_pointer_type(Dest,
-                       createSyclObjFromImpl<context>(impl->get_context())));
-
-  if (ImageCopyFlags == UR_EXP_IMAGE_COPY_FLAG_DEVICE_TO_DEVICE ||
-      ImageCopyFlags == UR_EXP_IMAGE_COPY_FLAG_HOST_TO_HOST) {
-    detail::fill_copy_args(get_impl(), SrcImgDesc, DestImgDesc, ImageCopyFlags,
-                           SrcRowPitch, DestRowPitch, SrcOffset, {0, 0, 0},
-                           DestOffset, {0, 0, 0}, CopyExtent);
-  } else {
-    throw sycl::exception(make_error_code(errc::invalid),
-                          "Copy Error: This copy function only performs device "
-                          "to device or host to host copies!");
-  }
+  ur_exp_image_copy_flags_t ImageCopyFlags =
+      UR_EXP_IMAGE_COPY_FLAG_HOST_TO_HOST;
+  detail::fill_copy_args(get_impl(), SrcImgDesc, DestImgDesc, ImageCopyFlags,
+                         SrcRowPitch, DestRowPitch, SrcOffset, {0, 0, 0},
+                         DestOffset, {0, 0, 0}, CopyExtent);
 
   setType(detail::CGType::CopyImage);
 }

unified-runtime/source/adapters/level_zero/image_common.cpp

@@ -882,6 +882,30 @@ ur_result_t bindlessImagesHandleCopyFlags(
 
     return UR_RESULT_SUCCESS;
   };
+  case UR_EXP_IMAGE_COPY_FLAG_HOST_TO_HOST: {
+      // Copy between pitched USM regions
+      uint32_t DstRowPitch = pDstImageDesc->rowPitch;
+      uint32_t SrcRowPitch = pSrcImageDesc->rowPitch;
+      ze_copy_region_t ZeDstRegion = {(uint32_t)pCopyRegion->dstOffset.x,
+                                      (uint32_t)pCopyRegion->dstOffset.y,
+                                      (uint32_t)pCopyRegion->dstOffset.z,
+                                      DstRowPitch,
+                                      (uint32_t)pCopyRegion->copyExtent.height,
+                                      (uint32_t)pCopyRegion->copyExtent.depth};
+      ze_copy_region_t ZeSrcRegion = {(uint32_t)pCopyRegion->srcOffset.x,
+                                      (uint32_t)pCopyRegion->srcOffset.y,
+                                      (uint32_t)pCopyRegion->srcOffset.z,
+                                      SrcRowPitch,
+                                      (uint32_t)pCopyRegion->copyExtent.height,
+                                      (uint32_t)pCopyRegion->copyExtent.depth};
+      uint32_t DstSlicePitch = DstRowPitch * pDstImageDesc->height;
+      uint32_t SrcSlicePitch = SrcRowPitch * pSrcImageDesc->height;
+      ZE2UR_CALL(zeCommandListAppendMemoryCopyRegion,
+                 (ZeCommandList, pDst, &ZeDstRegion, DstRowPitch, DstSlicePitch,
+                  pSrc, &ZeSrcRegion, SrcRowPitch, SrcSlicePitch, zeSignalEvent,
+                  numWaitEvents, phWaitEvents));
+      return UR_RESULT_SUCCESS;
+  };
   default:
     UR_LOG(ERR, "ur_queue_immediate_in_order_t::bindlessImagesImageCopyExp: "
                 "unexpected imageCopyFlags");