fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: Don't treat HW_REGs as barriers if they're immediates.

Browse source 
We had a handful of cases where we'd used brw_imm_*() to generate an
immediate, rather than fs_reg(). We shouldn't do that but we shouldn't
limit scheduling flexibility on account of immediate arguments either.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Matt Turner 2014-04-17 13:55:06 -07:00
parent c938be8ad2
commit 6148e94e26
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
View file

@ -805,7 +805,9 @@ fs_instruction_scheduler::calculate_deps()
add_dep(last_accumulator_write, n); add_dep(last_accumulator_write, n);
} else if (inst->src[i].file != BAD_FILE && } else if (inst->src[i].file != BAD_FILE &&
inst->src[i].file != IMM && inst->src[i].file != IMM &&
inst->src[i].file != UNIFORM) { inst->src[i].file != UNIFORM &&
(inst->src[i].file != HW_REG ||
inst->src[i].fixed_hw_reg.file != IMM)) {
assert(inst->src[i].file != MRF); assert(inst->src[i].file != MRF);
add_barrier_deps(n); add_barrier_deps(n);
} }
@ -928,7 +930,9 @@ fs_instruction_scheduler::calculate_deps()
add_dep(n, last_accumulator_write); add_dep(n, last_accumulator_write);
} else if (inst->src[i].file != BAD_FILE && } else if (inst->src[i].file != BAD_FILE &&
inst->src[i].file != IMM && inst->src[i].file != IMM &&
inst->src[i].file != UNIFORM) { inst->src[i].file != UNIFORM &&
(inst->src[i].file != HW_REG ||
inst->src[i].fixed_hw_reg.file != IMM)) {
assert(inst->src[i].file != MRF); assert(inst->src[i].file != MRF);
add_barrier_deps(n); add_barrier_deps(n);
} }
@ -1053,7 +1057,9 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(last_accumulator_write, n); add_dep(last_accumulator_write, n);
} else if (inst->src[i].file != BAD_FILE && } else if (inst->src[i].file != BAD_FILE &&
inst->src[i].file != IMM && inst->src[i].file != IMM &&
inst->src[i].file != UNIFORM) { inst->src[i].file != UNIFORM &&
(inst->src[i].file != HW_REG ||
inst->src[i].fixed_hw_reg.file != IMM)) {
/* No reads from MRF, and ATTR is already translated away */ /* No reads from MRF, and ATTR is already translated away */
assert(inst->src[i].file != MRF && assert(inst->src[i].file != MRF &&
inst->src[i].file != ATTR); inst->src[i].file != ATTR);
@ -1143,7 +1149,9 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(n, last_accumulator_write); add_dep(n, last_accumulator_write);
} else if (inst->src[i].file != BAD_FILE && } else if (inst->src[i].file != BAD_FILE &&
inst->src[i].file != IMM && inst->src[i].file != IMM &&
inst->src[i].file != UNIFORM) { inst->src[i].file != UNIFORM &&
(inst->src[i].file != HW_REG ||
inst->src[i].fixed_hw_reg.file != IMM)) {
assert(inst->src[i].file != MRF && assert(inst->src[i].file != MRF &&
inst->src[i].file != ATTR); inst->src[i].file != ATTR);
add_barrier_deps(n); add_barrier_deps(n);