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

nir: Handle array-deref-of-vec in var split passes

Browse source 
The changes are pretty straightforward.  For vector splitting, we just
ignore those vectors for now.  We could potentially handle array derefs
with a constant index (and probably should) but that's left for later.
For now, I'm mostly concerned with correctness of the pass.

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22580>
This commit is contained in:
Faith Ekstrand 2023-04-20 11:38:51 -05:00 • committed by Marge Bot
parent 6bc8567bb9
commit 0b3b4da82a
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,18 @@
#include "util/set.h"
#include "util/u_math.h"
static bool
is_array_deref_of_vec(nir_deref_instr *deref)
{
if (deref->deref_type != nir_deref_type_array &&
deref->deref_type != nir_deref_type_array_wildcard)
return false;
nir_deref_instr *parent = nir_deref_instr_parent(deref);
return glsl_type_is_vector_or_scalar(parent->type);
}
static struct set *
get_complex_used_vars(nir_shader *shader, void *mem_ctx)
{
@ -871,6 +883,10 @@ split_array_access_impl(nir_function_impl *impl,
path.path[i + 1]);
}
}
if (is_array_deref_of_vec(deref))
new_deref = nir_build_deref_follower(&b, new_deref, deref);
assert(new_deref->type == deref->type);
/* Rewrite the deref source to point to the split one */
@ -1105,6 +1121,13 @@ mark_deref_used(nir_deref_instr *deref,
if (!usage)
return;
if (is_array_deref_of_vec(deref)) {
if (comps_read)
comps_read = usage->all_comps;
if (comps_written)
comps_written = usage->all_comps;
}
usage->comps_read |= comps_read & usage->all_comps;
usage->comps_written |= comps_written & usage->all_comps;
@ -1516,7 +1539,8 @@ shrink_vec_var_access_impl(nir_function_impl *impl,
deref->deref_type == nir_deref_type_array_wildcard) {
nir_deref_instr *parent = nir_deref_instr_parent(deref);
assert(glsl_type_is_array(parent->type) ||
glsl_type_is_matrix(parent->type));
glsl_type_is_matrix(parent->type) ||
glsl_type_is_vector(parent->type));
deref->type = glsl_get_array_element(parent->type);
}
break;