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

nak: Use shader_info->var_copies_lowered

Browse source 
This mirrors the change from
ba0bc7182d ("anv: use shader_info->var_copies_lowered")

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41118>
This commit is contained in:
Mel Henning 2026-04-22 17:33:20 -04:00 • committed by Marge Bot
parent 5b5bc956df
commit 75fc9e2704
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/nouveau/compiler/nak_nir.c
View file

@ -135,8 +135,8 @@ phi_vectorize_cb(const nir_instr *instr, const void *data)
return 1;
}
static void
optimize_nir(nir_shader *nir, const struct nak_compiler *nak, bool allow_copies)
void
nak_optimize_nir(nir_shader *nir, const struct nak_compiler *nak)
{
bool progress;
@ -164,10 +164,10 @@ optimize_nir(nir_shader *nir, const struct nak_compiler *nak, bool allow_copies)
OPT(nir, nir_lower_vars_to_ssa);
if (allow_copies) {
/* Only run this pass in the first call to brw_nir_optimize. Later
* calls assume that we've lowered away any copy_deref instructions
* and we don't want to introduce any more.
if (!nir->info.var_copies_lowered) {
/* Only run this pass if nir_lower_var_copies was not called
* yet. That would lower away any copy_deref instructions and we
* don't want to introduce any more.
*/
OPT(nir, nir_opt_find_array_copies);
}
@ -223,12 +223,6 @@ optimize_nir(nir_shader *nir, const struct nak_compiler *nak, bool allow_copies)
OPT(nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
}
void
nak_optimize_nir(nir_shader *nir, const struct nak_compiler *nak)
{
optimize_nir(nir, nak, false);
}
static unsigned
lower_bit_size_cb(const nir_instr *instr, void *data)
{
@ -378,8 +372,7 @@ nak_preprocess_nir(nir_shader *nir, const struct nak_compiler *nak)
OPT(nir, nir_split_var_copies);
OPT(nir, nir_split_struct_vars, nir_var_function_temp);
/* Optimize but allow copies because we haven't lowered them yet */
optimize_nir(nir, nak, true /* allow_copies */);
nak_optimize_nir(nir, nak);
OPT(nir, nir_opt_barrier_modes);
OPT(nir, nir_opt_acquire_release_barriers, SCOPE_QUEUE_FAMILY);