Giovanni Mascellani : vkd3d-shader/hlsl: Handle loops in copy propagation.
Alexandre Julliard
julliard at winehq.org
Wed May 4 16:04:04 CDT 2022
Module: vkd3d
Branch: master
Commit: e6ce077ad48d5140009c4470bd916764b468c172
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6ce077ad48d5140009c4470bd916764b468c172
Author: Giovanni Mascellani <gmascellani at codeweavers.com>
Date: Tue May 3 11:57:21 2022 +0200
vkd3d-shader/hlsl: Handle loops in copy propagation.
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 b967a2a3..78b22910 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -634,6 +634,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)
{
@@ -661,8 +676,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;
More information about the wine-cvs
mailing list