diff options
| author | Matt Turner <[email protected]> | 2015-05-27 10:44:45 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2015-05-28 12:58:50 -0700 |
| commit | 0596134410a0decc2f6bba77bfedb82d308aabbe (patch) | |
| tree | bb0d8a515e0592a612c0b2e14619791e5bd27b15 /src/mesa | |
| parent | 2231cf0ba3a79d9abb08065e0f72811c5eea807f (diff) | |
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" <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90580
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 42a0d78e542..5cc4fe66e99 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -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 |