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

spirv,nir: Add a better vector_insert

Browse Source 
The old one in spirv_to_nir was besel'ing the whole vector for every
component.  If we think about this as a vector operation, we can do it
way more efficiently.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4495>
This commit is contained in:
Jason Ekstrand
2020-04-08 11:14:40 -05:00
committed by Marge Bot
parent 380bf556bf
commit c478f8ad6c
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/compiler/spirv/spirv_to_nir.c
View File

@@ -3341,12 +3341,6 @@ vtn_vector_insert(struct vtn_builder *b, nir_ssa_def *src, nir_ssa_def *insert,
return &vec->dest.dest.ssa; return &vec->dest.dest.ssa;
} }
static nir_ssa_def *
nir_ieq_imm(nir_builder *b, nir_ssa_def *x, uint64_t i)
{
return nir_ieq(b, x, nir_imm_intN_t(b, i, x->bit_size));
}
nir_ssa_def * nir_ssa_def *
vtn_vector_extract_dynamic(struct vtn_builder *b, nir_ssa_def *src, vtn_vector_extract_dynamic(struct vtn_builder *b, nir_ssa_def *src,
nir_ssa_def *index) nir_ssa_def *index)
@@ -3358,12 +3352,17 @@ nir_ssa_def *
vtn_vector_insert_dynamic(struct vtn_builder *b, nir_ssa_def *src, vtn_vector_insert_dynamic(struct vtn_builder *b, nir_ssa_def *src,
nir_ssa_def *insert, nir_ssa_def *index) nir_ssa_def *insert, nir_ssa_def *index)
{ {
nir_ssa_def *dest = vtn_vector_insert(b, src, insert, 0); nir_const_value per_comp_idx_const[NIR_MAX_VEC_COMPONENTS];
for (unsigned i = 1; i < src->num_components; i++) for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
dest = nir_bcsel(&b->nb, nir_ieq_imm(&b->nb, index, i), per_comp_idx_const[i] = nir_const_value_for_int(i, index->bit_size);
vtn_vector_insert(b, src, insert, i), dest); nir_ssa_def *per_comp_idx =
nir_build_imm(&b->nb, src->num_components,
index->bit_size, per_comp_idx_const);
return dest; /* nir_builder will automatically splat out scalars to vectors so an insert
* is as simple as "if I'm the channel, replace me with the scalar."
*/
return nir_bcsel(&b->nb, nir_ieq(&b->nb, index, per_comp_idx), insert, src);
} }
static nir_ssa_def * static nir_ssa_def *