From 0596134410a0decc2f6bba77bfedb82d308aabbe Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 27 May 2015 10:44:45 -0700 Subject: [PATCH] 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" Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90580 Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 -- 2.30.2