Mesa (master): radeon/llvm: Fix isEG tablegen predicate

Tom Stellard tstellar at kemper.freedesktop.org
Fri Aug 31 17:42:50 UTC 2012


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

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Fri Aug 31 10:46:56 2012 -0400

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 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeon/R600Instructions.td b/src/gallium/drivers/radeon/R600Instructions.td
index 519f384..7e2deac 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()"




More information about the mesa-commit mailing list