From 4d11a6a0c798301863d5b202703dcca37dc24e7c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 11 May 2012 09:31:00 -0400 Subject: [PATCH] radeon/llvm: Fix Evergreen/Cayman tablegen predicates Some Evergreen/Cayman instructions were being enabled for SI. --- src/gallium/drivers/radeon/R600Instructions.td | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td index a18240f09bd..9b59171de43 100644 --- a/src/gallium/drivers/radeon/R600Instructions.td +++ b/src/gallium/drivers/radeon/R600Instructions.td @@ -227,7 +227,9 @@ def isEG : Predicate<"Subtarget.device()" def isCayman : Predicate<"Subtarget.device()" "->getDeviceFlag() == OCL_DEVICE_CAYMAN">; def isEGorCayman : Predicate<"Subtarget.device()" - "->getGeneration() >= AMDILDeviceInfo::HD5XXX">; + "->getGeneration() == AMDILDeviceInfo::HD5XXX" + "|| Subtarget.device()->getGeneration() ==" + "AMDILDeviceInfo::HD6XXX">; def isR600toCayman : Predicate< "Subtarget.device()->getGeneration() <= AMDILDeviceInfo::HD6XXX">; -- 2.30.2