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

nir: use nir_shader_instructions_pass in nir_lower_bool_to_bitsize

Browse Source 
Changes:
- nir_metadata_preserve(..., nir_metadata_all) is called when pass doesn't
  make progress

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12282>
This commit is contained in:
Marcin Ślusarz
2021-08-09 13:45:27 +02:00
committed by Marge Bot
parent 5beeb3c1db
commit 4a9e2dc1e9
1 changed files with 25 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/compiler/nir/nir_lower_bool_to_bitsize.c
View File

@@ -402,61 +402,41 @@ lower_tex_instr(nir_tex_instr *tex)
} }
static bool static bool
nir_lower_bool_to_bitsize_impl(nir_builder *b, nir_function_impl *impl) nir_lower_bool_to_bitsize_instr(nir_builder *b,
nir_instr *instr,
UNUSED void *cb_data)
{ {
bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
switch (instr->type) { switch (instr->type) {
case nir_instr_type_alu: case nir_instr_type_alu:
progress |= lower_alu_instr(b, nir_instr_as_alu(instr)); return lower_alu_instr(b, nir_instr_as_alu(instr));
break;
case nir_instr_type_load_const: case nir_instr_type_load_const:
progress |= lower_load_const_instr(nir_instr_as_load_const(instr)); return lower_load_const_instr(nir_instr_as_load_const(instr));
break;
case nir_instr_type_phi: case nir_instr_type_phi:
progress |= lower_phi_instr(b, nir_instr_as_phi(instr)); return lower_phi_instr(b, nir_instr_as_phi(instr));
break;
case nir_instr_type_ssa_undef: case nir_instr_type_ssa_undef:
case nir_instr_type_intrinsic: case nir_instr_type_intrinsic: {
nir_foreach_ssa_def(instr, rewrite_1bit_ssa_def_to_32bit, bool progress = false;
&progress); nir_foreach_ssa_def(instr, rewrite_1bit_ssa_def_to_32bit, &progress);
break; return progress;
}
case nir_instr_type_tex: case nir_instr_type_tex:
progress |= lower_tex_instr(nir_instr_as_tex(instr)); return lower_tex_instr(nir_instr_as_tex(instr));
break;
default: default:
nir_foreach_ssa_def(instr, assert_ssa_def_is_not_1bit, NULL); nir_foreach_ssa_def(instr, assert_ssa_def_is_not_1bit, NULL);
return false;
} }
} }
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
}
return progress;
}
bool bool
nir_lower_bool_to_bitsize(nir_shader *shader) nir_lower_bool_to_bitsize(nir_shader *shader)
{ {
nir_builder b; return nir_shader_instructions_pass(shader, nir_lower_bool_to_bitsize_instr,
bool progress = false; nir_metadata_block_index |
nir_metadata_dominance,
nir_foreach_function(function, shader) { NULL);
if (function->impl) {
nir_builder_init(&b, function->impl);
progress = nir_lower_bool_to_bitsize_impl(&b, function->impl) || progress;
}
}
return progress;
} }