[Mesa-dev] [PATCH 4/8] nir/gcm: Move block choosing into a helper function

[Jason Ekstrand]

---
 src/compiler/nir/nir_opt_gcm.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/compiler/nir/nir_opt_gcm.c b/src/compiler/nir/nir_opt_gcm.c
index 3448154..5bc3ff0 100644
--- a/src/compiler/nir/nir_opt_gcm.c
+++ b/src/compiler/nir/nir_opt_gcm.c
@@ -279,6 +279,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);
 
@@ -348,17 +367,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;
 }
-- 
2.5.0.400.gff86faf