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

agx: use opt_uniform_atomics

Browse Source 
Apple does something similar.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30488>
This commit is contained in:
Alyssa Rosenzweig
2024-08-01 22:07:12 -04:00
parent 39e7d06eea
commit c40c723336
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/asahi/compiler/agx_compile.c
View File

@@ -2717,7 +2717,27 @@ agx_optimize_nir(nir_shader *nir, unsigned *preamble_size)
});
NIR_PASS(_, nir, nir_lower_pack);
nir_convert_to_lcssa(nir, true, true);
NIR_PASS_V(nir, nir_divergence_analysis);
bool progress = false;
static const nir_lower_subgroups_options subgroups_options = {
.ballot_bit_size = 32,
.ballot_components = 1,
.lower_elect = true,
.lower_subgroup_masks = true,
};
NIR_PASS(progress, nir, nir_opt_uniform_atomics, true);
NIR_PASS(progress, nir, nir_opt_uniform_subgroup, &subgroups_options);
/* The above create operations that need lowering/optimizing */
if (progress) {
NIR_PASS(_, nir, agx_nir_lower_subgroups);
NIR_PASS(_, nir, nir_opt_algebraic);
}
progress = false;
NIR_PASS(progress, nir, agx_nir_lower_address);
/* If address lowering made progress, clean up before forming preambles.

6
src/asahi/compiler/agx_nir_lower_subgroups.c
View File

@@ -64,6 +64,12 @@ lower(nir_builder *b, nir_intrinsic_instr *intr, void *data)
return true;
}
case nir_intrinsic_last_invocation: {
nir_def *active_mask = nir_ballot(b, 1, 32, nir_imm_true(b));
nir_def_rewrite_uses(&intr->def, nir_ufind_msb(b, active_mask));
return true;
}
case nir_intrinsic_vote_ieq:
case nir_intrinsic_vote_feq: {
/* The common lowering does: