From 46ffad2bc5a2e0802a464205c2e6878cdff0e015 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Tue, 19 Mar 2019 15:43:32 -0400
Subject: [PATCH] P4 to Git Change 1758488 by asalmanp@asalmanp-ocl-stg on
 2019/03/19 15:18:18

	SWDEV-132899 - [OCL][GFX10] add "wavefrontsize64" to the linkOptions if they had previously been added to the compile options

	ReviewRequestURL = http://ocltc.amd.com/reviews/r/16966/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#35 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#71 edit
---
 rocclr/runtime/device/devprogram.cpp      | 3 +++
 rocclr/runtime/device/pal/palsettings.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp
index 532b7c2886..51511f65c7 100644
--- a/rocclr/runtime/device/devprogram.cpp
+++ b/rocclr/runtime/device/devprogram.cpp
@@ -1449,6 +1449,9 @@ bool Program::linkImplLC(amd::option::Options* options) {
     if (options->oVariables->UnsafeMathOpt || options->oVariables->FastRelaxedMath) {
         linkOptions += "unsafe_math,";
     }
+    if (device().settings().lcWavefrontSize64_) {
+        linkOptions += "wavefrontsize64,";
+    }
     if (!linkOptions.empty()) {
         linkOptions.pop_back();     // remove the last comma
     }
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 1e9d19220d..54887d0253 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -143,7 +143,7 @@ Settings::Settings() {
   enableWgpMode_ = false;
   enableWave32Mode_ = false;
   hsailExplicitXnack_ = false;
-  lcWavefrontSize64_ = false;
+  lcWavefrontSize64_ = true;
 }
 
 bool Settings::create(const Pal::DeviceProperties& palProp,