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_split_var_copies

Browse Source 
No functional changes.

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-10 11:43:55 +02:00
committed by Marge Bot
parent 9dcff3ea53
commit 67fe9ae5c3
1 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/compiler/nir/nir_split_var_copies.c
View File

@@ -87,55 +87,31 @@ split_deref_copy_instr(nir_builder *b,
} }
static bool static bool
split_var_copies_impl(nir_function_impl *impl) split_var_copies_instr(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
{ {
bool progress = false; if (instr->type != nir_instr_type_intrinsic)
return false;
nir_builder b; nir_intrinsic_instr *copy = nir_instr_as_intrinsic(instr);
nir_builder_init(&b, impl); if (copy->intrinsic != nir_intrinsic_copy_deref)
return false;
nir_foreach_block(block, impl) { b->cursor = nir_instr_remove(&copy->instr);
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *copy = nir_instr_as_intrinsic(instr); nir_deref_instr *dst = nir_instr_as_deref(copy->src[0].ssa->parent_instr);
if (copy->intrinsic != nir_intrinsic_copy_deref) nir_deref_instr *src = nir_instr_as_deref(copy->src[1].ssa->parent_instr);
continue; split_deref_copy_instr(b, dst, src,
nir_intrinsic_dst_access(copy),
nir_intrinsic_src_access(copy));
b.cursor = nir_instr_remove(&copy->instr); return true;
nir_deref_instr *dst =
nir_instr_as_deref(copy->src[0].ssa->parent_instr);
nir_deref_instr *src =
nir_instr_as_deref(copy->src[1].ssa->parent_instr);
split_deref_copy_instr(&b, dst, src,
nir_intrinsic_dst_access(copy),
nir_intrinsic_src_access(copy));
progress = true;
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
} }
bool bool
nir_split_var_copies(nir_shader *shader) nir_split_var_copies(nir_shader *shader)
{ {
bool progress = false; return nir_shader_instructions_pass(shader, split_var_copies_instr,
nir_metadata_block_index |
nir_foreach_function(function, shader) { nir_metadata_dominance,
if (function->impl) NULL);
progress = split_var_copies_impl(function->impl) || progress;
}
return progress;
} }