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

nir: Allow atomics as non-complex uses for var-splitting passes

Browse source 
The var splitting pass can rearrange the variables as long as their
position in memory doesn't matter. For block-arranged variables,
or things like memcpys or casts, the layout matters, but atomics
don't imply anything about the layout of the overall variable, so
don't treat them as "complex" for this use case.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23173>
This commit is contained in:
Jesse Natalie 2023-05-19 14:40:17 -07:00 • committed by Marge Bot
parent cf9ea94958
commit bb311ce370
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/nir/nir.h
View file

@ -1811,6 +1811,7 @@ bool nir_deref_instr_is_known_out_of_bounds(nir_deref_instr *instr);
typedef enum {
nir_deref_instr_has_complex_use_allow_memcpy_src = (1 << 0),
nir_deref_instr_has_complex_use_allow_memcpy_dst = (1 << 1),
nir_deref_instr_has_complex_use_allow_atomics = (1 << 2),
} nir_deref_instr_has_complex_use_options;
bool nir_deref_instr_has_complex_use(nir_deref_instr *instr,

6
src/compiler/nir/nir_deref.c
View file

@ -227,6 +227,12 @@ nir_deref_instr_has_complex_use(nir_deref_instr *deref,
continue;
return true;
case nir_intrinsic_deref_atomic:
case nir_intrinsic_deref_atomic_swap:
if (opts & nir_deref_instr_has_complex_use_allow_atomics)
continue;
return true;
default:
return true;
}

5
src/compiler/nir/nir_split_vars.c
View file

@ -49,7 +49,8 @@ get_complex_used_vars(nir_shader *shader, void *mem_ctx)
* nir_deref_instr_has_complex_use is recursive.
*/
if (deref->deref_type == nir_deref_type_var &&
nir_deref_instr_has_complex_use(deref, 0))
nir_deref_instr_has_complex_use(deref,
nir_deref_instr_has_complex_use_allow_atomics))
_mesa_set_add(complex_vars, deref->var);
}
}
@ -1080,7 +1081,7 @@ mark_deref_if_complex(nir_deref_instr *deref,
if (!(deref->var->data.mode & modes))
return;
if (!nir_deref_instr_has_complex_use(deref, 0))
if (!nir_deref_instr_has_complex_use(deref, nir_deref_instr_has_complex_use_allow_atomics))
return;
struct vec_var_usage *usage =