From 9beb2baaff4a2019aefe3dfc75187d75dba04286 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 14 May 2020 11:36:05 -0700 Subject: [PATCH] freedreno/ir3: juggle around ir3_debug_print() In a later patch, this will get folded into an IR3_PASS() macro, at least for most passes. But to do that, it is better to standardize on printing the ir3 after the pass. Signed-off-by: Rob Clark Part-of: --- src/freedreno/ir3/ir3_compiler_nir.c | 21 ++++++++++++--------- src/freedreno/ir3/ir3_ra.c | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index 0f10e819b06..4dff42c8246 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -3526,14 +3526,16 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, if (so->binning_pass && (ctx->compiler->gpu_id < 600)) fixup_binning_pass(ctx); - ir3_debug_print(ir, "BEFORE CF"); + ir3_debug_print(ir, "AFTER: nir->ir3"); ir3_cf(ir); - ir3_debug_print(ir, "BEFORE CP"); + ir3_debug_print(ir, "AFTER: ir3_cf"); ir3_cp(ir, so); + ir3_debug_print(ir, "AFTER: ir3_cp"); + /* at this point, for binning pass, throw away unneeded outputs: * Note that for a6xx and later, we do this after ir3_cp to ensure * that the uniform/constant layout for BS and VS matches, so that @@ -3568,20 +3570,21 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, } } - ir3_debug_print(ir, "BEFORE GROUPING"); ir3_sched_add_deps(ir); + ir3_debug_print(ir, "AFTER: ir3_sched_add_deps"); + /* Group left/right neighbors, inserting mov's where needed to * solve conflicts: */ ir3_group(ir); - ir3_debug_print(ir, "AFTER GROUPING"); + ir3_debug_print(ir, "AFTER: ir3_group"); ir3_dce(ir, so); - ir3_debug_print(ir, "AFTER DCE"); + ir3_debug_print(ir, "AFTER: ir3_dce"); ret = ir3_sched(ir); if (ret) { @@ -3589,7 +3592,7 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, goto out; } - ir3_debug_print(ir, "AFTER SCHED"); + ir3_debug_print(ir, "AFTER: ir3_sched"); /* Pre-assign VS inputs on a6xx+ binning pass shader, to align * with draw pass VS, so binning and draw pass can both use the @@ -3662,11 +3665,11 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, } ir3_postsched(ctx); - ir3_debug_print(ir, "AFTER POSTSCHED"); + ir3_debug_print(ir, "AFTER: ir3_postsched"); if (compiler->gpu_id >= 600) { if (ir3_a6xx_fixup_atomic_dests(ir, so)) { - ir3_debug_print(ir, "AFTER ATOMIC FIXUP"); + ir3_debug_print(ir, "AFTER: ir3_a6xx_fixup_atomic_dests"); } } @@ -3724,7 +3727,7 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler, */ ir3_legalize(ir, so, &max_bary); - ir3_debug_print(ir, "AFTER LEGALIZE"); + ir3_debug_print(ir, "AFTER: ir3_legalize"); /* Set (ss)(sy) on first TCS and GEOMETRY instructions, since we don't * know what we might have to wait on when coming in from VS chsh. diff --git a/src/freedreno/ir3/ir3_ra.c b/src/freedreno/ir3/ir3_ra.c index 231bfc6ffc1..72e145c94a3 100644 --- a/src/freedreno/ir3/ir3_ra.c +++ b/src/freedreno/ir3/ir3_ra.c @@ -1563,14 +1563,14 @@ ir3_ra(struct ir3_shader_variant *v, struct ir3_instruction **precolor, if (ret) return ret; - ir3_debug_print(v->ir, "AFTER RA (1st pass)"); + ir3_debug_print(v->ir, "AFTER: ir3_ra (1st pass)"); /* Second pass, assign the scalar registers: */ ret = ir3_ra_pass(v, precolor, nprecolor, true); if (ret) return ret; - ir3_debug_print(v->ir, "AFTER RA (2st pass)"); + ir3_debug_print(v->ir, "AFTER: ir3_ra (2st pass)"); #ifdef DEBUG # define SANITY_CHECK DEBUG -- 2.30.2