[PATCH vkd3d v3 16/17] vkd3d-shader/hlsl: Replace register offsets with index paths in input/output copies.
Giovanni Mascellani
gmascellani at codeweavers.com
Mon Jul 25 03:12:09 CDT 2022
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Il 20/07/22 15:23, Francisco Casas ha scritto:
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> ---
>
> v3:
> * No changes.
>
> The recursive structure of prepend_input_var_copy() and
> append_output_var_copy() could be preserved creating additional
> loads to complete the paths. Otherwise we would be requiring
> passing whole paths as arguments.
>
> These additional loads should be handled by DCE.
>
> Still, matrix vectors are copied iteratively instead of recursively now,
> to avoid the boilerplate of creating new loads in this last step.
>
> Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
> ---
> libs/vkd3d-shader/hlsl_codegen.c | 188 +++++++++++++++++++------------
> 1 file changed, 116 insertions(+), 72 deletions(-)
>
> diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
> index 6437006b..7a245007 100644
> --- a/libs/vkd3d-shader/hlsl_codegen.c
> +++ b/libs/vkd3d-shader/hlsl_codegen.c
> @@ -239,59 +239,75 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir
> return ext_var;
> }
>
> -static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var,
> - struct hlsl_type *type, unsigned int field_offset, unsigned int modifiers, const struct hlsl_semantic *semantic)
> +static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_load *lhs,
> + struct hlsl_type *type, unsigned int modifiers, const struct hlsl_semantic *semantic)
> {
> - struct hlsl_ir_constant *offset;
> - struct hlsl_ir_store *store;
> - struct hlsl_ir_load *load;
> - struct hlsl_ir_var *input;
> + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
> + struct hlsl_ir_var *var = lhs->src.var;
> + unsigned int i;
>
> - if (type->type == HLSL_CLASS_MATRIX)
> + for (i = 0; i < hlsl_type_major_size(type); ++i)
> {
> - struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
> - struct hlsl_semantic vector_semantic = *semantic;
> - unsigned int i;
> + struct hlsl_semantic semantic_copy = *semantic;
> + struct hlsl_ir_store *store;
> + struct hlsl_ir_constant *c;
> + struct hlsl_ir_var *input;
> + struct hlsl_ir_load *load;
>
> - for (i = 0; i < hlsl_type_major_size(type); ++i)
> - {
> - prepend_input_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic);
> - ++vector_semantic.index;
> - }
> + semantic_copy.index = semantic->index + i;
>
> - return;
> - }
> + if (!(input = add_semantic_var(ctx, var, vector_type, modifiers, &semantic_copy, false)))
> + return;
>
> - if (!(input = add_semantic_var(ctx, var, type, modifiers, semantic, false)))
> - return;
> + if (!(load = hlsl_new_var_load(ctx, input, var->loc)))
> + return;
> + list_add_after(&lhs->node.entry, &load->node.entry);
>
> - if (!(load = hlsl_new_var_load(ctx, input, var->loc)))
> - return;
> - list_add_head(instrs, &load->node.entry);
> + if (type->type == HLSL_CLASS_MATRIX)
> + {
> + if (!(c = hlsl_new_uint_constant(ctx, i, &var->loc)))
> + return;
> + list_add_after(&load->node.entry, &c->node.entry);
>
> - if (!(offset = hlsl_new_uint_constant(ctx, field_offset, &var->loc)))
> - return;
> - list_add_after(&load->node.entry, &offset->node.entry);
> + if (!(store = hlsl_new_store_index(ctx, &lhs->src, &c->node, &load->node, 0, &var->loc)))
> + return;
> + list_add_after(&c->node.entry, &store->node.entry);
> + }
> + else
> + {
> + assert(i == 0);
>
> - if (!(store = hlsl_new_store(ctx, var, &offset->node, &load->node, 0, var->loc)))
> - return;
> - list_add_after(&offset->node.entry, &store->node.entry);
> + if (!(store = hlsl_new_store_index(ctx, &lhs->src, NULL, &load->node, 0, &var->loc)))
> + return;
> + list_add_after(&load->node.entry, &store->node.entry);
> + }
> + }
> }
>
> -static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var,
> - struct hlsl_type *type, unsigned int field_offset)
> +static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_load *lhs,
> + struct hlsl_type *type)
> {
> + struct hlsl_ir_var *var = lhs->src.var;
> size_t i;
>
> for (i = 0; i < type->e.record.field_count; ++i)
> {
> const struct hlsl_struct_field *field = &type->e.record.fields[i];
> + struct hlsl_ir_load *field_load;
> + struct hlsl_ir_constant *c;
> +
> + if (!(c = hlsl_new_uint_constant(ctx, i, &var->loc)))
> + return;
> + list_add_after(&lhs->node.entry, &c->node.entry);
> +
> + if (!(field_load = hlsl_new_load_index(ctx, &lhs->src, &c->node, &var->loc)))
> + return;
> + list_add_after(&c->node.entry, &field_load->node.entry);
>
> if (field->type->type == HLSL_CLASS_STRUCT)
> - prepend_input_struct_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset);
> + prepend_input_struct_copy(ctx, instrs, field_load, field->type);
> else if (field->semantic.name)
> - prepend_input_copy(ctx, instrs, var, field->type,
> - field_offset + field->reg_offset, field->modifiers, &field->semantic);
> + prepend_input_copy(ctx, instrs, field_load, field->type, field->modifiers, &field->semantic);
> else
> hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
> "Field '%s' is missing a semantic.", field->name);
> @@ -302,65 +318,87 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
> * and copy the former to the latter, so that writes to input variables work. */
> static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var)
> {
> + struct hlsl_ir_load *load;
> +
> + if (!(load = hlsl_new_var_load(ctx, var, var->loc)))
> + return;
> + list_add_head(instrs, &load->node.entry);
> +
> if (var->data_type->type == HLSL_CLASS_STRUCT)
> - prepend_input_struct_copy(ctx, instrs, var, var->data_type, 0);
> + prepend_input_struct_copy(ctx, instrs, load, var->data_type);
> else if (var->semantic.name)
> - prepend_input_copy(ctx, instrs, var, var->data_type, 0, var->modifiers, &var->semantic);
> + prepend_input_copy(ctx, instrs, load, var->data_type, var->modifiers, &var->semantic);
> }
>
> -static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var,
> - struct hlsl_type *type, unsigned int field_offset, unsigned int modifiers, const struct hlsl_semantic *semantic)
> +static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_load *rhs,
> + struct hlsl_type *type, unsigned int modifiers, const struct hlsl_semantic *semantic)
> {
> - struct hlsl_ir_constant *offset;
> - struct hlsl_ir_store *store;
> - struct hlsl_ir_var *output;
> - struct hlsl_ir_load *load;
> + struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
> + struct hlsl_ir_var *var = rhs->src.var;
> + unsigned int i;
>
> - if (type->type == HLSL_CLASS_MATRIX)
> + for (i = 0; i < hlsl_type_major_size(type); ++i)
> {
> - struct hlsl_type *vector_type = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
> - struct hlsl_semantic vector_semantic = *semantic;
> - unsigned int i;
> + struct hlsl_semantic semantic_copy = *semantic;
> + struct hlsl_ir_store *store;
> + struct hlsl_ir_constant *c;
> + struct hlsl_ir_var *output;
> + struct hlsl_ir_load *load;
>
> - for (i = 0; i < hlsl_type_major_size(type); ++i)
> - {
> - append_output_copy(ctx, instrs, var, vector_type, 4 * i, modifiers, &vector_semantic);
> - ++vector_semantic.index;
> - }
> + semantic_copy.index = semantic->index + i;
>
> - return;
> - }
> + if (!(output = add_semantic_var(ctx, var, vector_type, modifiers, &semantic_copy, true)))
> + return;
>
> - if (!(output = add_semantic_var(ctx, var, type, modifiers, semantic, true)))
> - return;
> + if (type->type == HLSL_CLASS_MATRIX)
> + {
> + if (!(c = hlsl_new_uint_constant(ctx, i, &var->loc)))
> + return;
> + list_add_tail(instrs, &c->node.entry);
>
> - if (!(offset = hlsl_new_uint_constant(ctx, field_offset, &var->loc)))
> - return;
> - list_add_tail(instrs, &offset->node.entry);
> + if (!(load = hlsl_new_load_index(ctx, &rhs->src, &c->node, &var->loc)))
> + return;
> + list_add_tail(instrs, &load->node.entry);
> + }
> + else
> + {
> + assert(i == 0);
>
> - if (!(load = hlsl_new_load(ctx, var, &offset->node, type, var->loc)))
> - return;
> - list_add_after(&offset->node.entry, &load->node.entry);
> + if (!(load = hlsl_new_load_index(ctx, &rhs->src, NULL, &var->loc)))
> + return;
> + list_add_tail(instrs, &load->node.entry);
> + }
>
> - if (!(store = hlsl_new_store(ctx, output, NULL, &load->node, 0, var->loc)))
> - return;
> - list_add_after(&load->node.entry, &store->node.entry);
> + if (!(store = hlsl_new_simple_store(ctx, output, &load->node)))
> + return;
> + list_add_tail(instrs, &store->node.entry);
> + }
> }
>
> -static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var,
> - struct hlsl_type *type, unsigned int field_offset)
> +static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_load *rhs,
> + struct hlsl_type *type)
> {
> + struct hlsl_ir_var *var = rhs->src.var;
> size_t i;
>
> for (i = 0; i < type->e.record.field_count; ++i)
> {
> const struct hlsl_struct_field *field = &type->e.record.fields[i];
> + struct hlsl_ir_load *field_load;
> + struct hlsl_ir_constant *c;
> +
> + if (!(c = hlsl_new_uint_constant(ctx, i, &var->loc)))
> + return;
> + list_add_tail(instrs, &c->node.entry);
> +
> + if (!(field_load = hlsl_new_load_index(ctx, &rhs->src, &c->node, &var->loc)))
> + return;
> + list_add_tail(instrs, &field_load->node.entry);
>
> if (field->type->type == HLSL_CLASS_STRUCT)
> - append_output_struct_copy(ctx, instrs, var, field->type, field_offset + field->reg_offset);
> + append_output_struct_copy(ctx, instrs, field_load, field->type);
> else if (field->semantic.name)
> - append_output_copy(ctx, instrs, var, field->type,
> - field_offset + field->reg_offset, field->modifiers, &field->semantic);
> + append_output_copy(ctx, instrs, field_load, field->type, field->modifiers, &field->semantic);
> else
> hlsl_error(ctx, &field->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC,
> "Field '%s' is missing a semantic.", field->name);
> @@ -372,10 +410,16 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs,
> * variables work. */
> static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var)
> {
> + struct hlsl_ir_load *load;
> +
> + if (!(load = hlsl_new_var_load(ctx, var, var->loc)))
> + return;
> + list_add_tail(instrs, &load->node.entry);
> +
> if (var->data_type->type == HLSL_CLASS_STRUCT)
> - append_output_struct_copy(ctx, instrs, var, var->data_type, 0);
> + append_output_struct_copy(ctx, instrs, load, var->data_type);
> else if (var->semantic.name)
> - append_output_copy(ctx, instrs, var, var->data_type, 0, var->modifiers, &var->semantic);
> + append_output_copy(ctx, instrs, load, var->data_type, var->modifiers, &var->semantic);
> }
>
> static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *),
> @@ -2029,8 +2073,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
>
> list_move_head(&body->instrs, &ctx->static_initializers);
>
> - transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */
> -
> LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry)
> {
> if (var->modifiers & HLSL_STORAGE_UNIFORM)
> @@ -2064,6 +2106,8 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
> append_output_var_copy(ctx, &body->instrs, entry_func->return_var);
> }
>
> + transform_ir(ctx, transform_deref_paths_into_offsets, body, NULL); /* TODO: move forward, remove when no longer needed */
> +
> transform_ir(ctx, lower_broadcasts, body, NULL);
> while (transform_ir(ctx, fold_redundant_casts, body, NULL));
> do
More information about the wine-devel
mailing list