Mesa (master): radeon/llvm: Fix operand ordering for V_CNDMASK_B32

Tom Stellard tstellar at kemper.freedesktop.org
Wed Sep 5 18:16:14 UTC 2012


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

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Wed Sep  5 11:30:16 2012 -0400

radeon/llvm: Fix operand ordering for V_CNDMASK_B32

This fixes several hundred piglit tests.

---

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

diff --git a/src/gallium/drivers/radeon/SIInstructions.td b/src/gallium/drivers/radeon/SIInstructions.td
index 39ecdcd..20d4c00 100644
--- a/src/gallium/drivers/radeon/SIInstructions.td
+++ b/src/gallium/drivers/radeon/SIInstructions.td
@@ -674,15 +674,15 @@ def S_WAITCNT : SOPP <0x0000000c, (ins i32imm:$simm16), "S_WAITCNT $simm16",
 def V_CNDMASK_B32 : VOP2 <0x00000000, (outs VReg_32:$dst),
   (ins AllReg_32:$src0, VReg_32:$src1, VCCReg:$vcc), "V_CNDMASK_B32",
   [(set (i32 VReg_32:$dst),
-   (select VCCReg:$vcc, AllReg_32:$src0, VReg_32:$src1))] > {
+   (select VCCReg:$vcc, VReg_32:$src1, AllReg_32:$src0))] > {
 
   let DisableEncoding = "$vcc";
 }
 
 //f32 pattern for V_CNDMASK_B32
 def : Pat <
-  (f32 (select VCCReg:$vcc, AllReg_32:$src0, VReg_32:$src1)),
-  (V_CNDMASK_B32 AllReg_32:$src0, VReg_32:$src1, VCCReg:$vcc)
+  (f32 (select VCCReg:$vcc, VReg_32:$src0, AllReg_32:$src1)),
+  (V_CNDMASK_B32 AllReg_32:$src1, VReg_32:$src0, VCCReg:$vcc)
 >;
 
 defm V_READLANE_B32 : VOP2_32 <0x00000001, "V_READLANE_B32", []>;




More information about the mesa-commit mailing list