From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 11 Feb 2021 00:40:38 +0000 (-0500)
Subject: pan/bi: Fix multithreaded shader-db
X-Git-Tag: upstream/21.2.3~8103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54beea9799531aec85d687bb1dc07d6f07e1bea7;p=platform%2Fupstream%2Fmesa.git

pan/bi: Fix multithreaded shader-db

Clobbered names.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8973>
---

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 12672c4..954f259 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -53,9 +53,6 @@ DEBUG_GET_ONCE_FLAGS_OPTION(bifrost_debug, "BIFROST_MESA_DEBUG", bifrost_debug_o
  * clause of the shader, this range must be valid instructions or zero. */
 #define BIFROST_SHADER_PREFETCH 128
 
-/* TODO: This is not thread safe!! */
-static unsigned SHADER_DB_COUNT = 0;
-
 int bifrost_debug = 0;
 
 #define DBG(fmt, ...) \
@@ -2256,11 +2253,10 @@ bi_print_stats(bi_context *ctx, unsigned size, FILE *fp)
 
         /* Dump stats */
 
-        fprintf(stderr, "shader%d:%s - %s shader: "
+        fprintf(stderr, "%s - %s shader: "
                         "%u inst, %u nops, %u clauses, "
                         "%u quadwords, %u threads, %u loops, "
                         "%u:%u spills:fills\n",
-                        SHADER_DB_COUNT++,
                         ctx->nir->info.label ?: "",
                         ctx->is_blend ? "PAN_SHADER_BLEND" :
                         gl_shader_stage_name(ctx->stage),