From 91849cb26d8559f85bef9d84dc879048d0c2b604 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 9 Apr 2015 12:00:40 -0400
Subject: [PATCH] P4 to Git Change 1139001 by jatang@jatang-ocl-lnx3 on
 2015/04/09 11:50:11

	EPR #412821 - Disable ThreadTrace for SI for now.

	There's hang on some SI (Verde). So only enable ThreadTrace for CI+ for now.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#308 edit
---
 rocclr/runtime/device/gpu/gpusettings.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index d9aa96455c..ce05989925 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -269,6 +269,7 @@ Settings::create(
         ciPlus_ = true;
         sdmaProfiling_ = true;
         hsail_ = GPU_HSAIL_ENABLE;
+        threadTraceEnable_ = AMD_THREAD_TRACE_ENABLE;
         // Fall through to SI ...
     case CAL_TARGET_PITCAIRN:
     case CAL_TARGET_CAPEVERDE:
@@ -347,9 +348,6 @@ Settings::create(
 
         rectLinearDMA_  = true;
 
-        if (AMD_THREAD_TRACE_ENABLE) {
-            threadTraceEnable_ = true;
-        }
         // Disable non-aliased(multiUAV) optimization
         assumeAliases_ = true;
         break;