OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/gcm: Move block choosing into a helper function

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4636>
This commit is contained in:
Jason Ekstrand
2017-01-17 18:38:38 -08:00
committed by Marge Bot
parent 1f60f1aa3d
commit 5b1615fdb7
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/compiler/nir/nir_opt_gcm.c
View File

@@ -266,6 +266,25 @@ gcm_schedule_early_instr(nir_instr *instr, struct gcm_state *state)
nir_foreach_src(instr, gcm_schedule_early_src, state);
}
static nir_block *
gcm_choose_block_for_instr(nir_instr *instr, nir_block *early_block,
nir_block *late_block, struct gcm_state *state)
{
assert(nir_block_dominates(early_block, late_block));
nir_block *best = late_block;
for (nir_block *block = late_block; block != NULL; block = block->imm_dom) {
if (state->blocks[block->index].loop_depth <
state->blocks[best->index].loop_depth)
best = block;
if (block == early_block)
break;
}
return best;
}
static void
gcm_schedule_late_instr(nir_instr *instr, struct gcm_state *state);
@@ -335,17 +354,8 @@ gcm_schedule_late_def(nir_ssa_def *def, void *void_state)
* We now walk up the dominance tree and pick the lowest block that is
* as far outside loops as we can get.
*/
assert(nir_block_dominates(early_block, lca));
nir_block *best = lca;
for (nir_block *block = lca; block != NULL; block = block->imm_dom) {
if (state->blocks[block->index].loop_depth <
state->blocks[best->index].loop_depth)
best = block;
if (block == early_block)
break;
}
def->parent_instr->block = best;
def->parent_instr->block =
gcm_choose_block_for_instr(def->parent_instr, early_block, lca, state);
return true;
}