From ad0dc7dd0ef1ab85670e2c679615744f8456e170 Mon Sep 17 00:00:00 2001
From: anusha GodavarthySurya <Anusha.GodavarthySurya@amd.com>
Date: Wed, 20 Oct 2021 03:39:00 -0700
Subject: [PATCH] SWDEV-307642 - Fix memcpy directed tests failure

Change-Id: I7a835a5a519b35fcda813c2acc1ac3cf5d0b5f23


[ROCm/clr commit: 63c679913030d70a444974bd2b65c75882ffcc88]
---
 projects/clr/hipamd/src/hip_graph_helper.hpp |  4 ++--
 projects/clr/hipamd/src/hip_memory.cpp       | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_graph_helper.hpp b/projects/clr/hipamd/src/hip_graph_helper.hpp
index fe8316d2e4..ffd97e01df 100644
--- a/projects/clr/hipamd/src/hip_graph_helper.hpp
+++ b/projects/clr/hipamd/src/hip_graph_helper.hpp
@@ -39,8 +39,8 @@ hipError_t ihipMemset3DCommand(std::vector<amd::Command*>& commands, hipPitchedP
 hipError_t ihipMemcpySymbol_validate(const void* symbol, size_t sizeBytes, size_t offset,
                                      size_t& sym_size, hipDeviceptr_t& device_ptr);
 
-hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D srcOrigin,
-                                  amd::Coord3D dstOrigin, amd::Coord3D copyRegion,
+hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D& srcOrigin,
+                                  amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion,
                                   size_t dstRowPitch, size_t dstSlicePitch, amd::Memory*& dstMemory,
                                   amd::Image*& srcImage, amd::BufferRect& srcRect,
                                   amd::BufferRect& dstRect);
diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index 84ddbecfc7..d3e66c8c41 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -1189,11 +1189,11 @@ hipError_t hipMemcpyDtoHAsync(void* dstHost,
   HIP_RETURN_DURATION(ihipMemcpy(dstHost, srcDevice, ByteCount, hipMemcpyDeviceToHost, *hip::getQueue(stream), true));
 }
 
-hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D srcOrigin,
-                                  amd::Coord3D dstOrigin, amd::Coord3D copyRegion,
-                                  size_t dstRowPitch, size_t dstSlicePitch, amd::Memory*& dstMemory,
-                                  amd::Image*& srcImage, amd::BufferRect& srcRect,
-                                  amd::BufferRect& dstRect) {
+hipError_t ihipMemcpyAtoDValidate(hipArray* srcArray, void* dstDevice, amd::Coord3D& srcOrigin,
+                                  amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion,
+                                  size_t dstRowPitch, size_t dstSlicePitch,
+                                  amd::Memory*& dstMemory, amd::Image*& srcImage,
+                                  amd::BufferRect& srcRect, amd::BufferRect& dstRect) {
   size_t dstOffset = 0;
   dstMemory = getMemoryObject(dstDevice, dstOffset);
   if (srcArray == nullptr || (dstMemory == nullptr)) {
@@ -1608,9 +1608,10 @@ hipError_t ihipMemcpyAtoACommand(amd::Command*& command, hipArray* srcArray, hip
   return hipSuccess;
 }
 
-hipError_t ihipMemcpyHtoAValidate(const void* srcHost, hipArray* dstArray, amd::Coord3D& srcOrigin,
-                                  amd::Coord3D& dstOrigin, amd::Coord3D& copyRegion,
-                                  size_t srcRowPitch, size_t srcSlicePitch, amd::Image*& dstImage,
+hipError_t ihipMemcpyHtoAValidate(const void* srcHost, hipArray* dstArray,
+                                  amd::Coord3D& srcOrigin, amd::Coord3D& dstOrigin,
+                                  amd::Coord3D& copyRegion, size_t srcRowPitch,
+                                  size_t srcSlicePitch, amd::Image*& dstImage,
                                   amd::BufferRect& srcRect) {
   if ((srcHost == nullptr) || dstArray == nullptr) {
     return hipErrorInvalidValue;