aboutsummaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2019-04-15 21:59:50 -0700
committerKenneth Graunke <[email protected]>2019-04-16 09:01:15 -0700
commitfad7801afd194c504bd945c497741ecaf04e2cdd (patch)
tree552a1266c996048a4f900f333a54fb0b8bffb473 /src/intel
parent4f715868a94b2c43656b3574b876bd254757521b (diff)
i965: Move program key debugging to the compiler.
The i965 driver has a bunch of code to compare two sets of program keys and print out the differences. This can be useful for debugging why a shader needed to be recompiled on the fly due to non-orthogonal state dependencies. anv doesn't do recompiles, so we didn't need to share this in the past - but I'd like to use it in iris. This moves the bulk of the code to the compiler where it can be reused. To make that possible, we need to decouple it from i965 - we can't get at the brw program cache directly, nor use brw_context to print things. Instead, we use compiler->shader_perf_log(), and simply pass in keys. We put all of this debugging code in brw_debug_recompile.c, and only export a single function, for simplicity. I also tidied the code a bit while moving it, now that it all lives in one file. Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/Makefile.sources1
-rw-r--r--src/intel/compiler/brw_compiler.h4
-rw-r--r--src/intel/compiler/brw_debug_recompile.c233
-rw-r--r--src/intel/compiler/meson.build1
4 files changed, 239 insertions, 0 deletions
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index c283058db11..ffe51f87698 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -38,6 +38,7 @@ COMPILER_FILES = \
compiler/brw_compiler.h \
compiler/brw_dead_control_flow.cpp \
compiler/brw_dead_control_flow.h \
+ compiler/brw_debug_recompile.c \
compiler/brw_disasm.c \
compiler/brw_disasm_info.c \
compiler/brw_disasm_info.h \
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index fb7ab289723..332789d7809 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -1348,6 +1348,10 @@ brw_compile_cs(const struct brw_compiler *compiler, void *log_data,
int shader_time_index,
char **error_str);
+void brw_debug_key_recompile(const struct brw_compiler *c, void *log,
+ gl_shader_stage stage,
+ const void *old_key, const void *key);
+
static inline uint32_t
encode_slm_size(unsigned gen, uint32_t bytes)
{
diff --git a/src/intel/compiler/brw_debug_recompile.c b/src/intel/compiler/brw_debug_recompile.c
new file mode 100644
index 00000000000..c9d9296b8fd
--- /dev/null
+++ b/src/intel/compiler/brw_debug_recompile.c
@@ -0,0 +1,233 @@
+/*
+ * Copyright © 2019 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 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 brw_debug_recompiles.c
+ */
+
+#include <stdio.h>
+
+#include "brw_compiler.h"
+
+static bool
+key_debug(const struct brw_compiler *c, void *log,
+ const char *name, int a, int b)
+{
+ if (a != b) {
+ c->shader_perf_log(log, " %s %d->%d\n", name, a, b);
+ return true;
+ }
+ return false;
+}
+
+static bool
+key_debug_float(const struct brw_compiler *c, void *log,
+ const char *name, float a, float b)
+{
+ if (a != b) {
+ c->shader_perf_log(log, " %s %f->%f\n", name, a, b);
+ return true;
+ }
+ return false;
+}
+
+#define check(name, field) \
+ key_debug(c, log, name, old_key->field, key->field)
+#define check_float(name, field) \
+ key_debug_float(c, log, name, old_key->field, key->field)
+
+static bool
+debug_sampler_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_sampler_prog_key_data *old_key,
+ const struct brw_sampler_prog_key_data *key)
+{
+ bool found = false;
+
+ found |= check("gather channel quirk", gather_channel_quirk_mask);
+ found |= check("compressed multisample layout",
+ compressed_multisample_layout_mask);
+ found |= check("16x msaa", msaa_16);
+ found |= check("y_uv image bound", y_uv_image_mask);
+ found |= check("y_u_v image bound", y_u_v_image_mask);
+ found |= check("yx_xuxv image bound", yx_xuxv_image_mask);
+ found |= check("xy_uxvx image bound", xy_uxvx_image_mask);
+ found |= check("ayuv image bound", ayuv_image_mask);
+ found |= check("xyuv image bound", xyuv_image_mask);
+
+ for (unsigned i = 0; i < MAX_SAMPLERS; i++) {
+ found |= check("EXT_texture_swizzle or DEPTH_TEXTURE_MODE", swizzles[i]);
+ found |= check("textureGather workarounds", gen6_gather_wa[i]);
+ found |= check_float("scale factor", scale_factors[i]);
+ }
+
+ for (unsigned i = 0; i < 3; i++) {
+ found |= check("GL_CLAMP enabled on any texture unit", gl_clamp_mask[i]);
+ }
+
+ return found;
+}
+
+static void
+debug_vs_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_vs_prog_key *old_key,
+ const struct brw_vs_prog_key *key)
+{
+ bool found = debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ for (unsigned i = 0; i < VERT_ATTRIB_MAX; i++) {
+ found |= check("vertex attrib w/a flags", gl_attrib_wa_flags[i]);
+ }
+
+ found |= check("legacy user clipping", nr_userclip_plane_consts);
+ found |= check("copy edgeflag", copy_edgeflag);
+ found |= check("pointcoord replace", point_coord_replace);
+ found |= check("vertex color clamping", clamp_vertex_color);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+static void
+debug_tcs_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_tcs_prog_key *old_key,
+ const struct brw_tcs_prog_key *key)
+{
+ bool found = debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ found |= check("input vertices", input_vertices);
+ found |= check("outputs written", outputs_written);
+ found |= check("patch outputs written", patch_outputs_written);
+ found |= check("tes primitive mode", tes_primitive_mode);
+ found |= check("quads and equal_spacing workaround", quads_workaround);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+static void
+debug_tes_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_tes_prog_key *old_key,
+ const struct brw_tes_prog_key *key)
+{
+ bool found = debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ found |= check("inputs read", inputs_read);
+ found |= check("patch inputs read", patch_inputs_read);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+static void
+debug_gs_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_gs_prog_key *old_key,
+ const struct brw_gs_prog_key *key)
+{
+ bool found = debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+static void
+debug_fs_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_wm_prog_key *old_key,
+ const struct brw_wm_prog_key *key)
+{
+ bool found = false;
+
+ found |= check("alphatest, computed depth, depth test, or depth write",
+ iz_lookup);
+ found |= check("depth statistics", stats_wm);
+ found |= check("flat shading", flat_shade);
+ found |= check("number of color buffers", nr_color_regions);
+ found |= check("MRT alpha test", alpha_test_replicate_alpha);
+ found |= check("alpha to coverage", alpha_to_coverage);
+ found |= check("fragment color clamping", clamp_fragment_color);
+ found |= check("per-sample interpolation", persample_interp);
+ found |= check("multisampled FBO", multisample_fbo);
+ found |= check("frag coord adds sample pos", frag_coord_adds_sample_pos);
+ found |= check("line smoothing", line_aa);
+ found |= check("high quality derivatives", high_quality_derivatives);
+ found |= check("force dual color blending", force_dual_color_blend);
+ found |= check("coherent fb fetch", coherent_fb_fetch);
+
+ found |= check("input slots valid", input_slots_valid);
+ found |= check("mrt alpha test function", alpha_test_func);
+ found |= check("mrt alpha test reference value", alpha_test_ref);
+
+ found |= debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+static void
+debug_cs_recompile(const struct brw_compiler *c, void *log,
+ const struct brw_cs_prog_key *old_key,
+ const struct brw_cs_prog_key *key)
+{
+ bool found = debug_sampler_recompile(c, log, &old_key->tex, &key->tex);
+
+ if (!found) {
+ c->shader_perf_log(log, " something else\n");
+ }
+}
+
+void
+brw_debug_key_recompile(const struct brw_compiler *c, void *log,
+ gl_shader_stage stage,
+ const void *old_key, const void *key)
+{
+ if (!old_key) {
+ c->shader_perf_log(log, " No previous compile found...\n");
+ return;
+ }
+
+ switch (stage) {
+ case MESA_SHADER_VERTEX:
+ debug_vs_recompile(c, log, old_key, key);
+ break;
+ case MESA_SHADER_TESS_CTRL:
+ debug_tcs_recompile(c, log, old_key, key);
+ break;
+ case MESA_SHADER_TESS_EVAL:
+ debug_tes_recompile(c, log, old_key, key);
+ break;
+ case MESA_SHADER_GEOMETRY:
+ debug_gs_recompile(c, log, old_key, key);
+ break;
+ case MESA_SHADER_FRAGMENT:
+ debug_fs_recompile(c, log, old_key, key);
+ break;
+ case MESA_SHADER_COMPUTE:
+ debug_cs_recompile(c, log, old_key, key);
+ break;
+ default:
+ break;
+ }
+}
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 21614c5baf9..b7051be21af 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -33,6 +33,7 @@ libintel_compiler_files = files(
'brw_compiler.h',
'brw_dead_control_flow.cpp',
'brw_dead_control_flow.h',
+ 'brw_debug_recompile.c',
'brw_disasm.c',
'brw_disasm_info.c',
'brw_disasm_info.h',