fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 09:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r600g: don't change the order of writes in merge_inst_group

Browse source 
Merge may produce incorrect order of operations for r600-eg:

	x: inst1 R0.x, ... ;  //from current group
	...
	t: inst0 R0.x, ... ;  //from previous group, same destination

Result of inst1 will be lost.

So compare destinations and don't allow this.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
This commit is contained in:
Vadim Girlin 2011-11-17 03:33:57 +04:00 • committed by Alex Deucher
parent 4b1205d53b
commit 0cddea37b2
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/r600/r600_asm.c
View file

@ -1010,6 +1010,11 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
result[i] = prev[i];
result[4] = slots[i];
} else if (is_alu_any_unit_inst(bc, prev[i])) {
if (slots[i]->dst.sel == prev[i]->dst.sel &&
(slots[i]->dst.write == 1 || slots[i]->is_op3) &&
(prev[i]->dst.write == 1 || prev[i]->is_op3))
return 0;
result[i] = slots[i];
result[4] = prev[i];
} else
@ -1018,8 +1023,16 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
return 0;
} else if(!slots[i]) {
continue;
} else
} else {
if (max_slots == 5 && slots[i] && prev[4] &&
slots[i]->dst.sel == prev[4]->dst.sel &&
slots[i]->dst.chan == prev[4]->dst.chan &&
(slots[i]->dst.write == 1 || slots[i]->is_op3) &&
(prev[4]->dst.write == 1 || prev[4]->is_op3))
return 0;
result[i] = slots[i];
}
alu = slots[i];
num_once_inst += is_alu_once_inst(bc, alu);