fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/metadata: Rename metadata_dirty to metadata_preserve

Browse source 
nir_metadata_dirty was a terrible name because the parameter it takes is
the metadata to be preserved.  This is really confusing because it looks
like it's doing the opposite of what it is actually doing.  Now it's named
sensibly.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-12-12 16:22:46 -08:00
parent 3c2c0a164c
commit b6c81b3ff4
8 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/glsl/nir/nir.c
View file

@ -862,7 +862,7 @@ handle_jump(nir_block *block)
unlink_block_successors(block);
nir_function_impl *impl = nir_cf_node_get_function(&block->cf_node);
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
if (jump_instr->type == nir_jump_break ||
jump_instr->type == nir_jump_continue) {
@ -960,7 +960,7 @@ handle_remove_jump(nir_block *block, nir_jump_type type)
}
nir_function_impl *impl = nir_cf_node_get_function(&block->cf_node);
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
}
/**
@ -1066,7 +1066,7 @@ nir_cf_node_insert_after(nir_cf_node *node, nir_cf_node *after)
}
nir_function_impl *impl = nir_cf_node_get_function(node);
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
}
void
@ -1108,7 +1108,7 @@ nir_cf_node_insert_before(nir_cf_node *node, nir_cf_node *before)
}
nir_function_impl *impl = nir_cf_node_get_function(node);
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
}
void
@ -1154,7 +1154,7 @@ void
nir_cf_node_remove(nir_cf_node *node)
{
nir_function_impl *impl = nir_cf_node_get_function(node);
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
if (node->type == nir_cf_node_block) {
/*

2
src/glsl/nir/nir.h
View file

@ -1287,7 +1287,7 @@ void nir_cf_node_remove(nir_cf_node *node);
/** requests that the given pieces of metadata be generated */
void nir_metadata_require(nir_function_impl *impl, nir_metadata required);
/** dirties all but the preserved metadata */
void nir_metadata_dirty(nir_function_impl *impl, nir_metadata preserved);
void nir_metadata_preserve(nir_function_impl *impl, nir_metadata preserved);
/** creates an instruction with default swizzle/writemask/etc. with NULL registers */
nir_alu_instr *nir_alu_instr_create(void *mem_ctx, nir_op op);

4
src/glsl/nir/nir_algebraic.py
View file

@ -216,8 +216,8 @@ ${pass_name}_impl(nir_function_impl *impl)
nir_foreach_block(impl, ${pass_name}_block, &state);
if (state.progress)
nir_metadata_dirty(impl, nir_metadata_block_index |
nir_metadata_dominance);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return state.progress;
}

6
src/glsl/nir/nir_from_ssa.c
View file

@ -827,8 +827,10 @@ nir_convert_from_ssa_impl(nir_function_impl *impl)
nir_foreach_block(impl, isolate_phi_nodes_block, &state);
nir_metadata_dirty(impl, nir_metadata_block_index |
nir_metadata_dominance);
/* Mark metadata as dirty before we ask for liveness analysis */
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
nir_metadata_require(impl, nir_metadata_live_variables |
nir_metadata_dominance);

4
src/glsl/nir/nir_lower_variables.c
View file

@ -1022,8 +1022,8 @@ nir_lower_variables_impl(nir_function_impl *impl)
insert_phi_nodes(&state);
nir_foreach_block(impl, lower_deref_to_ssa_block, &state);
nir_metadata_dirty(impl, nir_metadata_block_index |
nir_metadata_dominance);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
ralloc_free(state.dead_ctx);

2
src/glsl/nir/nir_metadata.c
View file

@ -48,7 +48,7 @@ nir_metadata_require(nir_function_impl *impl, nir_metadata required)
}
void
nir_metadata_dirty(nir_function_impl *impl, nir_metadata preserved)
nir_metadata_preserve(nir_function_impl *impl, nir_metadata preserved)
{
impl->valid_metadata &= preserved;
}

4
src/glsl/nir/nir_opt_cse.c
View file

@ -249,8 +249,8 @@ nir_opt_cse_impl(nir_function_impl *impl)
nir_foreach_block(impl, nir_opt_cse_block, &state);
if (state.progress)
nir_metadata_dirty(impl, nir_metadata_block_index |
nir_metadata_dominance);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return state.progress;
}

2
src/glsl/nir/nir_opt_peephole_select.c
View file

@ -193,7 +193,7 @@ nir_opt_peephole_select_impl(nir_function_impl *impl)
nir_foreach_block(impl, nir_opt_peephole_select_block, &state);
if (state.progress)
nir_metadata_dirty(impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
return state.progress;
}