nv50/ir: clear dnz flag when converting mul/mad to simpler ops

Fixes some assertion failures in the GM107 emitter with the game
'tansei', noticed while debugging gitlab issue 4101.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8534>
This commit is contained in:
Ilia Mirkin 2021-01-15 17:01:27 -05:00 committed by Marge Bot
parent 07a1a341bf
commit 6638b58ccf
1 changed files with 3 additions and 0 deletions

View File

@ -1108,6 +1108,7 @@ ConstantFolding::opnd(Instruction *i, ImmediateValue &imm0, int s)
}
} else
if (imm0.isInteger(0)) {
i->dnz = 0;
i->op = OP_MOV;
i->setSrc(0, new_ImmediateValue(prog, 0u));
i->src(0).mod = Modifier(0);
@ -1117,6 +1118,7 @@ ConstantFolding::opnd(Instruction *i, ImmediateValue &imm0, int s)
if (!i->postFactor && (imm0.isInteger(1) || imm0.isInteger(-1))) {
if (imm0.isNegative())
i->src(t).mod = i->src(t).mod ^ Modifier(NV50_IR_MOD_NEG);
i->dnz = 0;
i->op = i->src(t).mod.getOp();
if (s == 0) {
i->setSrc(0, i->getSrc(1));
@ -1157,6 +1159,7 @@ ConstantFolding::opnd(Instruction *i, ImmediateValue &imm0, int s)
i->src(0).mod = i->src(2).mod;
i->setSrc(1, NULL);
i->setSrc(2, NULL);
i->dnz = 0;
i->op = i->src(0).mod.getOp();
if (i->op != OP_CVT)
i->src(0).mod = 0;