intel/compiler: Reverse inclusion dependency between brw_vec4_live_variables.h and...

brw_vec4.h (in particular vec4_visitor) is logically a user of the
live variables analysis pass, not the other way around.
brw_vec4_live_variables.h requires the definition of some VEC4 IR data
structures to compile, but those can be obtained directly from
brw_ir_vec4.h without including brw_vec4.h.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4012>

diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp
index fb4cf365cb455667517795e47d1636a78d11f18d..b6246d7742ae929c6091abba2f2f12515e7bb0ff 100644 (file)
--- a/src/intel/compiler/brw_vec4.cpp
+++ b/src/intel/compiler/brw_vec4.cpp
@@ -26,7 +26,6 @@
 #include "brw_cfg.h"
 #include "brw_nir.h"
 #include "brw_vec4_builder.h"
-#include "brw_vec4_live_variables.h"
 #include "brw_vec4_vs.h"
 #include "brw_dead_control_flow.h"
 #include "dev/gen_debug.h"

diff --git a/src/intel/compiler/brw_vec4.h b/src/intel/compiler/brw_vec4.h
index a3831c6e1bdf7f2e1feb02c71e5d37e703cb50c6..e014e73995b46f261f4c268eb4c666077475c35b 100644 (file)
--- a/src/intel/compiler/brw_vec4.h
+++ b/src/intel/compiler/brw_vec4.h
@@ -29,6 +29,7 @@
 #ifdef __cplusplus
 #include "brw_ir_vec4.h"
 #include "brw_vec4_builder.h"
+#include "brw_vec4_live_variables.h"
 #endif
 
 #include "compiler/glsl/ir.h"
@@ -52,9 +53,6 @@ brw_vec4_generate_assembly(const struct brw_compiler *compiler,
 } /* extern "C" */
 
 namespace brw {
-
-class vec4_live_variables;
-
 /**
  * The vertex shader front-end.
  *

diff --git a/src/intel/compiler/brw_vec4_live_variables.cpp b/src/intel/compiler/brw_vec4_live_variables.cpp
index 5e3ab6c29e7b03d7f15e970de69ea7d47c4ae7c7..74d0f3bd028b3750f9d5022d85e8a0f0ee134c17 100644 (file)
--- a/src/intel/compiler/brw_vec4_live_variables.cpp
+++ b/src/intel/compiler/brw_vec4_live_variables.cpp
@@ -25,7 +25,7 @@
  *
  */
 
-#include "brw_cfg.h"
+#include "brw_vec4.h"
 #include "brw_vec4_live_variables.h"
 
 using namespace brw;

diff --git a/src/intel/compiler/brw_vec4_live_variables.h b/src/intel/compiler/brw_vec4_live_variables.h
index a86f4f48dffc6723d8b88958671455b38506828c..16eb258d7b4e8175b3bd2808d1c176ac68f0d100 100644 (file)
--- a/src/intel/compiler/brw_vec4_live_variables.h
+++ b/src/intel/compiler/brw_vec4_live_variables.h
@@ -28,8 +28,8 @@
 #ifndef BRW_VEC4_LIVE_VARIABLES_H
 #define BRW_VEC4_LIVE_VARIABLES_H
 
+#include "brw_ir_vec4.h"
 #include "util/bitset.h"
-#include "brw_vec4.h"
 
 namespace brw {