From 4627dc551c019224c91ea2fbcad48742acce66b3 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 7 Jul 2014 22:23:03 -0400
Subject: [PATCH] P4 to Git Change 1052889 by weizhang@msdnweizhang-opencl on
 2014/07/07 22:09:14

	EPR #397491 - Disable platform atomics temporarily until AFE which will be done on July 8.

	Modify the flag of GPU_ENABLE_HIGH_PERFORMANCE_STATE to use it for platform atomics because GPU_ENABLE_HIGH_PERFORMANCE_STATE is not necessary for high clock anymore.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#271 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#206 edit


[ROCm/clr commit: 2677e086a7d2c8da06b7194d1d8d95f3c88204a2]
---
 projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp | 2 +-
 projects/clr/rocclr/runtime/utils/flags.hpp            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 580976e51a..b8efa502e4 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -417,7 +417,7 @@ Settings::create(
         disablePersistent_ = true;
     }
 
-    if (calAttr.priSupport) {
+    if (calAttr.priSupport && ENABLE_PLATFORM_ATOMICS) {
         svmAtomics_ = true;
     }
 
diff --git a/projects/clr/rocclr/runtime/utils/flags.hpp b/projects/clr/rocclr/runtime/utils/flags.hpp
index 8bea06f379..cd6a0ede56 100644
--- a/projects/clr/rocclr/runtime/utils/flags.hpp
+++ b/projects/clr/rocclr/runtime/utils/flags.hpp
@@ -160,8 +160,8 @@ 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_on_stg(bool, GPU_ENABLE_HIGH_PERFORMANCE_STATE, false,                \
-        "Enable high performance state")
+release(bool, ENABLE_PLATFORM_ATOMICS, false,                \
+        "Enable platform atomics")
 
 namespace amd {