P4 to Git Change 1337009 by gandryey@gera-w8 on 2016/11/04 18:04:52

SWDEV-79445 - OCL generic changes and code clean-up
	- Use uint64_t for the scratch buffer size calculation

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#558 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#162 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#175 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#13 edit

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

@@ -1263,7 +1263,7 @@ CALGSLDevice::GetCopyType(
     return type;
 }
 
-uint32
+uint64
 CALGSLDevice::calcScratchBufferSize(uint32 regNum) const
 {
     gslProgramTargetEnum target = GSL_COMPUTE_PROGRAM;
@@ -1290,13 +1290,11 @@ CALGSLDevice::calcScratchBufferSize(uint32 regNum) const
     //   be 64K alignment)
     if (scratchBufferSizes[target] > 0)
     {
-        scratchBufferSizes[target] = (scratchBufferSizes[target] >> 2) & 0xFFFF0000;
+        scratchBufferSizes[target] = (scratchBufferSizes[target] >> 2);
 
         if (scratchBufferSizes[target] == 0) {  // assign minimum scratch buffer size of 64K
             scratchBufferSizes[target] = 0x10000;
         }
-
-        assert(scratchBufferSizes[target] <= 0xFFFFFFFF);     // scratch buffer size < 4GB
     }
 
     return scratchBufferSizes[target];