Module: Mesa Branch: master Commit: c4ac09e30e2520b0ac6d403eb6c77f23e7f24f49 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4ac09e30e2520b0ac6d403eb6c77f23e7f24f49
Author: Ilia Mirkin <[email protected]> Date: Fri May 8 18:54:08 2015 -0400 nv50/ir: only propagate saturate up if some actual folding took place The former logic would copy the saturate up to any mul with an immediate if there was a subsequent mul with a saturate. However we only want to do that if we collapsed 2 muls by multiplying their immediates (or were able to put the immediate in as a post-multiplier). Signed-off-by: Ilia Mirkin <[email protected]> Cc: [email protected] --- 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 87d9589..14446b6 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -705,6 +705,7 @@ ConstantFolding::tryCollapseChainedMULs(Instruction *mul2, mul1->setSrc(s1, bld.loadImm(NULL, f * imm1.reg.data.f32)); mul1->src(s1).mod = Modifier(0); mul2->def(0).replace(mul1->getDef(0), false); + mul1->saturate = mul2->saturate; } else if (prog->getTarget()->isPostMultiplySupported(OP_MUL, f, e)) { // c = mul a, b @@ -713,8 +714,8 @@ ConstantFolding::tryCollapseChainedMULs(Instruction *mul2, mul2->def(0).replace(mul1->getDef(0), false); if (f < 0) mul1->src(0).mod *= Modifier(NV50_IR_MOD_NEG); + mul1->saturate = mul2->saturate; } - mul1->saturate = mul2->saturate; return; } } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
