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

nir: Don't infinitely recurse in lower_ssa_defs_to_regs_block

Browse Source 
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Jason Ekstrand
2019-08-30 13:55:02 -05:00
parent 37cdb7fc44
commit 517142252f
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/nir/nir_from_ssa.c
View File

@@ -827,7 +827,7 @@ nir_convert_from_ssa(nir_shader *shader, bool phi_webs_only)
static void static void
place_phi_read(nir_shader *shader, nir_register *reg, place_phi_read(nir_shader *shader, nir_register *reg,
nir_ssa_def *def, nir_block *block) nir_ssa_def *def, nir_block *block, unsigned depth)
{ {
if (block != def->parent_instr->block) { if (block != def->parent_instr->block) {
/* Try to go up the single-successor tree */ /* Try to go up the single-successor tree */
@@ -840,14 +840,24 @@ place_phi_read(nir_shader *shader, nir_register *reg,
} }
} }
if (all_single_successors) { if (all_single_successors && depth < 32) {
/* All predecessors of this block have exactly one successor and it /* All predecessors of this block have exactly one successor and it
* is this block so they must eventually lead here without * is this block so they must eventually lead here without
* intersecting each other. Place the reads in the predecessors * intersecting each other. Place the reads in the predecessors
* instead of this block. * instead of this block.
*
* We only let this function recurse 32 times because it can recurse
* indefinitely in the presence of infinite loops. Because we're
* crawling a single-successor chain, it doesn't matter where we
* place it so it's ok to stop at an arbitrary distance.
*
* TODO: One day, we could detect back edges and avoid the recursion
* that way.
*/ */
set_foreach(block->predecessors, entry) set_foreach(block->predecessors, entry) {
place_phi_read(shader, reg, def, (nir_block *)entry->key); place_phi_read(shader, reg, def, (nir_block *)entry->key,
depth + 1);
}
return; return;
} }
} }
@@ -902,7 +912,7 @@ nir_lower_phis_to_regs_block(nir_block *block)
nir_foreach_phi_src(src, phi) { nir_foreach_phi_src(src, phi) {
assert(src->src.is_ssa); assert(src->src.is_ssa);
place_phi_read(shader, reg, src->src.ssa, src->pred); place_phi_read(shader, reg, src->src.ssa, src->pred, 0);
} }
nir_instr_remove(&phi->instr); nir_instr_remove(&phi->instr);