From cc22016d71f9f7cde458d56d1fa343cbf79a86f0 Mon Sep 17 00:00:00 2001 From: Jose Maria Casanova Crespo Date: Wed, 14 Apr 2021 20:03:21 +0200 Subject: [PATCH] vc4: consolidate shader-db output [Eric: update output string format for new shaderdb] Signed-off-by: Eric Engestrom Reviewed-by: Alyssa Rosenzweig Reviewed-by: Iago Toral Quiroga Part-of: --- src/gallium/drivers/vc4/vc4_program.c | 25 ------------------- src/gallium/drivers/vc4/vc4_qir.c | 6 ++--- src/gallium/drivers/vc4/vc4_qir.h | 1 + .../drivers/vc4/vc4_qir_live_variables.c | 6 +---- src/gallium/drivers/vc4/vc4_qpu_emit.c | 8 ++++-- 5 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index fc7c3ce898e..426512c31a2 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -2350,13 +2350,6 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage, NIR_PASS_V(c->s, nir_convert_from_ssa, true); - if (VC4_DBG(SHADERDB)) { - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d NIR instructions\n", - qir_get_stage_name(c->stage), - c->program_id, c->variant_id, - count_nir_instrs(c->s)); - } - if (VC4_DBG(NIR)) { fprintf(stderr, "%s prog %d/%d NIR:\n", qir_get_stage_name(c->stage), @@ -2416,17 +2409,6 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage, qir_reorder_uniforms(c); vc4_generate_code(vc4, c); - if (VC4_DBG(SHADERDB)) { - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d instructions\n", - qir_get_stage_name(c->stage), - c->program_id, c->variant_id, - c->qpu_inst_count); - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d uniforms\n", - qir_get_stage_name(c->stage), - c->program_id, c->variant_id, - c->num_uniforms); - } - ralloc_free(c->s); return c; @@ -2745,13 +2727,6 @@ vc4_get_compiled_shader(struct vc4_context *vc4, enum qstage stage, shader->fs_threaded = c->fs_threaded; - if (VC4_DBG(SHADERDB) && stage == QSTAGE_FRAG) { - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d FS threads\n", - qir_get_stage_name(c->stage), - c->program_id, c->variant_id, - 1 + shader->fs_threaded); - } - qir_compile_destroy(c); struct vc4_key *dup_key; diff --git a/src/gallium/drivers/vc4/vc4_qir.c b/src/gallium/drivers/vc4/vc4_qir.c index 9c7e735e9ec..7cfe685f1a3 100644 --- a/src/gallium/drivers/vc4/vc4_qir.c +++ b/src/gallium/drivers/vc4/vc4_qir.c @@ -753,9 +753,9 @@ const char * qir_get_stage_name(enum qstage stage) { static const char *names[] = { - [QSTAGE_FRAG] = "FS", - [QSTAGE_VERT] = "VS", - [QSTAGE_COORD] = "CS", + [QSTAGE_FRAG] = "MESA_SHADER_FRAGMENT", + [QSTAGE_VERT] = "MESA_SHADER_VERTEX", + [QSTAGE_COORD] = "MESA_SHADER_COORD", }; return names[stage]; diff --git a/src/gallium/drivers/vc4/vc4_qir.h b/src/gallium/drivers/vc4/vc4_qir.h index 44ff57d537e..8ffb76c1e5c 100644 --- a/src/gallium/drivers/vc4/vc4_qir.h +++ b/src/gallium/drivers/vc4/vc4_qir.h @@ -464,6 +464,7 @@ struct vc4_compile { struct qreg undef; enum qstage stage; uint32_t num_temps; + uint32_t max_reg_pressure; struct list_head blocks; int next_block_index; diff --git a/src/gallium/drivers/vc4/vc4_qir_live_variables.c b/src/gallium/drivers/vc4/vc4_qir_live_variables.c index 992a5006b6d..faca58d11c5 100644 --- a/src/gallium/drivers/vc4/vc4_qir_live_variables.c +++ b/src/gallium/drivers/vc4/vc4_qir_live_variables.c @@ -330,10 +330,6 @@ qir_calculate_live_intervals(struct vc4_compile *c) } max_reg_pressure = MAX2(max_reg_pressure, reg_pressure); } - - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d max temps\n", - qir_get_stage_name(c->stage), - c->program_id, c->variant_id, - max_reg_pressure); + c->max_reg_pressure = max_reg_pressure; } } diff --git a/src/gallium/drivers/vc4/vc4_qpu_emit.c b/src/gallium/drivers/vc4/vc4_qpu_emit.c index fab3a539860..0e416bfd7fa 100644 --- a/src/gallium/drivers/vc4/vc4_qpu_emit.c +++ b/src/gallium/drivers/vc4/vc4_qpu_emit.c @@ -680,9 +680,13 @@ vc4_generate_code(struct vc4_context *vc4, struct vc4_compile *c) cycles += c->qpu_inst_count - inst_count_at_schedule_time; if (VC4_DBG(SHADERDB)) { - fprintf(stderr, "SHADER-DB: %s prog %d/%d: %d estimated cycles\n", + fprintf(stderr, "SHADER-DB %s - %s shader: %d inst, %d threads, %d uniforms, %d max-temps, %d estimated-cycles\n", + c->s->info.name, qir_get_stage_name(c->stage), - c->program_id, c->variant_id, + c->qpu_inst_count, + 1 + c->fs_threaded, + c->num_uniforms, + c->max_reg_pressure, cycles); }