P4 to Git Change 1334942 by gandryey@gera-w8 on 2016/11/01 16:33:53

SWDEV-106446 - OpenCL constant address space limit control
	- Use maxMemAllocSize for the maximum constant buffer size
	http://ocltc.amd.com/reviews/r/11725/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#557 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#23 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -440,7 +440,8 @@ NullDevice::fillDeviceInfo(
     //! should be able to create a view with 256 bytes alignement
     info_.memBaseAddrAlign_ = 8 * MemBaseAlignment;
 
-    info_.maxConstantBufferSize_ = 64 * Ki;
+    info_.maxConstantBufferSize_ =
+        (settings().ciPlus_) ? info_.maxMemAllocSize_ : 64 * Ki;
     info_.maxConstantArgs_       = MaxConstArguments;
 
     // Image support fields

rocclr/runtime/device/pal/paldevice.cpp

@@ -331,7 +331,7 @@ void NullDevice::fillDeviceInfo(
     //! should be able to create a view with 256 bytes alignement
     info_.memBaseAddrAlign_ = 8 * MemBaseAlignment;
 
-    info_.maxConstantBufferSize_ = 64 * Ki;
+    info_.maxConstantBufferSize_ = info_.maxMemAllocSize_;
     info_.maxConstantArgs_       = MaxConstArguments;
 
     // Image support fields

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -810,7 +810,7 @@ Device::populateOCLDeviceConstants()
     info_.minDataTypeAlignSize_ = sizeof(cl_long16);
 
     info_.maxConstantArgs_ = 8;
-    info_.maxConstantBufferSize_ = 64 * 1024;
+    info_.maxConstantBufferSize_ = info_.maxMemAllocSize_;
     info_.localMemType_ = CL_LOCAL;
     info_.errorCorrectionSupport_ = false;
     info_.profilingTimerResolution_ = 1;