From 3e0337a1a8cfa7658efef608605a08b2f098ce24 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 4 Jan 2018 15:15:23 -0500 Subject: [PATCH] P4 to Git Change 1500053 by asalmanp@asalmanp-ocl-stg on 2018/01/04 15:03:53 SWDEV-79278 - [OCL][VG20] enabling Vega20 for mainline for OCL Bring-up ReviewBoardURL = http://ocltc.amd.com/reviews/r/14073/diff/1/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#30 edit [ROCm/clr commit: 8d90b98f68eb364863dfb0819d3a7b4225c167b8] --- projects/clr/rocclr/runtime/device/pal/paldefs.hpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index 99de1b00ad..2247f429e1 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp @@ -155,11 +155,14 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = { /* Vega10 XNACK */{ LIGHTNING_SWITCH("gfx900","gfx901"), LIGHTNING_SWITCH("gfx900","gfx901"), 4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(900, 901)}, /* Vega12 */{"gfx904", "gfx904", 4, 16, 1, 256, 64 * Ki, 32, 904}, - /* Vega12 XNACK */{"gfx905", "gfx905", 4, 16, 1, 256, 64 * Ki, 32, 905}, - /* Vega20 */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 906}, - /* Vega20 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 907}, + /* Vega12 XNACK */{ LIGHTNING_SWITCH("gfx904","gfx905"), LIGHTNING_SWITCH("gfx904","gfx905"), + 4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(904, 905)}, + /* Vega20 */{"gfx906", "gfx906", 4, 16, 1, 256, 64 * Ki, 32, 906}, + /* Vega20 XNACK */{ LIGHTNING_SWITCH("gfx906","gfx907"), LIGHTNING_SWITCH("gfx906","gfx907"), + 4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(906, 907)}, /* Raven */{"gfx902", "gfx902", 4, 16, 1, 256, 64 * Ki, 32, 902}, - /* Raven XNACK */{"gfx903", "gfx903", 4, 16, 1, 256, 64 * Ki, 32, 903}, + /* Raven XNACK */{ LIGHTNING_SWITCH("gfx902","gfx903"), LIGHTNING_SWITCH("gfx902","gfx903"), + 4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(902, 903)}, /* Raven2 */{"" , "" , 0, 0 , 0, 0 , 0 , 0 , 0}, /* Raven2 XNACK */{"" , "" , 0, 0 , 0, 0 , 0 , 0 , 0}, /* Navi10 */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000},