fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 13:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nir/liveness: fixup for new foreach_block()

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott 2016-04-08 15:30:02 -04:00 • committed by Jason Ekstrand
parent 34af78edb3
commit 4179a56f42
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/nir/nir_liveness.c
View file

@ -62,23 +62,13 @@ index_ssa_def(nir_ssa_def *def, void *void_state)
return true;
}
static bool
index_ssa_definitions_block(nir_block *block, void *state)
{
nir_foreach_instr(block, instr)
nir_foreach_ssa_def(instr, index_ssa_def, state);
return true;
}
/* Initialize the liveness data to zero and add the given block to the
* worklist.
*/
static bool
init_liveness_block(nir_block *block, void *void_state)
init_liveness_block(nir_block *block,
struct live_ssa_defs_state *state)
{
struct live_ssa_defs_state *state = void_state;
block->live_in = reralloc(block, block->live_in, BITSET_WORD,
state->bitset_words);
memset(block->live_in, 0, state->bitset_words * sizeof(BITSET_WORD));
@ -174,7 +164,10 @@ nir_live_ssa_defs_impl(nir_function_impl *impl)
* can be compacted into a single bit.
*/
state.num_ssa_defs = 1;
nir_foreach_block_call(impl, index_ssa_definitions_block, &state);
nir_foreach_block(block, impl) {
nir_foreach_instr(block, instr)
nir_foreach_ssa_def(instr, index_ssa_def, &state);
}
nir_block_worklist_init(&state.worklist, impl->num_blocks, NULL);
@ -183,7 +176,10 @@ nir_live_ssa_defs_impl(nir_function_impl *impl)
* blocks to the worklist.
*/
state.bitset_words = BITSET_WORDS(state.num_ssa_defs);
nir_foreach_block_call(impl, init_liveness_block, &state);
nir_foreach_block(block, impl) {
init_liveness_block(block, &state);
}
/* We're now ready to work through the worklist and update the liveness
* sets of each of the blocks. By the time we get to this point, every