From 175fd957afde251f5bfb023a8a95547367e3ecad Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 4 Feb 2019 08:00:12 -0500 Subject: [PATCH] P4 to Git Change 1739436 by asalmanp@asalmanp-ocl-stg on 2019/02/04 07:47:06 SWDEV-178459 - Navi10 Regression in driver builds with OpenCL v2811.3 causing issues with several OpenCL apps and workloads Switch to Wave64 for HSAIL/SC path for now as the Wave32 in HSAIL/SC path causes multiple regressions and some OCL apps cannot be run ReviewBoardURL = http://ocltc.amd.com/reviews/r/16662/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#66 edit [ROCm/clr commit: c33c249cf10b9ab2a6152185d62587884bc5dd9d] --- projects/clr/rocclr/runtime/device/pal/palsettings.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp index b96eb2d980..89dffbcfa8 100644 --- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp @@ -192,7 +192,12 @@ bool Settings::create(const Pal::DeviceProperties& palProp, hsailExplicitXnack_ = static_cast(palProp.gpuMemoryProperties.flags.pageMigrationEnabled || palProp.gpuMemoryProperties.flags.iommuv2Support); enableWgpMode_ = GPU_ENABLE_WGP_MODE || !useLightning_; - enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE; + if (useLightning_) { + enableWave32Mode_ = true; + } + if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) { + enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE; + } if (palProp.revision == Pal::AsicRevision::Navi10Lite && useLightning_) { enableWave32Mode_ = false; }