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

spirv: Refactor Op[Spec]ConstantComposite and add better validation

Browse Source 
Now that vtn_base_type is a real and full base type, we can switch on
that instead of the GLSL base type which is a lot fewer cases in our
switch.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2017-12-11 22:25:09 -08:00
parent dabce5061d
commit 936f49268e
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1341,32 +1341,22 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
} }
break; break;
} }
case SpvOpSpecConstantComposite: case SpvOpSpecConstantComposite:
case SpvOpConstantComposite: { case SpvOpConstantComposite: {
unsigned elem_count = count - 3; unsigned elem_count = count - 3;
vtn_fail_if(elem_count != val->type->length,
"%s has %u constituents, expected %u",
spirv_op_to_string(opcode), elem_count, val->type->length);
nir_constant **elems = ralloc_array(b, nir_constant *, elem_count); nir_constant **elems = ralloc_array(b, nir_constant *, elem_count);
for (unsigned i = 0; i < elem_count; i++) for (unsigned i = 0; i < elem_count; i++)
elems[i] = vtn_value(b, w[i + 3], vtn_value_type_constant)->constant; elems[i] = vtn_value(b, w[i + 3], vtn_value_type_constant)->constant;
switch (glsl_get_base_type(val->type->type)) { switch (val->type->base_type) {
case GLSL_TYPE_UINT: case vtn_base_type_vector: {
case GLSL_TYPE_INT: assert(glsl_type_is_vector(val->type->type));
case GLSL_TYPE_UINT16:
case GLSL_TYPE_INT16:
case GLSL_TYPE_UINT64:
case GLSL_TYPE_INT64:
case GLSL_TYPE_FLOAT:
case GLSL_TYPE_FLOAT16:
case GLSL_TYPE_BOOL:
case GLSL_TYPE_DOUBLE: {
int bit_size = glsl_get_bit_size(val->type->type); int bit_size = glsl_get_bit_size(val->type->type);
if (glsl_type_is_matrix(val->type->type)) {
vtn_assert(glsl_get_matrix_columns(val->type->type) == elem_count);
for (unsigned i = 0; i < elem_count; i++)
val->constant->values[i] = elems[i]->values[0];
} else {
vtn_assert(glsl_type_is_vector(val->type->type));
vtn_assert(glsl_get_vector_elements(val->type->type) == elem_count);
for (unsigned i = 0; i < elem_count; i++) { for (unsigned i = 0; i < elem_count; i++) {
switch (bit_size) { switch (bit_size) {
case 64: case 64:
@@ -1382,19 +1372,25 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
vtn_fail("Invalid SpvOpConstantComposite bit size"); vtn_fail("Invalid SpvOpConstantComposite bit size");
} }
} }
}
ralloc_free(elems);
break; break;
} }
case GLSL_TYPE_STRUCT:
case GLSL_TYPE_ARRAY: case vtn_base_type_matrix:
assert(glsl_type_is_matrix(val->type->type));
for (unsigned i = 0; i < elem_count; i++)
val->constant->values[i] = elems[i]->values[0];
break;
case vtn_base_type_struct:
case vtn_base_type_array:
ralloc_steal(val->constant, elems); ralloc_steal(val->constant, elems);
val->constant->num_elements = elem_count; val->constant->num_elements = elem_count;
val->constant->elements = elems; val->constant->elements = elems;
break; break;
default: default:
vtn_fail("Unsupported type for constants"); vtn_fail("Result type of %s must be a composite type",
spirv_op_to_string(opcode));
} }
break; break;
} }