From 059f5d480296aad9bd4bf80ab18dc7fdcce89445 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 13 Feb 2015 11:34:35 -0500 Subject: [PATCH] P4 to Git Change 1122064 by ericz@fl-ericz-dev on 2015/02/13 10:55:09 EPR #414440 - TC is RED for all Stg OpenCL EPR #412622 - OpenGL GFXIP 9 bring up general development. Add device id's for Greenland, Baffin (GFX8), and Ellesmere (GFX8). Removed device id for Bermuda since it has been cancelled. Add additional support for GFX9 in SCL and ES components. ReviewBoardURL = http://ocltc.amd.com/reviews/r/6843/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#106 edit [ROCm/clr commit: e41f9ff8e973d66b5c2758372696252163a2e2e0] --- .../rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index f159d4beb7..87c03db48f 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -554,10 +554,6 @@ CALGSLDevice::SetupContext(int32 &asic_id) m_target = CAL_TARGET_GODAVARI; m_elfmachine = ED_ATI_CAL_MACHINE_GODAVARI_ISA; break; - case GSL_ATIASIC_ID_BERMUDA_P: - m_target = CAL_TARGET_BERMUDA; - m_elfmachine = ED_ATI_CAL_MACHINE_BERMUDA_ISA; - break; case GSL_ATIASIC_ID_FIJI_P: m_target = CAL_TARGET_FIJI; m_elfmachine = ED_ATI_CAL_MACHINE_FIJI_ISA; @@ -566,7 +562,7 @@ CALGSLDevice::SetupContext(int32 &asic_id) m_target = CAL_TARGET_CARRIZO; m_elfmachine = ED_ATI_CAL_MACHINE_CARRIZO_ISA; break; - case GSL_ATIASIC_ID_ELLESMERE_P: + case GSL_ATIASIC_ID_ELLESMERE: m_target = CAL_TARGET_ELLESMERE; m_elfmachine = ED_ATI_CAL_MACHINE_ELLESMERE_ISA; break;