diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2017-08-12 13:43:34 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2017-08-12 14:49:08 -0400 |
| commit | 165e18dd219fbf4d60fd582b02e2dbf75ccd026f (patch) | |
| tree | 5757070b42322ca6d648dfbf92b92dd14114df60 | |
| parent | ea22ac23e04c093f9dd0bb8f9b946e61d79824ff (diff) | |
nv50/ir: clean up saturated values immediately
Since we don't iterate to a fixed point, we can end up in situations
where we have a SAT instruction + a long immediate. This is not legal.
However since it's immediately computable, just run unary straight away
to handle the situation.
Fixes: 24a799ad35a82 ("nv50/ir: fix ConstantFolding with saturation")
Reported-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index cfc0dfc53cf..7e4e193e3d2 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -727,7 +727,9 @@ ConstantFolding::expr(Instruction *i, // Leave PFETCH alone... we just folded its 2 args into 1. break; default: - i->op = i->saturate ? OP_SAT : OP_MOV; /* SAT handled by unary() */ + i->op = i->saturate ? OP_SAT : OP_MOV; + if (i->saturate) + unary(i, *i->getSrc(0)->asImm()); break; } i->subOp = 0; @@ -1513,8 +1515,11 @@ ConstantFolding::opnd(Instruction *i, ImmediateValue &imm0, int s) // This can get left behind some of the optimizations which simplify // saturatable values. if (newi->op == OP_MOV && newi->saturate) { + ImmediateValue tmp; newi->saturate = 0; newi->op = OP_SAT; + if (newi->src(0).getImmediate(tmp)) + unary(newi, tmp); } if (newi->op != op) |