From cf730adc588bcdd87fe8b3eb0a1894038d105438 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Tue, 21 Nov 2023 09:58:55 -0800 Subject: [PATCH] intel/compiler: Make fs_builder include fs_visitor and not the other way This will allow fs_builder have a reference to an fs_visitor (a "fs_shader" really), instead of a reference to a backend_shader. Reviewed-by: Kenneth Graunke Part-of: --- src/intel/compiler/brw_fs.cpp | 1 + src/intel/compiler/brw_fs.h | 1 - src/intel/compiler/brw_fs_builder.h | 1 + src/intel/compiler/brw_fs_combine_constants.cpp | 1 + src/intel/compiler/brw_fs_cse.cpp | 1 + src/intel/compiler/brw_fs_nir.cpp | 1 + src/intel/compiler/brw_fs_reg_allocate.cpp | 1 + src/intel/compiler/brw_fs_scoreboard.cpp | 1 + src/intel/compiler/brw_fs_sel_peephole.cpp | 1 + src/intel/compiler/brw_fs_thread_payload.cpp | 1 + src/intel/compiler/brw_fs_visitor.cpp | 1 + src/intel/compiler/brw_lower_logical_sends.cpp | 1 + src/intel/compiler/test_fs_cmod_propagation.cpp | 1 + src/intel/compiler/test_fs_copy_propagation.cpp | 1 + src/intel/compiler/test_fs_saturate_propagation.cpp | 1 + src/intel/compiler/test_fs_scoreboard.cpp | 1 + src/intel/compiler/test_predicated_break.cpp | 1 + 17 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 60ce87c3eb2..a2f9f4ac2fe 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -30,6 +30,7 @@ #include "brw_eu.h" #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_fs_live_variables.h" #include "brw_nir.h" #include "brw_vec4_gs_visitor.h" diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 12c18688e0b..fa485991e86 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -30,7 +30,6 @@ #include "brw_shader.h" #include "brw_ir_fs.h" -#include "brw_fs_builder.h" #include "brw_fs_live_variables.h" #include "brw_ir_performance.h" #include "compiler/nir/nir.h" diff --git a/src/intel/compiler/brw_fs_builder.h b/src/intel/compiler/brw_fs_builder.h index 957602bfaf8..2c2f48e790d 100644 --- a/src/intel/compiler/brw_fs_builder.h +++ b/src/intel/compiler/brw_fs_builder.h @@ -28,6 +28,7 @@ #include "brw_ir_fs.h" #include "brw_shader.h" #include "brw_eu.h" +#include "brw_fs.h" namespace brw { /** diff --git a/src/intel/compiler/brw_fs_combine_constants.cpp b/src/intel/compiler/brw_fs_combine_constants.cpp index b16a95dfbdf..911c6b684f9 100644 --- a/src/intel/compiler/brw_fs_combine_constants.cpp +++ b/src/intel/compiler/brw_fs_combine_constants.cpp @@ -35,6 +35,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" #include "util/half_float.h" diff --git a/src/intel/compiler/brw_fs_cse.cpp b/src/intel/compiler/brw_fs_cse.cpp index f0a93796e26..8fa1d281b06 100644 --- a/src/intel/compiler/brw_fs_cse.cpp +++ b/src/intel/compiler/brw_fs_cse.cpp @@ -22,6 +22,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" /** @file brw_fs_cse.cpp diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index d0dbfd30d33..264091c8768 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -22,6 +22,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_nir.h" #include "brw_eu.h" #include "nir.h" diff --git a/src/intel/compiler/brw_fs_reg_allocate.cpp b/src/intel/compiler/brw_fs_reg_allocate.cpp index 488606940b8..cc0f4762bc6 100644 --- a/src/intel/compiler/brw_fs_reg_allocate.cpp +++ b/src/intel/compiler/brw_fs_reg_allocate.cpp @@ -27,6 +27,7 @@ #include "brw_eu.h" #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" #include "util/set.h" #include "util/register_allocate.h" diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp index ab9e324c045..12f1e5eab1a 100644 --- a/src/intel/compiler/brw_fs_scoreboard.cpp +++ b/src/intel/compiler/brw_fs_scoreboard.cpp @@ -55,6 +55,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw; diff --git a/src/intel/compiler/brw_fs_sel_peephole.cpp b/src/intel/compiler/brw_fs_sel_peephole.cpp index 540c2c8c21f..1b7fd14e59e 100644 --- a/src/intel/compiler/brw_fs_sel_peephole.cpp +++ b/src/intel/compiler/brw_fs_sel_peephole.cpp @@ -22,6 +22,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" /** @file brw_fs_sel_peephole.cpp diff --git a/src/intel/compiler/brw_fs_thread_payload.cpp b/src/intel/compiler/brw_fs_thread_payload.cpp index 31e6f30030a..be7283a9585 100644 --- a/src/intel/compiler/brw_fs_thread_payload.cpp +++ b/src/intel/compiler/brw_fs_thread_payload.cpp @@ -22,6 +22,7 @@ */ #include "brw_fs.h" +#include "brw_fs_builder.h" using namespace brw; diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp index 87d6268ea51..5696cad56fc 100644 --- a/src/intel/compiler/brw_fs_visitor.cpp +++ b/src/intel/compiler/brw_fs_visitor.cpp @@ -29,6 +29,7 @@ */ #include "brw_eu.h" #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_nir.h" #include "compiler/glsl_types.h" diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp index 1613d117b02..1f6ab84f99f 100644 --- a/src/intel/compiler/brw_lower_logical_sends.cpp +++ b/src/intel/compiler/brw_lower_logical_sends.cpp @@ -27,6 +27,7 @@ #include "brw_eu.h" #include "brw_fs.h" +#include "brw_fs_builder.h" using namespace brw; diff --git a/src/intel/compiler/test_fs_cmod_propagation.cpp b/src/intel/compiler/test_fs_cmod_propagation.cpp index e544623ac20..b821e10a095 100644 --- a/src/intel/compiler/test_fs_cmod_propagation.cpp +++ b/src/intel/compiler/test_fs_cmod_propagation.cpp @@ -23,6 +23,7 @@ #include #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw; diff --git a/src/intel/compiler/test_fs_copy_propagation.cpp b/src/intel/compiler/test_fs_copy_propagation.cpp index 4631a967494..147f62027a2 100644 --- a/src/intel/compiler/test_fs_copy_propagation.cpp +++ b/src/intel/compiler/test_fs_copy_propagation.cpp @@ -23,6 +23,7 @@ #include #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw; diff --git a/src/intel/compiler/test_fs_saturate_propagation.cpp b/src/intel/compiler/test_fs_saturate_propagation.cpp index 604dcd2bea9..417d3a75f4f 100644 --- a/src/intel/compiler/test_fs_saturate_propagation.cpp +++ b/src/intel/compiler/test_fs_saturate_propagation.cpp @@ -23,6 +23,7 @@ #include #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw; diff --git a/src/intel/compiler/test_fs_scoreboard.cpp b/src/intel/compiler/test_fs_scoreboard.cpp index 4b87417772e..7119057574d 100644 --- a/src/intel/compiler/test_fs_scoreboard.cpp +++ b/src/intel/compiler/test_fs_scoreboard.cpp @@ -23,6 +23,7 @@ #include #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw; diff --git a/src/intel/compiler/test_predicated_break.cpp b/src/intel/compiler/test_predicated_break.cpp index 3c9433c7589..6289867d037 100644 --- a/src/intel/compiler/test_predicated_break.cpp +++ b/src/intel/compiler/test_predicated_break.cpp @@ -5,6 +5,7 @@ #include #include "brw_fs.h" +#include "brw_fs_builder.h" #include "brw_cfg.h" using namespace brw;