Mesa (master): etnaviv: output the same shader-db format as freedreno, v3d and intel

[GitLab Mirror]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Sat Oct  5 14:53:46 2019 +0200

etnaviv: output the same shader-db format as freedreno, v3d and intel

This lets us reuse their report.py.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Jonathan Marek <jonathan at marek.ca>

---

 src/gallium/drivers/etnaviv/etnaviv_shader.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index 98d4c2874a7..4664ba96b21 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -306,15 +306,12 @@ dump_shader_info(struct etna_shader_variant *v, struct pipe_debug_callback *debu
    if (!unlikely(etna_mesa_debug & ETNA_DBG_SHADERDB))
       return;
 
-   pipe_debug_message(debug, SHADER_INFO, "\n"
-         "SHADER-DB: %s prog %d/%d: %u instructions %u temps\n"
-         "SHADER-DB: %s prog %d/%d: %u immediates %u loops\n",
+   pipe_debug_message(debug, SHADER_INFO,
+         "%s shader: %u instructions, %u temps, "
+         "%u immediates, %u loops",
          etna_shader_stage(v),
-         v->shader->id, v->id,
          v->code_size,
          v->num_temps,
-         etna_shader_stage(v),
-         v->shader->id, v->id,
          v->uniforms.imm_count,
          v->num_loops);
 }