Mesa (master): i965: Don't treat HW_REGs as barriers if they' re immediates.
Matt Turner
mattst88 at kemper.freedesktop.org
Mon May 26 03:17:07 UTC 2014
Module: Mesa
Branch: master
Commit: 6148e94e26ff4b6cbba452121c76d564f25f194d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6148e94e26ff4b6cbba452121c76d564f25f194d
Author: Matt Turner <mattst88 at gmail.com>
Date: Thu Apr 17 13:55:06 2014 -0700
i965: Don't treat HW_REGs as barriers if they're immediates.
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 at whitecape.org>
---
.../drivers/dri/i965/brw_schedule_instructions.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
index 6f8f405..c9cd136 100644
--- a/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
@@ -805,7 +805,9 @@ fs_instruction_scheduler::calculate_deps()
add_dep(last_accumulator_write, n);
} else if (inst->src[i].file != BAD_FILE &&
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);
add_barrier_deps(n);
}
@@ -928,7 +930,9 @@ fs_instruction_scheduler::calculate_deps()
add_dep(n, last_accumulator_write);
} else if (inst->src[i].file != BAD_FILE &&
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);
add_barrier_deps(n);
}
@@ -1053,7 +1057,9 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(last_accumulator_write, n);
} else if (inst->src[i].file != BAD_FILE &&
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 */
assert(inst->src[i].file != MRF &&
inst->src[i].file != ATTR);
@@ -1143,7 +1149,9 @@ vec4_instruction_scheduler::calculate_deps()
add_dep(n, last_accumulator_write);
} else if (inst->src[i].file != BAD_FILE &&
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 &&
inst->src[i].file != ATTR);
add_barrier_deps(n);
More information about the mesa-commit
mailing list