From cf87ed60e2d996708d780872580e57a614e920ef Mon Sep 17 00:00:00 2001 From: Job Noorman Date: Thu, 16 Jan 2025 08:54:06 +0100 Subject: [PATCH] ir3: output early-preamble stat as integer shaderdb's report.py can only handle integer stats. So instead of outputting early/late for the preamble stat, output 0/1 for the early-preamble stat. Signed-off-by: Job Noorman Fixes: 114a47544f0 ("ir3: Add preamble instr count metric") Part-of: --- src/freedreno/ir3/ir3_shader.c | 4 ++-- src/gallium/drivers/freedreno/ir3/ir3_gallium.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freedreno/ir3/ir3_shader.c b/src/freedreno/ir3/ir3_shader.c index 2f777a59ec5..28d901d5fb4 100644 --- a/src/freedreno/ir3/ir3_shader.c +++ b/src/freedreno/ir3/ir3_shader.c @@ -980,8 +980,8 @@ ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out) if (so->info.preamble_instrs_count) { fprintf( - out, "; %u preamble instr, %s preamble\n", - so->info.preamble_instrs_count, so->info.early_preamble ? "early" : "late"); + out, "; %u preamble instr, %d early-preamble\n", + so->info.preamble_instrs_count, so->info.early_preamble); } /* print shader type specific info: */ diff --git a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c index 4b15501d362..3bb188bf38f 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_gallium.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_gallium.c @@ -68,7 +68,7 @@ dump_shader_info(struct ir3_shader_variant *v, "%u dwords, %u last-baryf, %u last-helper, %u half, %u full, %u constlen, " "%u cat0, %u cat1, %u cat2, %u cat3, %u cat4, %u cat5, %u cat6, %u cat7, " "%u stp, %u ldp, %u sstall, %u (ss), %u systall, %u (sy), %d waves, " - "%d loops, %u preamble inst, %s preamble\n", + "%d loops, %u preamble inst, %d early-preamble\n", ir3_shader_stage(v), v->info.instrs_count, v->info.nops_count, v->info.instrs_count - v->info.nops_count, v->info.mov_count, v->info.cov_count, v->info.sizedwords, v->info.last_baryf, @@ -80,7 +80,7 @@ dump_shader_info(struct ir3_shader_variant *v, v->info.instrs_per_cat[6], v->info.instrs_per_cat[7], v->info.stp_count, v->info.ldp_count, v->info.sstall, v->info.ss, v->info.systall, v->info.sy, v->info.max_waves, v->loops, - v->info.preamble_instrs_count, v->info.early_preamble ? "early" : "late"); + v->info.preamble_instrs_count, v->info.early_preamble); } static void