From ddc6639f8596d0d44d84e0b0fd3a5461c953c4b2 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 8 Apr 2016 17:43:48 -0400 Subject: [PATCH] nir/opt_dce: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_opt_dce.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/compiler/nir/nir_opt_dce.c b/src/compiler/nir/nir_opt_dce.c index ee656ac2a67..d94f4be28e0 100644 --- a/src/compiler/nir/nir_opt_dce.c +++ b/src/compiler/nir/nir_opt_dce.c @@ -113,10 +113,8 @@ init_instr(nir_instr *instr, struct exec_list *worklist) } static bool -init_block_cb(nir_block *block, void *_state) +init_block(nir_block *block, struct exec_list *worklist) { - struct exec_list *worklist = (struct exec_list *) _state; - nir_foreach_instr(block, instr) init_instr(instr, worklist); @@ -130,28 +128,15 @@ init_block_cb(nir_block *block, void *_state) return true; } -static bool -delete_block_cb(nir_block *block, void *_state) -{ - bool *progress = (bool *) _state; - - nir_foreach_instr_safe(block, instr) { - if (!instr->pass_flags) { - nir_instr_remove(instr); - *progress = true; - } - } - - return true; -} - static bool nir_opt_dce_impl(nir_function_impl *impl) { struct exec_list *worklist = ralloc(NULL, struct exec_list); exec_list_make_empty(worklist); - nir_foreach_block_call(impl, init_block_cb, worklist); + nir_foreach_block(block, impl) { + init_block(block, worklist); + } while (!exec_list_is_empty(worklist)) { nir_instr *instr = worklist_pop(worklist); @@ -161,7 +146,15 @@ nir_opt_dce_impl(nir_function_impl *impl) ralloc_free(worklist); bool progress = false; - nir_foreach_block_call(impl, delete_block_cb, &progress); + + nir_foreach_block(block, impl) { + nir_foreach_instr_safe(block, instr) { + if (!instr->pass_flags) { + nir_instr_remove(instr); + progress = true; + } + } + } if (progress) nir_metadata_preserve(impl, nir_metadata_block_index | -- 2.30.2