From b6e6285d9f01f5d6116e7b45eff8d12e57ad3b54 Mon Sep 17 00:00:00 2001 From: "Eric R. Smith" Date: Fri, 29 Aug 2025 14:06:11 -0300 Subject: [PATCH] panfrost: fix typo in register allocation The intention of the code was to allow PHI values to be propagated if they were in registers (as opposed to in memory). As written though values were never propagated. I think this typo was due to some debug code that wasn't removed properly. Fixes: 6c64ad934f7 ("panfrost: spill registers in SSA form") Reviewed-by: Mary Guillemard Reviewed-by: Ashley Smith Part-of: (cherry picked from commit d482b6ca68666a4905a2561a92ddedd16972c157) --- .pick_status.json | 2 +- src/panfrost/compiler/bi_ra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ecf3e485739..4694d8bb54d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9904,7 +9904,7 @@ "description": "panfrost: fix typo in register allocation", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6c64ad934f76dc142926c7a1261ac94d80dca0a9", "notes": null diff --git a/src/panfrost/compiler/bi_ra.c b/src/panfrost/compiler/bi_ra.c index 0f0cd61f3f7..ec22d39051c 100644 --- a/src/panfrost/compiler/bi_ra.c +++ b/src/panfrost/compiler/bi_ra.c @@ -965,7 +965,7 @@ bi_out_of_ssa(bi_context *ctx) } /* Replace the phi with a move */ - allow_propagate = false; + allow_propagate = true; bi_builder b = bi_init_builder(ctx, bi_before_instr(I)); if (I->dest[0].memory) { /* dest was spilled to memory */