Mesa (master): radeon/llvm: Fix Evergreen/Cayman tablegen predicates

[Tom Stellard]

Module: Mesa
Branch: master
Commit: 4d11a6a0c798301863d5b202703dcca37dc24e7c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d11a6a0c798301863d5b202703dcca37dc24e7c

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Fri May 11 09:31:00 2012 -0400

radeon/llvm: Fix Evergreen/Cayman tablegen predicates

Some Evergreen/Cayman instructions were being enabled for SI.

---

 src/gallium/drivers/radeon/R600Instructions.td |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td
index a18240f..9b59171 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">;