Mesa (master): i965/fs: Fix lowering of integer multiplication with cmod.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu May 28 19:58:57 UTC 2015
Module: Mesa
Branch: master
Commit: 0596134410a0decc2f6bba77bfedb82d308aabbe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0596134410a0decc2f6bba77bfedb82d308aabbe
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed May 27 10:44:45 2015 -0700
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 at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90580
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
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 42a0d78..5cc4fe6 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
More information about the mesa-commit
mailing list