[PATCH vkd3d 03/17] vkd3d-shader/hlsl: Handle loops in copy propagation.

[Giovanni Mascellani]

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>

On 01/12/21 17:14, Matteo Bruni wrote:
> From: Giovanni Mascellani <gmascellani at codeweavers.com>
> 
> Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
> ---
> changelog: Continue copy propagation after encountering a LOOP, rework for
> the copy_propagation_state change.
> 
>   libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++++++++++--
>   1 file changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
> index cbe546c3..2ef51f78 100644
> --- a/libs/vkd3d-shader/hlsl_codegen.c
> +++ b/libs/vkd3d-shader/hlsl_codegen.c
> @@ -513,6 +513,21 @@ static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if
>       return progress;
>   }
>   
> +static bool copy_propagation_process_loop(struct hlsl_ctx *ctx, struct hlsl_ir_loop *loop,
> +        struct copy_propagation_state *state)
> +{
> +    struct copy_propagation_state inner_state;
> +    bool progress = false;
> +
> +    copy_propagation_invalidate_from_block(ctx, state, &loop->body);
> +
> +    copy_propagation_state_init(ctx, &inner_state, state);
> +    progress |= copy_propagation_transform_block(ctx, &loop->body, &inner_state);
> +    copy_propagation_state_destroy(&inner_state);
> +
> +    return progress;
> +}
> +
>   static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block,
>           struct copy_propagation_state *state)
>   {
> @@ -536,8 +551,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b
>                   break;
>   
>               case HLSL_IR_LOOP:
> -                FIXME("Copy propagation doesn't support loops yet, leaving.\n");
> -                return progress;
> +                progress |= copy_propagation_process_loop(ctx, hlsl_ir_loop(instr), state);
> +                break;
>   
>               default:
>                   break;
>