summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2015-03-18 19:45:40 +0200
committerFrancisco Jerez <currojerez@riseup.net>2015-03-23 14:12:48 +0200
commit588859e18cb597612e56980a65a762ef069363e4 (patch)
treeee9f5789f3d0d2494dc1675395d580129e96b46e
parent9304f60cbe7c348a4771a7746606730bea3ae45f (diff)
i965/vec4: Fix handling of multiple register reads and writes in split_virtual_grfs().
Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index 2831ebd5c27..2c4a3d6f2da 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1143,15 +1143,12 @@ vec4_visitor::split_virtual_grfs()
* to split.
*/
foreach_block_and_inst(block, vec4_instruction, inst, cfg) {
- /* If there's a SEND message loading from a GRF on gen7+, it needs to be
- * contiguous.
- */
- if (inst->is_send_from_grf()) {
- for (int i = 0; i < 3; i++) {
- if (inst->src[i].file == GRF) {
- split_grf[inst->src[i].reg] = false;
- }
- }
+ if (inst->dst.file == GRF && inst->regs_written > 1)
+ split_grf[inst->dst.reg] = false;
+
+ for (int i = 0; i < 3; i++) {
+ if (inst->src[i].file == GRF && inst->regs_read(i) > 1)
+ split_grf[inst->src[i].reg] = false;
}
}