From 124754973402d0702ed8e08b7b6c521637613383 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 31 Aug 2012 10:46:56 -0400 Subject: [PATCH] radeon/llvm: Fix isEG tablegen predicate This predicate incorrectly included SI GPUs, so some Evergreen instructions were being emmitted on SI. --- src/gallium/drivers/radeon/R600Instructions.td | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td index 519f384cdeb..7e2deac8b00 100644 --- a/src/gallium/drivers/radeon/R600Instructions.td +++ b/src/gallium/drivers/radeon/R600Instructions.td @@ -218,9 +218,11 @@ def isR700 : Predicate<"Subtarget.device()" "->getGeneration() == AMDGPUDeviceInfo::HD4XXX &&" "Subtarget.device()->getDeviceFlag()" ">= OCL_DEVICE_RV710">; -def isEG : Predicate<"Subtarget.device()" - "->getGeneration() >= AMDGPUDeviceInfo::HD5XXX && " - "Subtarget.device()->getDeviceFlag() != OCL_DEVICE_CAYMAN">; +def isEG : Predicate< + "Subtarget.device()->getGeneration() >= AMDGPUDeviceInfo::HD5XXX && " + "Subtarget.device()->getGeneration() < AMDGPUDeviceInfo::HD7XXX && " + "Subtarget.device()->getDeviceFlag() != OCL_DEVICE_CAYMAN">; + def isCayman : Predicate<"Subtarget.device()" "->getDeviceFlag() == OCL_DEVICE_CAYMAN">; def isEGorCayman : Predicate<"Subtarget.device()" -- 2.30.2