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

nir/nir_lower_var_copies: Use the nir_shader_instructions_pass() helper

Browse source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11683>
This commit is contained in:
Thomas H.P. Andersen 2023-01-19 17:28:13 +01:00 • committed by Marge Bot
parent 087b082f3d
commit d0fdc8ec6a
1 changed files with 17 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/compiler/nir/nir_lower_var_copies.c
View file

@ -115,41 +115,23 @@ nir_lower_deref_copy_instr(nir_builder *b, nir_intrinsic_instr *copy)
}
static bool
lower_var_copies_impl(nir_function_impl *impl)
lower_var_copies_instr(nir_builder *b, nir_instr *instr, void *data)
{
bool progress = false;
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_builder b;
nir_builder_init(&b, impl);
nir_intrinsic_instr *copy = nir_instr_as_intrinsic(instr);
if (copy->intrinsic != nir_intrinsic_copy_deref)
return false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_lower_deref_copy_instr(b, copy);
nir_intrinsic_instr *copy = nir_instr_as_intrinsic(instr);
if (copy->intrinsic != nir_intrinsic_copy_deref)
continue;
nir_instr_remove(&copy->instr);
nir_deref_instr_remove_if_unused(nir_src_as_deref(copy->src[0]));
nir_deref_instr_remove_if_unused(nir_src_as_deref(copy->src[1]));
nir_lower_deref_copy_instr(&b, copy);
nir_instr_remove(&copy->instr);
nir_deref_instr_remove_if_unused(nir_src_as_deref(copy->src[0]));
nir_deref_instr_remove_if_unused(nir_src_as_deref(copy->src[1]));
progress = true;
nir_instr_free(&copy->instr);
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
nir_instr_free(&copy->instr);
return true;
}
/* Lowers every copy_var instruction in the program to a sequence of
@ -158,14 +140,11 @@ lower_var_copies_impl(nir_function_impl *impl)
bool
nir_lower_var_copies(nir_shader *shader)
{
bool progress = false;
shader->info.var_copies_lowered = true;
nir_foreach_function(function, shader) {
if (function->impl)
progress |= lower_var_copies_impl(function->impl);
}
return progress;
return nir_shader_instructions_pass(shader,
lower_var_copies_instr,
nir_metadata_block_index |
nir_metadata_dominance,
NULL);
}