Mesa (master): freedreno/ir3/ra: debug msgs tweak

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6317f7d574aaf3538b41ea8b4815f9ea091b045a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6317f7d574aaf3538b41ea8b4815f9ea091b045a

Author: Rob Clark <robdclark at chromium.org>
Date:   Thu Jul 16 12:11:24 2020 -0700

freedreno/ir3/ra: debug msgs tweak

Print out the assigned vreg names earlier.  Also print the few special
nodes.

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5957>

---

 src/freedreno/ir3/ir3_ra.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/freedreno/ir3/ir3_ra.c b/src/freedreno/ir3/ir3_ra.c
index a7b92b5e41d..060784ce986 100644
--- a/src/freedreno/ir3/ir3_ra.c
+++ b/src/freedreno/ir3/ir3_ra.c
@@ -566,6 +566,27 @@ ra_init(struct ir3_ra_ctx *ctx)
 	/* Add vreg name for prefetch-exclusion range: */
 	ctx->prefetch_exclude_node = ctx->alloc_count++;
 
+	if (RA_DEBUG) {
+		d("INSTRUCTION VREG NAMES:");
+		foreach_block (block, &ctx->ir->block_list) {
+			foreach_instr (instr, &block->instr_list) {
+				if (!ctx->instrd[instr->ip].defn)
+					continue;
+				if (!writes_gpr(instr))
+					continue;
+				di(instr, "%04u", scalar_name(ctx, instr, 0));
+			}
+		}
+		d("ARRAY VREG NAMES:");
+		foreach_array (arr, &ctx->ir->array_list) {
+			d("%04u: arr%u", arr->base, arr->id);
+		}
+		d("EXTRA VREG NAMES:");
+		d("%04u: r0_xyz_nodes", ctx->r0_xyz_nodes);
+		d("%04u: hr0_xyz_nodes", ctx->hr0_xyz_nodes);
+		d("%04u: prefetch_exclude_node", ctx->prefetch_exclude_node);
+	}
+
 	ctx->g = ra_alloc_interference_graph(ctx->set->regs, ctx->alloc_count);
 	ralloc_steal(ctx->g, ctx->instrd);
 	ctx->def = rzalloc_array(ctx->g, unsigned, ctx->alloc_count);
@@ -1063,20 +1084,6 @@ ra_add_interference(struct ir3_ra_ctx *ctx)
 			d("   start_ip: %u", arr->start_ip);
 			d("   end_ip:   %u", arr->end_ip);
 		}
-		d("INSTRUCTION VREG NAMES:");
-		foreach_block (block, &ctx->ir->block_list) {
-			foreach_instr (instr, &block->instr_list) {
-				if (!ctx->instrd[instr->ip].defn)
-					continue;
-				if (!writes_gpr(instr))
-					continue;
-				di(instr, "%04u", scalar_name(ctx, instr, 0));
-			}
-		}
-		d("ARRAY VREG NAMES:");
-		foreach_array (arr, &ctx->ir->array_list) {
-			d("%04u: arr%u", arr->base, arr->id);
-		}
 	}
 
 	/* extend start/end ranges based on livein/liveout info from cfg: */