Mesa (main): pan/bi: Report tuples, not nops, in shader-db

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e41d8ed007fa5029329cfa6af274be8978c51eaa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e41d8ed007fa5029329cfa6af274be8978c51eaa

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Thu Jun 10 19:28:05 2021 -0400

pan/bi: Report tuples, not nops, in shader-db

More useful in practice, I find.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11327>

---

 src/panfrost/bifrost/bifrost_compile.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 907bf13f3ac..0b4cbcd037e 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -2904,9 +2904,6 @@ bi_print_stats(bi_context *ctx, unsigned size, FILE *fp)
                 }
         }
 
-        /* tuples = ((# of instructions) + (# of nops)) / 2 */
-        unsigned nr_nops = (2 * nr_tuples) - nr_ins;
-
         /* In the future, we'll calculate thread count for v7. For now we
          * always use fewer threads than we should (v6 style) due to missing
          * piping, TODO: fix that for a nice perf win */
@@ -2915,13 +2912,13 @@ bi_print_stats(bi_context *ctx, unsigned size, FILE *fp)
         /* Dump stats */
 
         fprintf(stderr, "%s - %s shader: "
-                        "%u inst, %u nops, %u clauses, "
+                        "%u inst, %u tuples, %u clauses, "
                         "%u quadwords, %u threads, %u loops, "
                         "%u:%u spills:fills\n",
                         ctx->nir->info.label ?: "",
                         ctx->inputs->is_blend ? "PAN_SHADER_BLEND" :
                         gl_shader_stage_name(ctx->stage),
-                        nr_ins, nr_nops, nr_clauses,
+                        nr_ins, nr_tuples, nr_clauses,
                         size / 16, nr_threads,
                         ctx->loop_count,
                         ctx->spills, ctx->fills);