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

nir/spirv: Add a helper for pushing SSA values

Browse Source 
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
This commit is contained in:
Jason Ekstrand
2017-06-28 02:50:33 -07:00
parent 868456fbf7
commit 182950ceaf
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1379,6 +1379,7 @@ static void
vtn_handle_function_call(struct vtn_builder *b, SpvOp opcode,
const uint32_t *w, unsigned count)
{
struct vtn_type *res_type = vtn_value(b, w[1], vtn_value_type_type)->type;
struct nir_function *callee =
vtn_value(b, w[3], vtn_value_type_function)->func->impl->function;
@@ -1402,6 +1403,7 @@ vtn_handle_function_call(struct vtn_builder *b, SpvOp opcode,
}
nir_variable *out_tmp = NULL;
assert(res_type->type == callee->return_type);
if (!glsl_type_is_void(callee->return_type)) {
out_tmp = nir_local_variable_create(b->impl, callee->return_type,
"out_tmp");
@@ -1413,8 +1415,7 @@ vtn_handle_function_call(struct vtn_builder *b, SpvOp opcode,
if (glsl_type_is_void(callee->return_type)) {
vtn_push_value(b, w[2], vtn_value_type_undef);
} else {
struct vtn_value *retval = vtn_push_value(b, w[2], vtn_value_type_ssa);
retval->ssa = vtn_local_load(b, call->return_deref);
vtn_push_ssa(b, w[2], res_type, vtn_local_load(b, call->return_deref));
}
}

11
src/compiler/spirv/vtn_cfg.c
View File

@@ -112,12 +112,12 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode,
val->pointer = vtn_pointer_for_variable(b, vtn_var, type);
} else {
/* We're a regular SSA value. */
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa);
struct vtn_ssa_value *param_ssa =
vtn_local_load(b, nir_deref_var_create(b, param));
struct vtn_value *val = vtn_push_ssa(b, w[2], type, param_ssa);
/* Name the parameter so it shows up nicely in NIR */
param->name = ralloc_strdup(param, val->name);
val->ssa = vtn_local_load(b, nir_deref_var_create(b, param));
}
break;
}
@@ -504,14 +504,13 @@ vtn_handle_phis_first_pass(struct vtn_builder *b, SpvOp opcode,
* algorithm all over again. It's easier if we just let
* lower_vars_to_ssa do that for us instead of repeating it here.
*/
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa);
struct vtn_type *type = vtn_value(b, w[1], vtn_value_type_type)->type;
nir_variable *phi_var =
nir_local_variable_create(b->nb.impl, type->type, "phi");
_mesa_hash_table_insert(b->phi_table, w, phi_var);
val->ssa = vtn_local_load(b, nir_deref_var_create(b, phi_var));
vtn_push_ssa(b, w[2], type,
vtn_local_load(b, nir_deref_var_create(b, phi_var)));
return true;
}

9
src/compiler/spirv/vtn_private.h
View File

@@ -513,6 +513,15 @@ vtn_push_value(struct vtn_builder *b, uint32_t value_id,
return &b->values[value_id];
}
static inline struct vtn_value *
vtn_push_ssa(struct vtn_builder *b, uint32_t value_id,
struct vtn_type *type, struct vtn_ssa_value *ssa)
{
struct vtn_value *val = vtn_push_value(b, value_id, vtn_value_type_ssa);
val->ssa = ssa;
return val;
}
static inline struct vtn_value *
vtn_untyped_value(struct vtn_builder *b, uint32_t value_id)
{

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

@@ -1774,6 +1774,8 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
}
case SpvOpLoad: {
struct vtn_type *res_type =
vtn_value(b, w[1], vtn_value_type_type)->type;
struct vtn_pointer *src =
vtn_value(b, w[3], vtn_value_type_pointer)->pointer;
@@ -1783,8 +1785,7 @@ vtn_handle_variables(struct vtn_builder *b, SpvOp opcode,
return;
}
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa);
val->ssa = vtn_variable_load(b, src);
vtn_push_ssa(b, w[2], res_type, vtn_variable_load(b, src));
break;
}