P4 to Git Change 1178314 by bdhanase@bala_workpc_ocl on 2015/08/07 16:30:49

EPR #397491 - enable 32 bit opencl 2.0

	http://ocltc.amd.com/reviews/r/8191/

Affected files ...

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

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -295,10 +295,10 @@ Settings::create(
 
         if (ciPlus_) {
             libSelector_ = amd::GPU_Library_CI;
-#if defined(_LP64)
-            oclVersion_ = !reportAsOCL12Device && calAttr.isOpenCL200Device ?
-                XCONCAT(OpenCL, XCONCAT(OPENCL_MAJOR, OPENCL_MINOR)) : OpenCL12;
-#endif
+            if (LP64_SWITCH(WINDOWS_SWITCH(viPlus_, false), true)) {
+                oclVersion_ = !reportAsOCL12Device && calAttr.isOpenCL200Device ?
+                    XCONCAT(OpenCL, XCONCAT(OPENCL_MAJOR, OPENCL_MINOR)) : OpenCL12;
+            }
             if (GPU_FORCE_OCL20_32BIT) {
                 force32BitOcl20_ = true;
                 oclVersion_ = !reportAsOCL12Device && calAttr.isOpenCL200Device ?

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

@@ -209,7 +209,7 @@ CALGSLDevice::open(uint32 gpuIndex, bool enableHighPerformanceState, bool report
     m_dcfg.bEnableSvm.value    = reportAsOCL12Device ? false : OPENCL_MAJOR >= 2;
 
     m_dcfg.bEnableFlatAddressing.hasValue = true;
-#ifdef ATI_BITS_32
+#if defined(ATI_BITS_32) && defined(ATI_OS_LINUX)
     m_dcfg.bEnableFlatAddressing.value    = false;
 #else
     m_dcfg.bEnableFlatAddressing.value    = reportAsOCL12Device ? false : (OPENCL_MAJOR >= 2);