Revert "i965: Don't make instructions with a null dest a barrier to scheduling."

This reverts commit 42a26cb5e4.

Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648
(cherry picked from commit 0d3f83f4ad)
This commit is contained in:
Matt Turner 2014-05-26 11:45:48 -07:00 committed by Ian Romanick
parent ca6b38b80a
commit c984e5bd2e

View file

@ -870,8 +870,7 @@ fs_instruction_scheduler::calculate_deps()
} else if (inst->dst.is_accumulator() && gen6plus) {
add_dep(last_accumulator_write, n);
last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE &&
!inst->dst.is_null()) {
} else if (inst->dst.file != BAD_FILE) {
add_barrier_deps(n);
}
@ -998,8 +997,7 @@ fs_instruction_scheduler::calculate_deps()
}
} else if (inst->dst.is_accumulator() && gen6plus) {
last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE &&
!inst->dst.is_null()) {
} else if (inst->dst.file != BAD_FILE) {
add_barrier_deps(n);
}
@ -1115,8 +1113,7 @@ vec4_instruction_scheduler::calculate_deps()
} else if (inst->dst.is_accumulator() && gen6plus) {
add_dep(last_accumulator_write, n);
last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE &&
!inst->dst.is_null()) {
} else if (inst->dst.file != BAD_FILE) {
add_barrier_deps(n);
}
@ -1208,8 +1205,7 @@ vec4_instruction_scheduler::calculate_deps()
last_fixed_grf_write = n;
} else if (inst->dst.is_accumulator() && gen6plus) {
last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE &&
!inst->dst.is_null()) {
} else if (inst->dst.file != BAD_FILE) {
add_barrier_deps(n);
}