From 884cf38d012ab6de86c2f795b87f439091486e74 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 25 Jul 2016 16:08:09 -0400 Subject: [PATCH] P4 to Git Change 1295077 by gandryey@gera-w8 on 2016/07/25 15:54:39 SWDEV-95007 - OpenCL on PAL (Windows) - Fix buffer rect copy when bytesPerElement>1 - Report the number of banks to avoid OCLtst failure Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#8 edit [ROCm/clr commit: 594dcef8a41ecf115ab732c164a3e9fcf54ba652] --- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 2 +- projects/clr/rocclr/runtime/device/pal/palresource.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index f778072da9..75feb57feb 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -463,7 +463,7 @@ void NullDevice::fillDeviceInfo( info_.simdInstructionWidth_ = hwInfo()->simdInstructionWidth_; info_.wavefrontWidth_ = palProp.gfxipProperties.shaderCore.wavefrontSize; info_.globalMemChannels_ = palProp.gpuMemoryProperties.performance.vramBusBitWidth / 32; - //info_.globalMemChannelBanks_ = calAttr.numMemBanks; + info_.globalMemChannelBanks_ = 4; info_.globalMemChannelBankWidth_ = hwInfo()->memChannelBankWidth_; info_.localMemSizePerCU_ = hwInfo()->localMemSizePerCU_; info_.localMemBanks_ = hwInfo()->localMemBanks_; diff --git a/projects/clr/rocclr/runtime/device/pal/palresource.cpp b/projects/clr/rocclr/runtime/device/pal/palresource.cpp index ba57a7f1c8..94efefcec4 100644 --- a/projects/clr/rocclr/runtime/device/pal/palresource.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palresource.cpp @@ -1238,7 +1238,7 @@ Resource::partialMemCopyTo( copyRegion.srcBuffer.offset = calSrcOrigin[0] + offset(); copyRegion.srcBuffer.rowPitch = calSrcOrigin[1]; copyRegion.srcBuffer.depthPitch = calSrcOrigin[2]; - copyRegion.extent.width = calSize[0]; + copyRegion.extent.width = calSize[0] / bytesPerElement; copyRegion.extent.height = calSize[1]; copyRegion.extent.depth = calSize[2]; copyRegion.dstBuffer.format.chFmt = ChannelFmt(bytesPerElement);