From 0aa5b591fcb3cd88f502dd6ffe73262627003e16 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 18 Mar 2019 21:59:50 -0400 Subject: [PATCH] P4 to Git Change 1757990 by asalmanp@asalmanp-ocl-stg on 2019/03/18 21:40:52 SWDEV-132899 - [OCL][GFX10] passing "force-wgp-mode" option to Finalizer to enable WGP mode by default on gfx10+ and allow GPU_ENABLE_WGP_MODE to control the WGP/CU mode for HSAIL/SC path as well. - also for Ariel (Navi10Lite) the wave32 should be disabled in LC but allow GPU_ENABLE_WAVE32_MODE control it for testing if needed. ReviewrequestURL = http://ocltc.amd.com/reviews/r/16926/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#34 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#70 edit --- rocclr/runtime/device/devprogram.cpp | 4 ++++ rocclr/runtime/device/pal/palsettings.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp index fc5b278487..532b7c2886 100644 --- a/rocclr/runtime/device/devprogram.cpp +++ b/rocclr/runtime/device/devprogram.cpp @@ -1857,6 +1857,10 @@ bool Program::linkImplHSAIL(amd::option::Options* options) { fin_options.append(" -force-wave-size-32"); } + if (device().settings().enableWgpMode_) { + fin_options.append(" -force-wgp-mode"); + } + if (device().settings().hsailExplicitXnack_) { fin_options.append(" -xnack"); } diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp index 4fba0649b5..1e9d19220d 100644 --- a/rocclr/runtime/device/pal/palsettings.cpp +++ b/rocclr/runtime/device/pal/palsettings.cpp @@ -193,16 +193,16 @@ bool Settings::create(const Pal::DeviceProperties& palProp, gfx10Plus_ = true; hsailExplicitXnack_ = static_cast(palProp.gpuMemoryProperties.flags.pageMigrationEnabled || palProp.gpuMemoryProperties.flags.iommuv2Support); - enableWgpMode_ = GPU_ENABLE_WGP_MODE || !useLightning_; + enableWgpMode_ = GPU_ENABLE_WGP_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; } + if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) { + enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE; + } lcWavefrontSize64_ = !enableWave32Mode_; // Fall through to AI (gfx9) ... case Pal::AsicRevision::Vega20: