From 5b7c1dd22c44da79e1645eebc443cff84f743589 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Wed, 23 Jul 2014 10:21:39 -0400
Subject: [PATCH] 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
---
 rocclr/runtime/device/gpu/gpudevice.cpp   | 7 ++-----
 rocclr/runtime/device/gpu/gpusettings.cpp | 2 +-
 rocclr/runtime/utils/flags.hpp            | 4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index 35590b04e2..025322fa8c 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/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;
diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index b8efa502e4..580976e51a 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/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;
     }
 
diff --git a/rocclr/runtime/utils/flags.hpp b/rocclr/runtime/utils/flags.hpp
index cd6a0ede56..a36f7ea156 100644
--- a/rocclr/runtime/utils/flags.hpp
+++ b/rocclr/runtime/utils/flags.hpp
@@ -159,9 +159,7 @@ release(bool, ENVVAR_HSA_POLL_KERNEL_COMPLETION, false,                       \
 release(bool, HSA_LOCAL_MEMORY_ENABLE, false,                                 \
         "Enable HSA device local memory usage")                               \
 release(bool, HSA_ENABLE_ATOMICS_32B, false,                                  \
-        "1 = Enable SVM atomics in 32 bits (HSA backend-only). Any other value keeps then disabled.") \
-release(bool, ENABLE_PLATFORM_ATOMICS, false,                \
-        "Enable platform atomics")
+        "1 = Enable SVM atomics in 32 bits (HSA backend-only). Any other value keeps then disabled.")
 
 namespace amd {