From 588859e18cb597612e56980a65a762ef069363e4 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Wed, 18 Mar 2015 19:45:40 +0200 Subject: [PATCH] i965/vec4: Fix handling of multiple register reads and writes in split_virtual_grfs(). Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_vec4.cpp | 15 ++++++--------- 1 file 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; } }