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

nir: Return progress from nir_lower_load_const_to_scalar().

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Matt Turner
2017-02-24 15:32:11 -08:00
parent adb157ddfd
commit b831b8d2e1
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir.h
View File

@@ -2400,7 +2400,7 @@ bool nir_lower_constant_initializers(nir_shader *shader,
void nir_move_vec_src_uses_to_dest(nir_shader *shader); void nir_move_vec_src_uses_to_dest(nir_shader *shader);
bool nir_lower_vec_to_movs(nir_shader *shader); bool nir_lower_vec_to_movs(nir_shader *shader);
bool nir_lower_alu_to_scalar(nir_shader *shader); bool nir_lower_alu_to_scalar(nir_shader *shader);
void nir_lower_load_const_to_scalar(nir_shader *shader); bool nir_lower_load_const_to_scalar(nir_shader *shader);
bool nir_lower_phis_to_scalar(nir_shader *shader); bool nir_lower_phis_to_scalar(nir_shader *shader);
void nir_lower_io_to_scalar(nir_shader *shader, nir_variable_mode mask); void nir_lower_io_to_scalar(nir_shader *shader, nir_variable_mode mask);

26
src/compiler/nir/nir_lower_load_const_to_scalar.c
View File

@@ -35,11 +35,11 @@
* same value was used in different vector contant loads. * same value was used in different vector contant loads.
*/ */
static void static bool
lower_load_const_instr_scalar(nir_load_const_instr *lower) lower_load_const_instr_scalar(nir_load_const_instr *lower)
{ {
if (lower->def.num_components == 1) if (lower->def.num_components == 1)
return; return false;
nir_builder b; nir_builder b;
nir_builder_init(&b, nir_cf_node_get_function(&lower->instr.block->cf_node)); nir_builder_init(&b, nir_cf_node_get_function(&lower->instr.block->cf_node));
@@ -65,24 +65,38 @@ lower_load_const_instr_scalar(nir_load_const_instr *lower)
/* Replace the old load with a reference to our reconstructed vector. */ /* Replace the old load with a reference to our reconstructed vector. */
nir_ssa_def_rewrite_uses(&lower->def, nir_src_for_ssa(vec)); nir_ssa_def_rewrite_uses(&lower->def, nir_src_for_ssa(vec));
nir_instr_remove(&lower->instr); nir_instr_remove(&lower->instr);
return true;
} }
static void static bool
nir_lower_load_const_to_scalar_impl(nir_function_impl *impl) nir_lower_load_const_to_scalar_impl(nir_function_impl *impl)
{ {
bool progress = false;
nir_foreach_block(block, impl) { nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) { nir_foreach_instr_safe(instr, block) {
if (instr->type == nir_instr_type_load_const) if (instr->type == nir_instr_type_load_const)
lower_load_const_instr_scalar(nir_instr_as_load_const(instr)); progress |=
lower_load_const_instr_scalar(nir_instr_as_load_const(instr));
} }
} }
if (progress)
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return progress;
} }
void bool
nir_lower_load_const_to_scalar(nir_shader *shader) nir_lower_load_const_to_scalar(nir_shader *shader)
{ {
bool progress = false;
nir_foreach_function(function, shader) { nir_foreach_function(function, shader) {
if (function->impl) if (function->impl)
nir_lower_load_const_to_scalar_impl(function->impl); progress |= nir_lower_load_const_to_scalar_impl(function->impl);
} }
return progress;
} }