KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel/compiler: use nir_shader_instructions_pass in brw_nir_lower_scoped_barriers 

No functional changes.

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13189>
This commit is contained in:
Marcin Ślusarz 2021-08-06 14:16:24 +02:00 committed by Marge Bot
parent 3d0332eb12
commit 10a33b046e
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/intel/compiler/brw_nir_lower_scoped_barriers.c
View File

@ -31,52 +31,31 @@
#include "compiler/nir/nir_builder.h"
static bool
lower_impl(nir_function_impl *impl)
lower_instr(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
{
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_scoped_barrier ||
nir_intrinsic_execution_scope(intr) == NIR_SCOPE_NONE)
return false;
if (intr->intrinsic != nir_intrinsic_scoped_barrier ||
nir_intrinsic_execution_scope(intr) == NIR_SCOPE_NONE)
continue;
if (nir_intrinsic_execution_scope(intr) == NIR_SCOPE_WORKGROUP) {
b.cursor = nir_after_instr(&intr->instr);
nir_control_barrier(&b);
}
nir_intrinsic_set_execution_scope(intr, NIR_SCOPE_NONE);
progress = true;
}
if (nir_intrinsic_execution_scope(intr) == NIR_SCOPE_WORKGROUP) {
b->cursor = nir_after_instr(&intr->instr);
nir_control_barrier(b);
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
nir_intrinsic_set_execution_scope(intr, NIR_SCOPE_NONE);
return true;
}
bool
brw_nir_lower_scoped_barriers(nir_shader *nir)
{
bool progress = false;
nir_foreach_function(function, nir) {
if (function->impl)
progress |= lower_impl(function->impl);
}
return progress;
return nir_shader_instructions_pass(nir, lower_instr,
nir_metadata_block_index |
nir_metadata_dominance,
NULL);
}