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_float

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:50:53 +02:00
committed by Marge Bot
parent 4a9e2dc1e9
commit d28833d60f
1 changed files with 32 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/compiler/nir/nir_lower_bool_to_float.c
View File

@@ -140,66 +140,48 @@ lower_tex_instr(nir_tex_instr *tex)
} }
static bool static bool
nir_lower_bool_to_float_impl(nir_function_impl *impl) nir_lower_bool_to_float_instr(nir_builder *b,
nir_instr *instr,
UNUSED void *cb_data)
{ {
bool progress = false; switch (instr->type) {
case nir_instr_type_alu:
return lower_alu_instr(b, nir_instr_as_alu(instr));
nir_builder b; case nir_instr_type_load_const: {
nir_builder_init(&b, impl); nir_load_const_instr *load = nir_instr_as_load_const(instr);
if (load->def.bit_size == 1) {
nir_foreach_block(block, impl) { nir_const_value *value = load->value;
nir_foreach_instr_safe(instr, block) { for (unsigned i = 0; i < load->def.num_components; i++)
switch (instr->type) { load->value[i].f32 = value[i].b ? 1.0 : 0.0;
case nir_instr_type_alu: load->def.bit_size = 32;
progress |= lower_alu_instr(&b, nir_instr_as_alu(instr)); return true;
break;
case nir_instr_type_load_const: {
nir_load_const_instr *load = nir_instr_as_load_const(instr);
if (load->def.bit_size == 1) {
nir_const_value *value = load->value;
for (unsigned i = 0; i < load->def.num_components; i++)
load->value[i].f32 = value[i].b ? 1.0 : 0.0;
load->def.bit_size = 32;
progress = true;
}
break;
}
case nir_instr_type_intrinsic:
case nir_instr_type_ssa_undef:
case nir_instr_type_phi:
nir_foreach_ssa_def(instr, rewrite_1bit_ssa_def_to_32bit,
&progress);
break;
case nir_instr_type_tex:
progress |= lower_tex_instr(nir_instr_as_tex(instr));
break;
default:
nir_foreach_ssa_def(instr, assert_ssa_def_is_not_1bit, NULL);
}
} }
return false;
} }
if (progress) { case nir_instr_type_intrinsic:
nir_metadata_preserve(impl, nir_metadata_block_index | case nir_instr_type_ssa_undef:
nir_metadata_dominance); case nir_instr_type_phi: {
bool progress = false;
nir_foreach_ssa_def(instr, rewrite_1bit_ssa_def_to_32bit, &progress);
return progress;
} }
return progress; case nir_instr_type_tex:
return lower_tex_instr(nir_instr_as_tex(instr));
default:
nir_foreach_ssa_def(instr, assert_ssa_def_is_not_1bit, NULL);
return false;
}
} }
bool bool
nir_lower_bool_to_float(nir_shader *shader) nir_lower_bool_to_float(nir_shader *shader)
{ {
bool progress = false; return nir_shader_instructions_pass(shader, nir_lower_bool_to_float_instr,
nir_metadata_block_index |
nir_foreach_function(function, shader) { nir_metadata_dominance,
if (function->impl && nir_lower_bool_to_float_impl(function->impl)) NULL);
progress = true;
}
return progress;
} }