Mesa (10.1): nv50/ir: make sure to reverse cond codes on all the OP_SET variants

Carl Worth cworth at kemper.freedesktop.org
Wed May 14 23:16:39 UTC 2014


Module: Mesa
Branch: 10.1
Commit: 7396efb19a684531336140901f4a36a61f62ad14
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7396efb19a684531336140901f4a36a61f62ad14

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat May 10 15:02:36 2014 -0400

nv50/ir: make sure to reverse cond codes on all the OP_SET variants

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Ben Skeggs <bskeggs at redhat.com>
Cc: "10.2 10.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 68f47cad0d23281309741cc47eeaa26ebbb41bca)

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index fb82c72..8e8434d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -187,7 +187,8 @@ LoadPropagation::checkSwapSrc01(Instruction *insn)
       return;
    }
 
-   if (insn->op == OP_SET)
+   if (insn->op == OP_SET || insn->op == OP_SET_AND ||
+       insn->op == OP_SET_OR || insn->op == OP_SET_XOR)
       insn->asCmp()->setCond = reverseCondCode(insn->asCmp()->setCond);
    else
    if (insn->op == OP_SLCT)




More information about the mesa-commit mailing list