From 4fcd18fd5ce12e5cd419e3fb6e6b6fad0f4e9cbc Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 26 Jul 2018 13:08:44 -0400 Subject: [PATCH] P4 to Git Change 1585929 by asalmanp@asalmanp-ocl-stg on 2018/07/26 12:26:11 SWDEV-132899 - [OCL][GFX10] removing gfx1001 (target for Navi10 Lite if xnack is enabled) starting from gfx10, we will use the same target (e.g., gfx1000) no matter if xnack is enabled/disbaled and we pass "-xnack" option to Finalizer if xnack is enabled on the target ReviewURLBoard = http://ocltc.amd.com/reviews/r/15492/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#37 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#99 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#64 edit [ROCm/clr commit: 9ddfeef105f6494e53fd25fbfa497b6e6db401d2] --- projects/clr/rocclr/runtime/device/pal/paldefs.hpp | 2 +- projects/clr/rocclr/runtime/device/pal/paldevice.cpp | 1 - projects/clr/rocclr/runtime/device/pal/palprogram.cpp | 9 +++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index 8267bc44c2..658eb17418 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp @@ -174,7 +174,7 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = { /* Raven2 XNACK */{ LIGHTNING_SWITCH("gfx902","gfx903"), LIGHTNING_SWITCH("gfx902","gfx903"), 4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(902, 903), true}, /* Navi10 */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000, false}, - /* Navi10 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1001, true}, + /* Navi10 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000, true}, }; // Supported OpenCL versions diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp index 3a8bb5388a..d98a76c0b4 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp +++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp @@ -191,7 +191,6 @@ bool NullDevice::init() { case 906: revision = Pal::AsicRevision::Vega20; break; - case 1001: case 1000: revision = Pal::AsicRevision::Navi10; break; diff --git a/projects/clr/rocclr/runtime/device/pal/palprogram.cpp b/projects/clr/rocclr/runtime/device/pal/palprogram.cpp index 13aee5af1f..2be859a4c3 100644 --- a/projects/clr/rocclr/runtime/device/pal/palprogram.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palprogram.cpp @@ -600,8 +600,13 @@ bool HSAILProgram::linkImpl(amd::option::Options* options) { if (dev().settings().svmFineGrainSystem_) { fin_options.append(" -sc-xnack-iommu"); } - if (dev().settings().gfx10Plus_ && GPU_FORCE_WAVE_SIZE_32) { - fin_options.append(" -force-wave-size-32"); + if (dev().settings().gfx10Plus_) { + if (GPU_FORCE_WAVE_SIZE_32) { + fin_options.append(" -force-wave-size-32"); + } + if (dev().hwInfo()->xnackEnabled_) { + fin_options.append(" -xnack"); + } } errorCode = aclCompile(dev().compiler(), binaryElf_, fin_options.c_str(), ACL_TYPE_CG,