broadcom: Introduce a v3d_debug.h header for vc5 and broadcom Vulkan.
authorEric Anholt <eric@anholt.net>
Fri, 1 Sep 2017 21:38:54 +0000 (14:38 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 10 Oct 2017 18:42:04 +0000 (11:42 -0700)
Unlike vc4, where the compiler and gallium driver live together, for vc5
the compiler will live up in the shared broadcom directory, and need
access to the debug flags.  Define a set of debug flags and helpers there,
so it can be shared between compiler, vc5, and vulkan.

src/broadcom/Makefile.sources
src/broadcom/common/v3d_debug.c [new file with mode: 0644]
src/broadcom/common/v3d_debug.h [new file with mode: 0644]

index 70ed415c5aa0fba72837f0b0d44d3c8274dba30a..92f972754c7ae76a6c1bee2da906be40b93fa7bd 100644 (file)
@@ -11,6 +11,8 @@ BROADCOM_GENXML_XML_FILES = \
 
 BROADCOM_FILES = \
        cle/v3d_packet_helpers.h \
+       common/v3d_debug.c \
+       common/v3d_debug.h \
        common/v3d_device_info.h \
        $()
 
diff --git a/src/broadcom/common/v3d_debug.c b/src/broadcom/common/v3d_debug.c
new file mode 100644 (file)
index 0000000..630bfe0
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2003 VMware, Inc.
+ * Copyright © 2006 Intel Corporation
+ * Copyright © 2017 Broadcom
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * \file v3d_debug.c
+ *
+ * Support for the V3D_DEBUG environment variable, along with other
+ * miscellaneous debugging code.
+ */
+
+#include <stdlib.h>
+
+#include "common/v3d_debug.h"
+#include "util/macros.h"
+#include "util/debug.h"
+#include "c11/threads.h"
+
+uint32_t V3D_DEBUG = 0;
+
+static const struct debug_control debug_control[] = {
+        { "cl",          V3D_DEBUG_CL},
+        { "qpu",         V3D_DEBUG_QPU},
+        { "vir",         V3D_DEBUG_VIR},
+        { "nir",         V3D_DEBUG_NIR},
+        { "tgsi",        V3D_DEBUG_TGSI},
+        { "shaderdb",    V3D_DEBUG_SHADERDB},
+        { "surface",     V3D_DEBUG_SURFACE},
+        { "perf",        V3D_DEBUG_PERF},
+        { "norast",      V3D_DEBUG_NORAST},
+        { "fs",          V3D_DEBUG_FS},
+        { "vs",          V3D_DEBUG_VS},
+        { "cs",          V3D_DEBUG_CS},
+        { NULL,    0 }
+};
+
+uint32_t
+v3d_debug_flag_for_shader_stage(gl_shader_stage stage)
+{
+        uint32_t flags[] = {
+                [MESA_SHADER_VERTEX] = V3D_DEBUG_VS,
+                [MESA_SHADER_TESS_CTRL] = 0,
+                [MESA_SHADER_TESS_EVAL] = 0,
+                [MESA_SHADER_GEOMETRY] = 0,
+                [MESA_SHADER_FRAGMENT] = V3D_DEBUG_FS,
+                [MESA_SHADER_COMPUTE] = V3D_DEBUG_CS,
+        };
+        STATIC_ASSERT(MESA_SHADER_STAGES == 6);
+        return flags[stage];
+}
+
+static void
+v3d_process_debug_variable_once(void)
+{
+        V3D_DEBUG = parse_debug_string(getenv("V3D_DEBUG"), debug_control);
+
+        if (V3D_DEBUG & V3D_DEBUG_SHADERDB)
+                V3D_DEBUG |= V3D_DEBUG_NORAST;
+}
+
+void
+v3d_process_debug_variable(void)
+{
+        static once_flag v3d_process_debug_variable_flag = ONCE_FLAG_INIT;
+
+        call_once(&v3d_process_debug_variable_flag,
+                  v3d_process_debug_variable_once);
+}
diff --git a/src/broadcom/common/v3d_debug.h b/src/broadcom/common/v3d_debug.h
new file mode 100644 (file)
index 0000000..bdb9518
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2003 VMware, Inc.
+ * Copyright © 2007 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef MESA_V3D_DEBUG_H
+#define MESA_V3D_DEBUG_H
+
+#include <stdint.h>
+#include "compiler/shader_enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+ * \file v3d_debug.h
+ *
+ * Basic V3D_DEBUG environment variable handling.  This file defines the
+ * list of debugging flags, as well as some macros for handling them.
+ */
+
+extern uint32_t V3D_DEBUG;
+
+#define V3D_DEBUG_SHADERDB             (1 << 0)
+#define V3D_DEBUG_TGSI                 (1 << 1)
+#define V3D_DEBUG_NIR                  (1 << 2)
+#define V3D_DEBUG_VIR                  (1 << 3)
+#define V3D_DEBUG_QPU                  (1 << 4)
+#define V3D_DEBUG_FS                   (1 << 5)
+#define V3D_DEBUG_VS                   (1 << 6)
+#define V3D_DEBUG_CS                   (1 << 7)
+#define V3D_DEBUG_CL                   (1 << 8)
+#define V3D_DEBUG_SURFACE              (1 << 9)
+#define V3D_DEBUG_PERF                 (1 << 10)
+#define V3D_DEBUG_NORAST               (1 << 11)
+#define V3D_DEBUG_ALWAYS_FLUSH         (1 << 12)
+
+#ifdef HAVE_ANDROID_PLATFORM
+#define LOG_TAG "BROADCOM-MESA"
+#include <cutils/log.h>
+#ifndef ALOGW
+#define ALOGW LOGW
+#endif
+#define dbg_printf(...)        ALOGW(__VA_ARGS__)
+#else
+#define dbg_printf(...)        fprintf(stderr, __VA_ARGS__)
+#endif /* HAVE_ANDROID_PLATFORM */
+
+#define DBG(flag, ...) do {                                     \
+        if (unlikely(V3D_DEBUG & (flag)))                       \
+                dbg_printf(__VA_ARGS__);                        \
+} while(0)
+
+extern uint32_t v3d_debug_flag_for_shader_stage(gl_shader_stage stage);
+
+extern void v3d_process_debug_variable(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* V3D_DEBUG_H */