Skip to content
Snippets Groups Projects
Commit 05961344 authored by Matt Turner's avatar Matt Turner
Browse files

i965/fs: Fix lowering of integer multiplication with cmod.

If the multiplication's result is unused, except by a conditional_mod,
the destination will be null. Since the final instruction in the lowered
sequence is a partial-write, we can't put the conditional mod on it and
we have to store the full result to a register and do a MOV with a
conditional mod.

Cc: "10.6" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90580


Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
parent 2231cf0b
No related branches found
No related tags found
No related merge requests found
......@@ -3606,6 +3606,10 @@ fs_visitor::lower_integer_multiplication()
* schedule multi-component multiplications much better.
*/
if (inst->conditional_mod && inst->dst.is_null()) {
inst->dst = fs_reg(GRF, alloc.allocate(dispatch_width / 8),
inst->dst.type, dispatch_width);
}
fs_reg low = inst->dst;
fs_reg high(GRF, alloc.allocate(dispatch_width / 8),
inst->dst.type, dispatch_width);
......@@ -3655,6 +3659,13 @@ fs_visitor::lower_integer_multiplication()
low.stride = 2;
insert(ADD(dst, low, high));
if (inst->conditional_mod) {
fs_reg null(retype(brw_null_reg(), inst->dst.type));
fs_inst *mov = MOV(null, inst->dst);
mov->conditional_mod = inst->conditional_mod;
insert(mov);
}
}
#undef insert
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment