From 01dda0e71615e67ab8fe74f8e3edbea057cf903f Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 15 Jan 2016 15:04:14 -0500 Subject: [PATCH] P4 to Git Change 1228137 by wchau@wchau_WIN_OCL_HSA on 2016/01/15 14:53:24 SWDEV-79308 - Back out changelist 1228064 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#234 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#155 edit --- rocclr/runtime/device/gpu/gpuresource.cpp | 4 ++-- rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpuresource.cpp b/rocclr/runtime/device/gpu/gpuresource.cpp index 0042ae68f4..aa3d1fdf07 100644 --- a/rocclr/runtime/device/gpu/gpuresource.cpp +++ b/rocclr/runtime/device/gpu/gpuresource.cpp @@ -1937,8 +1937,8 @@ ResourceCache::findCalResource(Resource::CalResourceDesc* desc) GslResourceReference* ref = NULL; size_t size = getResourceSize(desc); - // Early exit if resource is too big or it is for scratch buffer - if (size >= cacheSizeLimit_ || desc->skipRsrcCache_ || desc->scratch_ ) { + // Early exit if resource is too big + if (size >= cacheSizeLimit_ || desc->skipRsrcCache_) { //! \note we may need to free the cache here to reduce memory pressure return ref; } diff --git a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index 4256a3cc3d..19de5ed4f9 100644 --- a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -1231,14 +1231,6 @@ CALGSLDevice::calcScratchBufferSize(uint32 regNum) const m_cs->CalcAllScratchBufferSizes(enabledShadersFlag, scratchSpacePerShaderStage, scratchBufferSizes); - - // SWDEV-79308: - // Reduce the total scratch buffer size by a factor of 4, which in effect reducing the - // max. scratch waves from 32 to 8. This will avoid the required total scratch buffer - // size exceeds the available local memory. (Note: the scratch buffer size needs to - // be 64K alignment) - scratchBufferSizes[target] = (scratchBufferSizes[target] >> 2) & 0xFFFF0000; - return scratchBufferSizes[target]; }