P4 to Git Change 1058301 by weizhang@msdnweizhang-opencl on 2014/07/23 10:08:38

EPR #397491 - Enable platform atomics in stg but not in mainline.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#450 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#272 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#207 edit


[ROCm/clr commit: 5b7c1dd22c]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -618,11 +618,8 @@ void Device::fillDeviceInfo(
 
     info_.executionCapabilities_     = CL_EXEC_KERNEL;
     if (settings().oclVersion_ >= OpenCL20) {
-        info_.svmCapabilities_       = 
-        CL_DEVICE_SVM_COARSE_GRAIN_BUFFER;
-        if (settings().svmAtomics_) {
-            info_.svmCapabilities_ |= CL_DEVICE_SVM_ATOMICS;
-        }
+        info_.svmCapabilities_       = CL_DEVICE_SVM_COARSE_GRAIN_BUFFER;
+
     }
     info_.preferredPlatformAtomicAlignment_ = 0;
     info_.preferredGlobalAtomicAlignment_ = 0;

projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp

@@ -417,7 +417,7 @@ Settings::create(
         disablePersistent_ = true;
     }
 
-    if (calAttr.priSupport && ENABLE_PLATFORM_ATOMICS) {
+    if (calAttr.priSupport) {
         svmAtomics_ = true;
     }