From: Tom Stellard <thomas.stellard@amd.com>
Date: Fri, 11 May 2012 13:31:00 +0000 (-0400)
Subject: radeon/llvm: Fix Evergreen/Cayman tablegen predicates
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d11a6a0c798301863d5b202703dcca37dc24e7c;p=mesa.git

radeon/llvm: Fix Evergreen/Cayman tablegen predicates

Some Evergreen/Cayman instructions were being enabled for SI.
---

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">;