P4 to Git Change 1226990 by johtaylo@johtaylo_L7_stg on 2016/01/12 17:44:18

SWDEV-79308 -  Back out changelist 1226881

	Causes failures in execution model, math and pipes

	http://ocltc.amd.com:8111/viewLog.html?buildId=14142599&tab=buildResultsDiv&buildTypeId=TestsOpenCLScSanity_BonaireConformanceWin764bit

	Reduce the total scratch buffer size by a factor of 4, which in effect reducing the max. scratch waves from 32 to 8, to avoid the required total scratch buffer
	size exceeds the available local memory.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#153 edit

rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -1231,13 +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.
-    scratchBufferSizes[target] >>= 2;
-
     return scratchBufferSizes[target];
 }