Skip to content
Snippets Groups Projects
Commit c984e5bd authored by Matt Turner's avatar Matt Turner Committed by Ian Romanick
Browse files

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

This reverts commit 42a26cb5.

Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78648
(cherry picked from commit 0d3f83f4)
parent ca6b38b8
No related branches found
No related tags found
No related merge requests found
...@@ -870,8 +870,7 @@ fs_instruction_scheduler::calculate_deps() ...@@ -870,8 +870,7 @@ fs_instruction_scheduler::calculate_deps()
} else if (inst->dst.is_accumulator() && gen6plus) { } else if (inst->dst.is_accumulator() && gen6plus) {
add_dep(last_accumulator_write, n); add_dep(last_accumulator_write, n);
last_accumulator_write = n; last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE && } else if (inst->dst.file != BAD_FILE) {
!inst->dst.is_null()) {
add_barrier_deps(n); add_barrier_deps(n);
} }
...@@ -998,8 +997,7 @@ fs_instruction_scheduler::calculate_deps() ...@@ -998,8 +997,7 @@ fs_instruction_scheduler::calculate_deps()
} }
} else if (inst->dst.is_accumulator() && gen6plus) { } else if (inst->dst.is_accumulator() && gen6plus) {
last_accumulator_write = n; last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE && } else if (inst->dst.file != BAD_FILE) {
!inst->dst.is_null()) {
add_barrier_deps(n); add_barrier_deps(n);
} }
...@@ -1115,8 +1113,7 @@ vec4_instruction_scheduler::calculate_deps() ...@@ -1115,8 +1113,7 @@ vec4_instruction_scheduler::calculate_deps()
} else if (inst->dst.is_accumulator() && gen6plus) { } else if (inst->dst.is_accumulator() && gen6plus) {
add_dep(last_accumulator_write, n); add_dep(last_accumulator_write, n);
last_accumulator_write = n; last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE && } else if (inst->dst.file != BAD_FILE) {
!inst->dst.is_null()) {
add_barrier_deps(n); add_barrier_deps(n);
} }
...@@ -1208,8 +1205,7 @@ vec4_instruction_scheduler::calculate_deps() ...@@ -1208,8 +1205,7 @@ vec4_instruction_scheduler::calculate_deps()
last_fixed_grf_write = n; last_fixed_grf_write = n;
} else if (inst->dst.is_accumulator() && gen6plus) { } else if (inst->dst.is_accumulator() && gen6plus) {
last_accumulator_write = n; last_accumulator_write = n;
} else if (inst->dst.file != BAD_FILE && } else if (inst->dst.file != BAD_FILE) {
!inst->dst.is_null()) {
add_barrier_deps(n); add_barrier_deps(n);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment