From 11dccb06aecdbb67897e1b0e8b5fb2f7be22a0a7 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 6 Aug 2014 08:00:59 -0400 Subject: [PATCH] P4 to Git Change 1063366 by ericz@fl_ericz3 on 2014/08/06 07:50:13 EPR #403896 - [OpenGL] - Use GFXIP instead of asic family name This is the first step to using a GFXIP version instead of the asic family names wherever possible in our driver. It is only being used for a few checks right now, and there will be more changes after this to use it in more places. - Added GFXIP so that we can reference IP version instead of checking asic family names. This is being done so it's more clear about which version of gfx ip a given asic is, since marketing often uses a different family name than engineering (ex. Hawaii is a VI part from marketing standpoint). This also reflects the HW team's move towards using the gfxip version instead of a family name. Another benefit is it will clean up our asic family checks quite a bit, and they should be a bit more forward looking as well. - Added some asserts for when gfxip 9 comes along we know the places we need to validate. It hasn't been determined yet if gfxip 9 will use the same hwl, so if it doesn't, these asserts will be removed then. - Removed all references of Kauai, Tiran, and Maui from our driver since these asics were all cancelled at some point previously. - Changed Distributed Tessellation enablement criteria to be gfxip 8+ && numSE > 1 instead of checking asic names. ReviewBoardURL = http://ocltc.amd.com/reviews/r/5450/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#96 edit --- rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index 5515dbe0ee..d2c0fe5b2c 100644 --- a/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -412,11 +412,9 @@ CALGSLDevice::SetupAdapter(int32 &asic_id) case GSL_ATIASIC_ID_CAPEVERDE_M: case GSL_ATIASIC_ID_OLAND_M: case GSL_ATIASIC_ID_HAINAN_M: - case GSL_ATIASIC_ID_TIRAN_P: case GSL_ATIASIC_ID_BONAIRE_M: case GSL_ATIASIC_ID_KALINDI: case GSL_ATIASIC_ID_HAWAII_P: - case GSL_ATIASIC_ID_MAUI_P: case GSL_ATIASIC_ID_ICELAND_M: case GSL_ATIASIC_ID_TONGA_P: case GSL_ATIASIC_ID_GODAVARI: @@ -475,10 +473,6 @@ CALGSLDevice::SetupContext(int32 &asic_id) m_target = CAL_TARGET_CAYMAN; m_elfmachine = ED_ATI_CAL_MACHINE_CAYMAN_ISA; break; - case GSL_ATIASIC_ID_KAUAI: - m_target = CAL_TARGET_KAUAI; - m_elfmachine = ED_ATI_CAL_MACHINE_KAUAI_ISA; - break; case GSL_ATIASIC_ID_BARTS: m_target = CAL_TARGET_BARTS; m_elfmachine = ED_ATI_CAL_MACHINE_BARTS_ISA;