fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 15:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/compiler: Sort preprocess

Browse source 
Reorders the preprocess passes to be more in-line with modern compilers.

Signed-off-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Co-authored-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40924>
This commit is contained in:
Lorenzo Rossi 2026-04-29 14:46:53 +02:00 • committed by Marge Bot
parent cf6ce1bb8c
commit 768d7cb149
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/panfrost/compiler/bifrost/bifrost_nir.c
View file

@ -372,6 +372,8 @@ bifrost_preprocess_nir(nir_shader *nir, uint64_t gpu_id)
{
MESA_TRACE_FUNC();
NIR_PASS(_, nir, nir_split_var_copies);
/* The DISCARD instruction just flags the thread as discarded, but the
* actual termination only happens when all threads in the quad are
* discarded, or when an instruction with a .discard flow is
@ -381,24 +383,17 @@ bifrost_preprocess_nir(nir_shader *nir, uint64_t gpu_id)
* for extra dead-code elimination when code sections are detected as
* being unused after a termination is crossed.
*/
if (nir->info.stage == MESA_SHADER_FRAGMENT)
if (nir->info.stage == MESA_SHADER_FRAGMENT) {
NIR_PASS(_, nir, nir_lower_terminate_to_demote);
/* Ensure that halt are translated to returns and get ride of them */
NIR_PASS(_, nir, nir_lower_halt_to_return);
NIR_PASS(_, nir, nir_lower_returns);
/* Lower gl_Position pre-optimisation, but after lowering vars to ssa
* (so we don't accidentally duplicate the epilogue since mesa/st has
* messed with our I/O quite a bit already) */
NIR_PASS(_, nir, nir_lower_vars_to_ssa);
if (nir->info.stage == MESA_SHADER_VERTEX) {
} else if (nir->info.stage == MESA_SHADER_VERTEX) {
if (pan_arch(gpu_id) <= 7)
NIR_PASS(_, nir, pan_nir_lower_vertex_id);
}
/* Ensure that halt are translated to returns and get rid of them */
NIR_PASS(_, nir, nir_lower_halt_to_return);
NIR_PASS(_, nir, nir_lower_returns);
/* Get rid of any global vars before we lower to scratch. */
NIR_PASS(_, nir, nir_lower_global_vars_to_local);
@ -418,15 +413,9 @@ bifrost_preprocess_nir(nir_shader *nir, uint64_t gpu_id)
NIR_PASS(_, nir, nir_lower_indirect_derefs_to_if_else_trees,
nir_var_function_temp, ~0);
NIR_PASS(_, nir, nir_split_var_copies);
NIR_PASS(_, nir, nir_lower_var_copies);
NIR_PASS(_, nir, nir_lower_vars_to_ssa);
bi_optimize_loop_nir(nir, gpu_id, true);
/* Lower away all variables for smaller shaders */
NIR_PASS(_, nir, nir_lower_vars_to_ssa);
NIR_PASS(_, nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
NIR_PASS(_, nir, nir_lower_var_copies);
}
/*