AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: fix init_any_pred_defined() for loop header phis

Browse Source 
This includes setting the correct end point of the propagation and
not propagating the incoming values after the loop header.
This patch also changes the propagation to a single iteration for
loop exit phis.

No fossil-db changes.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>

aco: don't propagate incoming value in init_any_pred_defined()

No fossil-db changes.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11659>
This commit is contained in:
Daniel Schürmann
2021-06-24 18:11:12 +02:00
parent 6f56eb2429
commit e4c5062fb7
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_lower_phis.cpp
+24 -11
View File
@@ -166,20 +166,33 @@ init_any_pred_defined(Program* program, ssa_state* state, Block* block, aco_ptr<
}
unsigned start = block->logical_preds[0];
unsigned end = block->index;
/* for loop exit phis, start at the loop header */
const bool loop_exit = block->kind & block_kind_loop_exit;
while (loop_exit && program->blocks[start - 1].loop_nest_depth >= state->loop_nest_depth)
start--;
for (unsigned i = 0; i < 1u + loop_exit; i++) {
for (unsigned j = start; j < block->index; j++) {
if (!state->any_pred_defined[j])
continue;
for (unsigned succ : program->blocks[j].linear_succs)
state->any_pred_defined[succ] = true;
}
if (block->kind & block_kind_loop_exit) {
while (program->blocks[start - 1].loop_nest_depth >= state->loop_nest_depth)
start--;
/* If the loop-header has a back-edge, we need to insert a phi.
* This will contain a defined value */
if (program->blocks[start].linear_preds.size() > 1)
state->any_pred_defined[start] = true;
}
/* for loop header phis, end at the loop exit */
if (block->kind & block_kind_loop_header) {
while (program->blocks[end].loop_nest_depth >= state->loop_nest_depth)
end++;
/* don't propagate the incoming value */
state->any_pred_defined[block->index] = false;
}
for (unsigned j = start; j < end; j++) {
if (!state->any_pred_defined[j])
continue;
for (unsigned succ : program->blocks[j].linear_succs)
state->any_pred_defined[succ] = true;
}
state->any_pred_defined[block->index] = false;
}
void