[PATCH vkd3d v2 2/3] vkd3d-shader/hlsl: Handle loops in copy propagation.
Giovanni Mascellani
gmascellani at codeweavers.com
Thu Jan 20 05:23:48 CST 2022
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
---
v2: No changes. Technically this was already signed off by Matteo, but
since everything around has changed, maybe he wants to have another check
any way.
---
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 1c334f88..787191d2 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -568,6 +568,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)
{
@@ -591,8 +606,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;
--
2.34.1
More information about the wine-devel
mailing list