CUDA tests exposed secondary bug. Fixed.

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -248,7 +248,7 @@ class __SYCL_EXPORT image_impl final : public SYCLMemObjT {
     RT::PiMemImageDesc Desc;
     Desc.image_type = getImageType();
 
-    // MRange<> is [width], [width,height,width], or [width,height,depth] (which
+    // MRange<> is [width], [width,height], or [width,height,depth] (which
     // is different than MAccessRange, etc in bufffers)
     int x_term_pos = 0, y_term_pos = 1, z_term_pos = 2;
     Desc.image_width = MRange[x_term_pos];

sycl/source/detail/memory_manager.cpp

@@ -460,13 +460,23 @@ void copyD2D(SYCLMemObjI *SYCLMemObj, RT::PiMem SrcMem, QueueImplPtr SrcQueue,
           Queue, SrcMem, DstMem, SrcXOffBytes, DstXOffBytes, SrcARWidthBytes,
           DepEvents.size(), DepEvents.data(), &OutEvent);
     } else {
-      size_t SrcRowPitch   = (1 == DimSrc) ? 0 : SrcSzWidthBytes;
-      size_t SrcSlicePitch =
-          (3 == DimSrc) ? SrcSzWidthBytes * SrcSize[SrcPos.y_term] : 0;
-
-      size_t DstRowPitch   = (1 == DimDst) ? 0 : DstSzWidthBytes;
-      size_t DstSlicePitch =
-          (3 == DimDst) ? DstSzWidthBytes * DstSize[DstPos.y_term] : 0;
+      // size_t SrcRowPitch   = (1 == DimSrc) ? 0 : SrcSzWidthBytes;
+      // size_t SrcSlicePitch = (3 == DimSrc) ? SrcSzWidthBytes *
+      // SrcSize[SrcPos.y_term] : 0; size_t DstRowPitch   = (1 == DimDst) ? 0 :
+      // DstSzWidthBytes; size_t DstSlicePitch = (3 == DimDst) ? DstSzWidthBytes
+      // * DstSize[DstPos.y_term] : 0;
+
+      // passing 0 for pitches not allowed. Because clEnqueueCopyBufferRect will
+      // calculate both src and dest pitch using region[0], which is not correct
+      // if src and dest are not the same size.
+      size_t SrcRowPitch = SrcSzWidthBytes;
+      size_t SrcSlicePitch = (DimSrc <= 1)
+                                 ? SrcSzWidthBytes
+                                 : SrcSzWidthBytes * SrcSize[SrcPos.y_term];
+      size_t DstRowPitch = DstSzWidthBytes;
+      size_t DstSlicePitch = (DimDst <= 1)
+                                 ? DstSzWidthBytes
+                                 : DstSzWidthBytes * DstSize[DstPos.y_term];
 
       pi_buff_rect_offset_struct SrcOrigin{
           SrcXOffBytes, SrcOffset[SrcPos.y_term], SrcOffset[SrcPos.z_term]};