vc4: consolidate shader-db output

[Eric: update output string format for new shaderdb]

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18599>
This commit is contained in:
Jose Maria Casanova Crespo
2021-04-14 20:03:21 +02:00
committed by Marge Bot
parent 8ed00732cd
commit cc22016d71
5 changed files with 11 additions and 35 deletions

View File

@@ -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;