From 8764785ce11dc74378793411162efeef9e56b6f5 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 7 Sep 2016 15:38:56 -0400 Subject: [PATCH] P4 to Git Change 1311856 by asalmanp@asalmanp-ocl-stg-pal on 2016/09/07 15:28:58 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SWDEV-79278 - [OpenCL][PAL] fixing a regression in gfx9 after CL#1309875 which caused all the OCLTST tests to fail on gfx9 emulator. Don’t add any extra entry to the GfxIpDeviceInfo table as this table must match with GfxIpLevel enum (located in //depot/stg/pal/inc/core/palDevice.h). ReviewBoardURL = http://ocltc.amd.com/reviews/r/11313/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#11 edit --- rocclr/runtime/device/pal/paldefs.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp index e9f530700d..25c5a0768d 100644 --- a/rocclr/runtime/device/pal/paldefs.hpp +++ b/rocclr/runtime/device/pal/paldefs.hpp @@ -145,13 +145,14 @@ static const AMDDeviceInfo DeviceInfo[] = { /* Buffin */ { "Baffin", "baffin", 4, 16, 1, 256, 64 * Ki, 32, 800 }, }; +// The GfxIpDeviceInfo table must match with GfxIpLevel enum +// (located in //depot/stg/pal/inc/core/palDevice.h). static const AMDDeviceInfo GfxIpDeviceInfo[] = { /* Unknown */ { "", "unknown", 4, 16, 1, 256, 64 * Ki, 32, 000 }, /* GFX6_0_0 */ { "", "gfx6_0_0", 4, 16, 1, 256, 64 * Ki, 32, 600 }, /* GFX7_0_0 */ { "", "gfx7_0_0", 4, 16, 1, 256, 64 * Ki, 32, 700 }, /* GFX8_0_0 */ { "", "gfx8_0_0", 4, 16, 1, 256, 64 * Ki, 32, 800 }, /* GFX8_0_1 */ { "", "gfx8_0_1", 4, 16, 1, 256, 64 * Ki, 32, 801 }, -/* GFX8_0_4 */ { "", "gfx8_0_4", 4, 16, 1, 256, 64 * Ki, 32, 800 }, /* GFX9_0_0 */ { "Rabbit", "rabbit", 4, 16, 1, 256, 64 * Ki, 32, 900 }, };