diff --git a/.pick_status.json b/.pick_status.json index 56e54eb3430..f30c4698582 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -33403,7 +33403,7 @@ "description": "freedreno/cffdec: When .mergedregs is set, don't count half regs.", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/freedreno/ir3/disasm-a3xx.c b/src/freedreno/ir3/disasm-a3xx.c index faa8962c025..0063685026c 100644 --- a/src/freedreno/ir3/disasm-a3xx.c +++ b/src/freedreno/ir3/disasm-a3xx.c @@ -266,7 +266,7 @@ static void print_reg_stats(struct disasm_ctx *ctx) * assigned to shader: */ fullreg = (fullreg + 3) / 4; - halfreg = (halfreg + 3) / 4; + halfreg = ctx->regs.used.mergedregs ? 0 : (halfreg + 3) / 4; // Note this count of instructions includes rptN, which matches // up to how mesa prints this: