From 2f6022676886911882bb9cdc53ed0acf193327dc Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 1 Sep 2016 14:20:14 -0400 Subject: [PATCH] P4 to Git Change 1309875 by smekhano@stas-rampitec-hsa on 2016/09/01 14:11:31 SWDEV-101534 - Lexa bringup: correct capability to 8:0:4 and add complib code Testing: smoke, precheckin Reviewed by Brian Sumner and Evgeny Mankov Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/SI/devStateSI.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings.h#47 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil.h#41 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_amdil64.h#37 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail.h#38 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/target_mappings_hsail64.h#33 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/driver/driver.cpp#63 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudefs.hpp#141 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#10 edit [ROCm/clr commit: 5787de6741070de4728aa65b7bde891c33c39bd1] --- projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp | 3 ++- projects/clr/rocclr/runtime/device/pal/paldefs.hpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp index cf32ae3f3e..bcaf4a0738 100644 --- a/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp +++ b/projects/clr/rocclr/compiler/lib/utils/v0_8/libUtils.cpp @@ -557,7 +557,8 @@ int getIsaType(const aclTargetInfo *target) case VI_TONGA_P_A0: return 800; case VI_ELLESMERE_P_A0: case VI_BAFFIN_M_A0: - case VI_FIJI_P_A0: return 804; + case VI_FIJI_P_A0: + case VI_LEXA_V_A0: return 804; } case FAMILY_CZ: switch (Mapping.chip_enum) { diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp index b8b0c22fd6..e9f530700d 100644 --- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp +++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp @@ -151,6 +151,7 @@ static const AMDDeviceInfo GfxIpDeviceInfo[] = { /* 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 }, };