From d5b355ce5fd6dbff61f1f471c38aa62db9d621c4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 1 Mar 2017 11:20:25 -0800 Subject: [PATCH] i965: Move intel_debug.h to intel/common/gen_debug.h This is shared between the Vulkan and GL drivers as it's a requirement of the back-end compiler. However, it doesn't really belong in the compiler. We rename the file to match the prefix of the other stuff in common and because libdrm defines an intel_debug.h and this avoids a pile of possible name conflicts. Reviewed-by: Anuj Phogat --- src/intel/Makefile.sources | 2 ++ .../drivers/dri/i965/intel_debug.c => intel/common/gen_debug.c} | 8 +++++--- .../drivers/dri/i965/intel_debug.h => intel/common/gen_debug.h} | 2 +- src/mesa/drivers/dri/i965/Makefile.am | 1 + src/mesa/drivers/dri/i965/Makefile.sources | 4 +--- src/mesa/drivers/dri/i965/brw_blorp.c | 2 +- src/mesa/drivers/dri/i965/brw_compiler.c | 2 +- src/mesa/drivers/dri/i965/brw_context.h | 2 +- src/mesa/drivers/dri/i965/brw_eu.c | 2 +- src/mesa/drivers/dri/i965/brw_eu_compact.c | 2 +- src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_nir.c | 2 +- src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_tes.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vue_map.c | 2 +- src/mesa/drivers/dri/i965/intel_asm_annotation.c | 2 +- 21 files changed, 26 insertions(+), 23 deletions(-) rename src/{mesa/drivers/dri/i965/intel_debug.c => intel/common/gen_debug.c} (97%) rename src/{mesa/drivers/dri/i965/intel_debug.h => intel/common/gen_debug.h} (99%) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index be6bdef..2403712 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -7,6 +7,8 @@ BLORP_FILES = \ blorp/blorp_priv.h COMMON_FILES = \ + common/gen_debug.c \ + common/gen_debug.h \ common/gen_device_info.c \ common/gen_device_info.h \ common/gen_l3_config.c \ diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/intel/common/gen_debug.c similarity index 97% rename from src/mesa/drivers/dri/i965/intel_debug.c rename to src/intel/common/gen_debug.c index 33e8402..858f04d 100644 --- a/src/mesa/drivers/dri/i965/intel_debug.c +++ b/src/intel/common/gen_debug.c @@ -23,14 +23,16 @@ */ /** - * \file intel_debug.c + * \file gen_debug.c * * Support for the INTEL_DEBUG environment variable, along with other * miscellaneous debugging code. */ -#include "brw_context.h" -#include "intel_debug.h" +#include + +#include "common/gen_debug.h" +#include "util/macros.h" #include "util/u_atomic.h" /* for p_atomic_cmpxchg */ #include "util/debug.h" diff --git a/src/mesa/drivers/dri/i965/intel_debug.h b/src/intel/common/gen_debug.h similarity index 99% rename from src/mesa/drivers/dri/i965/intel_debug.h rename to src/intel/common/gen_debug.h index 8c81c1d..24ed7d4 100644 --- a/src/mesa/drivers/dri/i965/intel_debug.h +++ b/src/intel/common/gen_debug.h @@ -31,7 +31,7 @@ extern "C" { #endif /** - * \file intel_debug.h + * \file gen_debug.h * * Basic INTEL_DEBUG environment variable handling. This file defines the * list of debugging flags, as well as some macros for handling them. diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index f87fa67..4ff7e70 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -98,6 +98,7 @@ EXTRA_DIST = \ TEST_LIBS = \ libi965_compiler.la \ $(I965_PERGEN_LIBS) \ + $(top_builddir)/src/intel/common/libintel_common.la \ $(top_builddir)/src/compiler/nir/libnir.la \ $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/intel/isl/libisl.la \ diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 4711be0..62cbdfe 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -84,9 +84,7 @@ i965_compiler_FILES = \ gen6_gs_visitor.cpp \ gen6_gs_visitor.h \ intel_asm_annotation.c \ - intel_asm_annotation.h \ - intel_debug.c \ - intel_debug.h + intel_asm_annotation.h i965_compiler_GENERATED_FILES = \ brw_nir_trig_workarounds.c diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c index 52f85ff..9f7ba3d 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.c +++ b/src/mesa/drivers/dri/i965/brw_blorp.c @@ -34,7 +34,7 @@ #include "brw_meta_util.h" #include "brw_state.h" #include "intel_fbo.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #define FILE_DEBUG_FLAG DEBUG_BLORP diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index f414099..fcad570 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -23,7 +23,7 @@ #include "brw_compiler.h" #include "brw_shader.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "compiler/nir/nir.h" #include "main/errors.h" #include "util/debug.h" diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 288ef3a..4907908 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -45,7 +45,7 @@ #include -#include "intel_debug.h" +#include "common/gen_debug.h" #include "intel_screen.h" #include "intel_tex_obj.h" #include "intel_resolve_map.h" diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index e4cbf53..1344f2b 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -33,7 +33,7 @@ #include "brw_defines.h" #include "brw_eu.h" #include "brw_shader.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "util/ralloc.h" diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c index 778fb6a..5b8e9b2 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_compact.c +++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c @@ -75,7 +75,7 @@ #include "brw_eu.h" #include "brw_shader.h" #include "intel_asm_annotation.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "util/u_atomic.h" /* for p_atomic_cmpxchg */ static const uint32_t g45_control_index_table[32] = { diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index f577386..ead5b26 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -37,7 +37,7 @@ #include "brw_cfg.h" #include "brw_program.h" #include "brw_dead_control_flow.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "compiler/glsl_types.h" #include "compiler/nir/nir_builder.h" #include "program/prog_parameter.h" diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 15e290a..3cf2c98 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -23,7 +23,7 @@ #include "brw_nir.h" #include "brw_shader.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "compiler/glsl_types.h" #include "compiler/nir/nir_builder.h" diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 7522a93..bfaa5e7 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -26,7 +26,7 @@ #include "brw_fs.h" #include "brw_nir.h" #include "brw_vec4_tes.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "main/uniforms.h" #include "util/macros.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 95199fb..d7c0909 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -29,7 +29,7 @@ #include "brw_vec4_live_variables.h" #include "brw_vec4_vs.h" #include "brw_dead_control_flow.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "program/prog_parameter.h" #define MAX_INSTRUCTION (1 << 30) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index 83f5711..abf522a 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -24,7 +24,7 @@ #include "brw_cfg.h" #include "brw_eu.h" #include "brw_program.h" -#include "intel_debug.h" +#include "common/gen_debug.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 3a8bc77..4a8b5be 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -31,7 +31,7 @@ #include "gen6_gs_visitor.h" #include "brw_fs.h" #include "brw_nir.h" -#include "intel_debug.h" +#include "common/gen_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp b/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp index d27074c..d4a647d 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_tcs.cpp @@ -30,7 +30,7 @@ #include "brw_nir.h" #include "brw_vec4_tcs.h" #include "brw_fs.h" -#include "intel_debug.h" +#include "common/gen_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp b/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp index 0c05ab0..bcf9a87 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_tes.cpp @@ -29,7 +29,7 @@ #include "brw_vec4_tes.h" #include "brw_cfg.h" -#include "intel_debug.h" +#include "common/gen_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp index a80a61b..0cec779 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp @@ -23,7 +23,7 @@ #include "brw_vec4_vs.h" -#include "intel_debug.h" +#include "common/gen_debug.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vue_map.c b/src/mesa/drivers/dri/i965/brw_vue_map.c index 8912068..e14cba8 100644 --- a/src/mesa/drivers/dri/i965/brw_vue_map.c +++ b/src/mesa/drivers/dri/i965/brw_vue_map.c @@ -41,7 +41,7 @@ #include "brw_compiler.h" -#include "intel_debug.h" +#include "common/gen_debug.h" static inline void assign_vue_slot(struct brw_vue_map *vue_map, int varying, int slot) diff --git a/src/mesa/drivers/dri/i965/intel_asm_annotation.c b/src/mesa/drivers/dri/i965/intel_asm_annotation.c index bb24e5e..1f3b784 100644 --- a/src/mesa/drivers/dri/i965/intel_asm_annotation.c +++ b/src/mesa/drivers/dri/i965/intel_asm_annotation.c @@ -23,7 +23,7 @@ #include "brw_cfg.h" #include "brw_eu.h" -#include "intel_debug.h" +#include "common/gen_debug.h" #include "intel_asm_annotation.h" #include "compiler/nir/nir.h" -- 2.7.4