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

spirv: Hand-roll fewer vtn_ssa_value creations

Browse Source 
Previously, we created our vtn_ssa_value in _vtn_variable_load_store
manually as we did the recursive load/store.  Instead, we now create the
SSA value before calling into the recursive function.  This is a tiny
bit less efficient but it removes a case of hand-rolling vtn_ssa_value
creation.  For symmetry, we make _vtn_block_load_store assume the value
is already created.  Finally, we remove a trivial hand-rolled case in
vtn_composite_extract.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5278>
This commit is contained in:
Jason Ekstrand
2020-05-30 12:27:54 -05:00
parent 085ade4125
commit 47ebb50cab
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3485,8 +3485,9 @@ vtn_composite_extract(struct vtn_builder *b, struct vtn_ssa_value *src,
* vector to extract. * vector to extract.
*/ */
struct vtn_ssa_value *ret = rzalloc(b, struct vtn_ssa_value); const struct glsl_type *scalar_type =
ret->type = glsl_scalar_type(glsl_get_base_type(cur->type)); glsl_scalar_type(glsl_get_base_type(cur->type));
struct vtn_ssa_value *ret = vtn_create_ssa_value(b, scalar_type);
ret->def = nir_channel(&b->nb, cur->def, indices[i]); ret->def = nir_channel(&b->nb, cur->def, indices[i]);
return ret; return ret;
} else { } else {

15
src/compiler/spirv/vtn_variables.c
View File

@@ -872,9 +872,6 @@ _vtn_block_load_store(struct vtn_builder *b, nir_intrinsic_op op, bool load,
struct vtn_type *type, enum gl_access_qualifier access, struct vtn_type *type, enum gl_access_qualifier access,
struct vtn_ssa_value **inout) struct vtn_ssa_value **inout)
{ {
if (load && *inout == NULL)
*inout = vtn_create_ssa_value(b, type->type);
enum glsl_base_type base_type = glsl_get_base_type(type->type); enum glsl_base_type base_type = glsl_get_base_type(type->type);
switch (base_type) { switch (base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
@@ -1029,7 +1026,7 @@ vtn_block_load(struct vtn_builder *b, struct vtn_pointer *src)
nir_ssa_def *offset, *index = NULL; nir_ssa_def *offset, *index = NULL;
offset = vtn_pointer_to_offset(b, src, &index); offset = vtn_pointer_to_offset(b, src, &index);
struct vtn_ssa_value *value = NULL; struct vtn_ssa_value *value = vtn_create_ssa_value(b, src->type->type);
_vtn_block_load_store(b, op, true, index, offset, _vtn_block_load_store(b, op, true, index, offset,
access_offset, access_size, access_offset, access_size,
src->type, src->access, &value); src->type, src->access, &value);
@@ -1093,7 +1090,6 @@ _vtn_variable_load_store(struct vtn_builder *b, bool load,
* deref. * deref.
*/ */
if (load) { if (load) {
*inout = vtn_create_ssa_value(b, ptr->type->type);
(*inout)->def = nir_load_deref_with_access(&b->nb, deref, (*inout)->def = nir_load_deref_with_access(&b->nb, deref,
ptr->type->access | access); ptr->type->access | access);
} else { } else {
@@ -1115,13 +1111,6 @@ _vtn_variable_load_store(struct vtn_builder *b, bool load,
case GLSL_TYPE_ARRAY: case GLSL_TYPE_ARRAY:
case GLSL_TYPE_STRUCT: { case GLSL_TYPE_STRUCT: {
unsigned elems = glsl_get_length(ptr->type->type); unsigned elems = glsl_get_length(ptr->type->type);
if (load) {
vtn_assert(*inout == NULL);
*inout = rzalloc(b, struct vtn_ssa_value);
(*inout)->type = ptr->type->type;
(*inout)->elems = rzalloc_array(b, struct vtn_ssa_value *, elems);
}
struct vtn_access_chain chain = { struct vtn_access_chain chain = {
.length = 1, .length = 1,
.link = { .link = {
@@ -1148,7 +1137,7 @@ vtn_variable_load(struct vtn_builder *b, struct vtn_pointer *src)
if (vtn_pointer_uses_ssa_offset(b, src)) { if (vtn_pointer_uses_ssa_offset(b, src)) {
return vtn_block_load(b, src); return vtn_block_load(b, src);
} else { } else {
struct vtn_ssa_value *val = NULL; struct vtn_ssa_value *val = vtn_create_ssa_value(b, src->type->type);
_vtn_variable_load_store(b, true, src, src->access, &val); _vtn_variable_load_store(b, true, src, src->access, &val);
return val; return val;
} }