From 3e543205e795a8031b2f2ac744d1a9a4ccdef7d9 Mon Sep 17 00:00:00 2001 From: "Eric R. Smith" Date: Sun, 31 Aug 2025 09:23:04 -0300 Subject: [PATCH] panfrost: fix debug print of spilled registers We were testing some conditions in the wrong order, so spilled registers were being printed as if they were uniforms. This is incorrect, but only subtly so, and lead to confusion. Fixes: 6c64ad934f7 ("panfrost: spill registers in SSA form") Reviewed-by: Mary Guillemard Reviewed-by: Ashley Smith Part-of: (cherry picked from commit e3552c427eae1a829ff20f3b977fb088687c0ca2) --- .pick_status.json | 2 +- src/panfrost/compiler/bi_printer.c.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4694d8bb54d..e5607302112 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9894,7 +9894,7 @@ "description": "panfrost: fix debug print of spilled registers", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6c64ad934f76dc142926c7a1261ac94d80dca0a9", "notes": null diff --git a/src/panfrost/compiler/bi_printer.c.py b/src/panfrost/compiler/bi_printer.c.py index 833805d2276..944250d738a 100644 --- a/src/panfrost/compiler/bi_printer.c.py +++ b/src/panfrost/compiler/bi_printer.c.py @@ -95,10 +95,10 @@ bi_print_index(FILE *fp, bi_index index) fprintf(fp, "_"); else if (index.type == BI_INDEX_CONSTANT) fprintf(fp, "#0x%x", index.value); - else if (index.type == BI_INDEX_FAU && index.value >= BIR_FAU_UNIFORM) - fprintf(fp, "u%u", index.value & ~BIR_FAU_UNIFORM); else if (index.type == BI_INDEX_FAU && index.memory) fprintf(fp, "m%u", index.value); + else if (index.type == BI_INDEX_FAU && index.value >= BIR_FAU_UNIFORM) + fprintf(fp, "u%u", index.value & ~BIR_FAU_UNIFORM); else if (index.type == BI_INDEX_FAU) fprintf(fp, "%s", bir_fau_name(index.value)); else if (index.type == BI_INDEX_PASS)