From 8a5b61532e8306fede23f192ef2449000740eef8 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 14 Jun 2019 07:21:02 -0400 Subject: [PATCH] P4 to Git Change 1826843 by kjayapra@0_HIPWS_LNX1_ROCM on 2019/06/13 19:24:25 SWDEV-191674 - Handling cases where p2p memcpy is initiated from device 1. (No Large Bar/P2P staging). Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#136 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#77 edit --- rocclr/runtime/device/pal/palvirtual.cpp | 4 ++-- rocclr/runtime/device/rocm/rocvirtual.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rocclr/runtime/device/pal/palvirtual.cpp b/rocclr/runtime/device/pal/palvirtual.cpp index 30b9b185a2..e1a7b5bebb 100644 --- a/rocclr/runtime/device/pal/palvirtual.cpp +++ b/rocclr/runtime/device/pal/palvirtual.cpp @@ -1746,8 +1746,8 @@ void VirtualGPU::submitCopyMemoryP2P(amd::CopyMemoryP2PCommand& cmd) { amd::Coord3D cpSize(copy_size); // Perform 2 step transfer with staging buffer - result &= - dev().xferMgr().copyBuffer(*srcDevMem, *dstStgMem, srcOrigin, stageOffset, cpSize); + result &= srcDevMem->dev().xferMgr().copyBuffer(*srcDevMem, *dstStgMem, srcOrigin, + stageOffset, cpSize); srcOrigin.c[0] += copy_size; result &= dstDevMem->dev().xferMgr().copyBuffer(*srcStgMem, *dstDevMem, stageOffset, dstOrigin, cpSize); diff --git a/rocclr/runtime/device/rocm/rocvirtual.cpp b/rocclr/runtime/device/rocm/rocvirtual.cpp index 982ba4a070..a5be1940bf 100644 --- a/rocclr/runtime/device/rocm/rocvirtual.cpp +++ b/rocclr/runtime/device/rocm/rocvirtual.cpp @@ -1309,7 +1309,7 @@ void VirtualGPU::submitCopyMemoryP2P(amd::CopyMemoryP2PCommand& cmd) { amd::Coord3D cpSize(copy_size); // Perform 2 step transfer with staging buffer - result &= dev().xferMgr().copyBuffer( + result &= srcDevMem->dev().xferMgr().copyBuffer( *srcDevMem, *dstStgMem, srcOrigin, stageOffset, cpSize); srcOrigin.c[0] += copy_size; result &= dstDevMem->dev().xferMgr().copyBuffer(