Mesa (master): nvc0: commute sources of SET too if beneficial

[Christoph Bumiller]

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

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Fri Jan 21 16:27:31 2011 +0100

nvc0: commute sources of SET too if beneficial

---

 src/gallium/drivers/nvc0/nvc0_pc_optimize.c |    2 +-
 src/gallium/drivers/nvc0/nvc0_pc_print.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_pc_optimize.c b/src/gallium/drivers/nvc0/nvc0_pc_optimize.c
index acc72bf..404b4dc 100644
--- a/src/gallium/drivers/nvc0/nvc0_pc_optimize.c
+++ b/src/gallium/drivers/nvc0/nvc0_pc_optimize.c
@@ -240,7 +240,7 @@ check_swap_src_0_1(struct nv_instruction *nvi)
    struct nv_ref *src0 = nvi->src[0];
    struct nv_ref *src1 = nvi->src[1];
 
-   if (!nv_op_commutative(nvi->opcode))
+   if (!nv_op_commutative(nvi->opcode) && NV_BASEOP(nvi->opcode) != NV_OP_SET)
       return;
    assert(src0 && src1 && src0->value && src1->value);
 
diff --git a/src/gallium/drivers/nvc0/nvc0_pc_print.c b/src/gallium/drivers/nvc0/nvc0_pc_print.c
index b038264..6c71abe 100644
--- a/src/gallium/drivers/nvc0/nvc0_pc_print.c
+++ b/src/gallium/drivers/nvc0/nvc0_pc_print.c
@@ -369,7 +369,7 @@ struct nv_op_info nvc0_op_info_table[NV_OP_COUNT + 1] =
 
    { NV_OP_ADD, "sub", NV_TYPE_F32, 0, 0, 0, 0, 1, 0, 1, 0 },
 
-   { NV_OP_FSET_F32, "fset", NV_TYPE_F32, NV_MOD_SGN, 0, 0, 0, 1, 0, 0, 2 },
+   { NV_OP_SET, "fset", NV_TYPE_F32, NV_MOD_SGN, 0, 0, 0, 1, 0, 0, 2 },
 
    { NV_OP_TXG, "texgrad", NV_TYPE_F32, 0, 0, 0, 1, 1, 0, 0, 0 },