aco: reorder and cleanup #includes

Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11271>

32 files changed, 134 insertions, 97 deletions

diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp
index 77d4380b213..c1c24d1987c 100644
--- a/src/amd/compiler/aco_assembler.cpp
+++ b/src/amd/compiler/aco_assembler.cpp
@@ -1,13 +1,14 @@
-#include <vector>
-#include <algorithm>
-#include <map>
 
-#include "aco_ir.h"
+
 #include "aco_builder.h"
-#include "common/sid.h"
-#include "ac_shader_util.h"
+#include "aco_ir.h"
+#include "sid.h"
+
 #include "util/memstream.h"
-#include "util/u_math.h"
+
+#include <algorithm>
+#include <map>
+#include <vector>
 
 namespace aco {
 
diff --git a/src/amd/compiler/aco_builder_h.py b/src/amd/compiler/aco_builder_h.py
index cacd066c60f..4adba441746 100644
--- a/src/amd/compiler/aco_builder_h.py
+++ b/src/amd/compiler/aco_builder_h.py
@@ -29,8 +29,6 @@ template = """\
 #define _ACO_BUILDER_
 
 #include "aco_ir.h"
-#include "util/u_math.h"
-#include "util/bitscan.h"
 
 namespace aco {
 enum dpp_ctrl {
@@ -601,7 +599,8 @@ formats = [(f if len(f) == 5 else f + ('',)) for f in formats]
 % endfor
 };
 
-}
+} // namespace aco
+
 #endif /* _ACO_BUILDER_ */"""
 
 from aco_opcodes import opcodes, Format
diff --git a/src/amd/compiler/aco_dead_code_analysis.cpp b/src/amd/compiler/aco_dead_code_analysis.cpp
index 80b4696cb63..5b32b4f468a 100644
--- a/src/amd/compiler/aco_dead_code_analysis.cpp
+++ b/src/amd/compiler/aco_dead_code_analysis.cpp
@@ -25,6 +25,7 @@
 #include "aco_ir.h"
 
 #include <algorithm>
+#include <vector>
 
 /*
  * Implements an analysis pass to determine the number of uses
diff --git a/src/amd/compiler/aco_form_hard_clauses.cpp b/src/amd/compiler/aco_form_hard_clauses.cpp
index 223a4e2478a..2a1bd176f92 100644
--- a/src/amd/compiler/aco_form_hard_clauses.cpp
+++ b/src/amd/compiler/aco_form_hard_clauses.cpp
@@ -21,8 +21,10 @@
  * IN THE SOFTWARE.
  */
 
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
+
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_insert_NOPs.cpp b/src/amd/compiler/aco_insert_NOPs.cpp
index df93cdcb6e2..ddd4037f6b3 100644
--- a/src/amd/compiler/aco_insert_NOPs.cpp
+++ b/src/amd/compiler/aco_insert_NOPs.cpp
@@ -22,14 +22,13 @@
  *
  */
 
-#include <algorithm>
-
-#include "aco_ir.h"
 #include "aco_builder.h"
-#include <stack>
-#include <functional>
+#include "aco_ir.h"
 
-#include <time.h>
+#include <algorithm>
+#include <bitset>
+#include <stack>
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_insert_exec_mask.cpp b/src/amd/compiler/aco_insert_exec_mask.cpp
index 5f457a285f0..29a74e15843 100644
--- a/src/amd/compiler/aco_insert_exec_mask.cpp
+++ b/src/amd/compiler/aco_insert_exec_mask.cpp
@@ -22,10 +22,13 @@
  *
  */
 
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
 #include "util/u_math.h"
 
+#include <set>
+#include <vector>
+
 namespace aco {
 
 namespace {
diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index b1879d61ac2..7f49ac89b17 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -22,14 +22,13 @@
  *
  */
 
-#include <algorithm>
-#include <map>
-#include <stack>
-#include <math.h>
-
 #include "aco_ir.h"
 #include "sid.h"
 
+#include <map>
+#include <stack>
+#include <vector>
+
 namespace aco {
 
 namespace {
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 219760d2d21..d27a7ebb840 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -23,25 +23,24 @@
  *
  */
 
-#include <algorithm>
-#include <array>
-#include <functional>
-#include <map>
-#include <numeric>
-#include <stack>
+#include "aco_instruction_selection.h"
 
-#include "ac_shader_util.h"
-#include "aco_ir.h"
 #include "aco_builder.h"
-#include "aco_interface.h"
-#include "aco_instruction_selection.h"
-#include "util/fast_idiv_by_const.h"
-#include "util/memstream.h"
+#include "aco_ir.h"
 
 #include "ac_exp_param.h"
 #include "sid.h"
 #include "vulkan/radv_descriptor_set.h"
-#include "vulkan/radv_shader.h"
+
+#include "util/fast_idiv_by_const.h"
+#include "util/memstream.h"
+
+#include <array>
+#include <functional>
+#include <map>
+#include <numeric>
+#include <stack>
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_instruction_selection.h b/src/amd/compiler/aco_instruction_selection.h
index a12d886ae2d..50d1a76efd3 100644
--- a/src/amd/compiler/aco_instruction_selection.h
+++ b/src/amd/compiler/aco_instruction_selection.h
@@ -22,11 +22,17 @@
  *
  */
 
-#include <array>
-#include <unordered_map>
+#ifndef ACO_INSTRUCTION_SELECTION_H
+#define ACO_INSTRUCTION_SELECTION_H
+
 #include "aco_ir.h"
+
 #include "vulkan/radv_shader_args.h"
 
+#include <array>
+#include <unordered_map>
+#include <vector>
+
 namespace aco {
 
 struct shader_io_state {
@@ -113,4 +119,6 @@ setup_isel_context(Program* program,
                    struct radv_shader_args *args,
                    bool is_gs_copy_shader);
 
-}
+} // namespace aco
+
+#endif /* ACO_INSTRUCTION_SELECTION_H */
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp
index 5d6fbc253d5..a38caeee154 100644
--- a/src/amd/compiler/aco_instruction_selection_setup.cpp
+++ b/src/amd/compiler/aco_instruction_selection_setup.cpp
@@ -23,11 +23,14 @@
  */
 
 #include "aco_instruction_selection.h"
+
+#include "ac_exp_param.h"
+#include "sid.h"
 #include "vulkan/radv_descriptor_set.h"
-#include "vulkan/radv_shader.h"
+
 #include "nir_control_flow.h"
-#include "sid.h"
-#include "ac_exp_param.h"
+
+#include <vector>
 
 namespace aco {
 
diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index 54a29730de8..c02aba6710d 100644
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -23,12 +23,15 @@
 
 #include "aco_interface.h"
 #include "aco_ir.h"
-#include "util/memstream.h"
+
 #include "vulkan/radv_shader.h"
 #include "vulkan/radv_shader_args.h"
 
+#include "util/memstream.h"
+
 #include <array>
 #include <iostream>
+#include <vector>
 
 static const std::array<aco_compiler_statistic_info, aco::num_statistics> statistic_infos = []()
 {
diff --git a/src/amd/compiler/aco_ir.cpp b/src/amd/compiler/aco_ir.cpp
index da53b2b2914..4184aa1cd43 100644
--- a/src/amd/compiler/aco_ir.cpp
+++ b/src/amd/compiler/aco_ir.cpp
@@ -21,11 +21,13 @@
  * IN THE SOFTWARE.
  *
  */
+
 #include "aco_ir.h"
-#include "vulkan/radv_shader.h"
-#include "c11/threads.h"
+
 #include "util/debug.h"
 
+#include "c11/threads.h"
+
 namespace aco {
 
 uint64_t debug_flags = 0;
diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h
index 997f523dd75..9bbbbe2cadd 100644
--- a/src/amd/compiler/aco_ir.h
+++ b/src/amd/compiler/aco_ir.h
@@ -25,21 +25,16 @@
 #ifndef ACO_IR_H
 #define ACO_IR_H
 
-#include <algorithm>
-#include <vector>
-#include <set>
-#include <unordered_set>
-#include <bitset>
-#include <memory>
-
-#include "nir.h"
-#include "ac_binary.h"
-#include "amd_family.h"
 #include "aco_opcodes.h"
 #include "aco_util.h"
-
 #include "vulkan/radv_shader.h"
 
+#include "nir.h"
+
+#include <bitset>
+#include <memory>
+#include <vector>
+
 struct radv_shader_args;
 struct radv_shader_info;
 
diff --git a/src/amd/compiler/aco_lower_phis.cpp b/src/amd/compiler/aco_lower_phis.cpp
index 0eae8eec3fe..b0b62dda6ba 100644
--- a/src/amd/compiler/aco_lower_phis.cpp
+++ b/src/amd/compiler/aco_lower_phis.cpp
@@ -25,12 +25,12 @@
  *
  */
 
-#include <map>
-
-#include "aco_ir.h"
 #include "aco_builder.h"
-#include <algorithm>
+#include "aco_ir.h"
 
+#include <algorithm>
+#include <map>
+#include <vector>
 
 namespace aco {
 
diff --git a/src/amd/compiler/aco_lower_to_cssa.cpp b/src/amd/compiler/aco_lower_to_cssa.cpp
index e1eec37c20d..15fd0f6ae62 100644
--- a/src/amd/compiler/aco_lower_to_cssa.cpp
+++ b/src/amd/compiler/aco_lower_to_cssa.cpp
@@ -22,10 +22,13 @@
  *
  */
 
+#include "aco_builder.h"
+#include "aco_ir.h"
+
+#include <algorithm>
 #include <map>
 #include <unordered_map>
-#include "aco_ir.h"
-#include "aco_builder.h"
+#include <vector>
 
 /*
  * Implements an algorithm to lower to Concentional SSA Form (CSSA).
diff --git a/src/amd/compiler/aco_lower_to_hw_instr.cpp b/src/amd/compiler/aco_lower_to_hw_instr.cpp
index f9dfe0b2d29..42780bafda6 100644
--- a/src/amd/compiler/aco_lower_to_hw_instr.cpp
+++ b/src/amd/compiler/aco_lower_to_hw_instr.cpp
@@ -25,13 +25,12 @@
  *
  */
 
-#include <map>
-
-#include "aco_ir.h"
 #include "aco_builder.h"
-#include "util/u_math.h"
+#include "aco_ir.h"
 #include "sid.h"
 
+#include <map>
+#include <vector>
 
 namespace aco {
 
diff --git a/src/amd/compiler/aco_opcodes_cpp.py b/src/amd/compiler/aco_opcodes_cpp.py
index 6ffbef22cfa..82587d22fdc 100644
--- a/src/amd/compiler/aco_opcodes_cpp.py
+++ b/src/amd/compiler/aco_opcodes_cpp.py
@@ -28,7 +28,6 @@ template = """\
 
 namespace aco {
 
-
 <%
 opcode_names = sorted(opcodes.keys())
 can_use_input_modifiers = "".join([opcodes[name].input_mod for name in reversed(opcode_names)])
diff --git a/src/amd/compiler/aco_opcodes_h.py b/src/amd/compiler/aco_opcodes_h.py
index 6b8bfc1ee07..6b664b98d8b 100644
--- a/src/amd/compiler/aco_opcodes_h.py
+++ b/src/amd/compiler/aco_opcodes_h.py
@@ -29,6 +29,8 @@ template = """\
 #ifndef _ACO_OPCODES_
 #define _ACO_OPCODES_
 
+#include <cstdint>
+
 <% opcode_names = sorted(opcodes.keys()) %>
 
 enum class aco_opcode : std::uint16_t {
diff --git a/src/amd/compiler/aco_opt_value_numbering.cpp b/src/amd/compiler/aco_opt_value_numbering.cpp
index 3c11772ec81..4faa9bad687 100644
--- a/src/amd/compiler/aco_opt_value_numbering.cpp
+++ b/src/amd/compiler/aco_opt_value_numbering.cpp
@@ -22,9 +22,11 @@
  *
  */
 
+#include "aco_ir.h"
+
 #include <map>
 #include <unordered_map>
-#include "aco_ir.h"
+#include <vector>
 
 /*
  * Implements the algorithm for dominator-tree value numbering
diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index f44f4a3e725..7507ec8dee2 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -25,14 +25,13 @@
  *
  */
 
-#include <algorithm>
-#include <array>
-#include <math.h>
-
 #include "aco_ir.h"
 #include "util/half_float.h"
 #include "util/memstream.h"
-#include "util/u_math.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
 
 namespace aco {
 
diff --git a/src/amd/compiler/aco_optimizer_postRA.cpp b/src/amd/compiler/aco_optimizer_postRA.cpp
index 64b8f7eb84a..94ea6f3cb3c 100644
--- a/src/amd/compiler/aco_optimizer_postRA.cpp
+++ b/src/amd/compiler/aco_optimizer_postRA.cpp
@@ -27,10 +27,10 @@
 
 #include "aco_ir.h"
 
-#include <vector>
 #include <bitset>
 #include <algorithm>
 #include <array>
+#include <vector>
 
 namespace aco {
 namespace {
@@ -341,4 +341,5 @@ void optimize_postRA(Program* program)
    }
 }
 
-} /* End of aco namespace */
\ No newline at end of file
+} /* End of aco namespace */
+
diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp
index ae6731e1d08..a55fe752163 100644
--- a/src/amd/compiler/aco_print_asm.cpp
+++ b/src/amd/compiler/aco_print_asm.cpp
@@ -1,12 +1,15 @@
-#include <array>
-#include <iomanip>
+
 #include "aco_ir.h"
-#include "llvm-c/Disassembler.h"
 #include "ac_llvm_util.h"
 
+#include "llvm-c/Disassembler.h"
 #include <llvm/ADT/StringRef.h>
 #include <llvm/MC/MCDisassembler/MCDisassembler.h>
 
+#include <array>
+#include <iomanip>
+#include <vector>
+
 namespace aco {
 namespace {
 
diff --git a/src/amd/compiler/aco_print_ir.cpp b/src/amd/compiler/aco_print_ir.cpp
index 47a3e98e9c2..bdb5207578b 100644
--- a/src/amd/compiler/aco_print_ir.cpp
+++ b/src/amd/compiler/aco_print_ir.cpp
@@ -1,5 +1,5 @@
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
 
 #include "sid.h"
 #include "ac_shader_util.h"
diff --git a/src/amd/compiler/aco_reduce_assign.cpp b/src/amd/compiler/aco_reduce_assign.cpp
index 1d1a0252e49..c7ba4ff16a2 100644
--- a/src/amd/compiler/aco_reduce_assign.cpp
+++ b/src/amd/compiler/aco_reduce_assign.cpp
@@ -23,8 +23,10 @@
  *
  */
 
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
+
+#include <vector>
 
 /*
  * Insert p_linear_start instructions right before RA to correctly allocate
diff --git a/src/amd/compiler/aco_register_allocation.cpp b/src/amd/compiler/aco_register_allocation.cpp
index b344fb5f9af..a3d8f4d2a1a 100644
--- a/src/amd/compiler/aco_register_allocation.cpp
+++ b/src/amd/compiler/aco_register_allocation.cpp
@@ -26,14 +26,15 @@
  *
  */
 
+#include "aco_ir.h"
+
 #include <algorithm>
 #include <array>
+#include <bitset>
 #include <map>
+#include <set>
 #include <unordered_map>
-
-#include "aco_ir.h"
-#include "sid.h"
-#include "util/u_math.h"
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_reindex_ssa.cpp b/src/amd/compiler/aco_reindex_ssa.cpp
index 28ebd8a53d8..9ad2faced21 100644
--- a/src/amd/compiler/aco_reindex_ssa.cpp
+++ b/src/amd/compiler/aco_reindex_ssa.cpp
@@ -22,7 +22,9 @@
  *
  */
 
-#include <aco_ir.h>
+#include "aco_ir.h"
+
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp
index ff88c0d0bc3..8a8fd67a865 100644
--- a/src/amd/compiler/aco_scheduler.cpp
+++ b/src/amd/compiler/aco_scheduler.cpp
@@ -22,15 +22,16 @@
  *
  */
 
-#include "aco_ir.h"
 #include "aco_builder.h"
-#include <unordered_set>
-#include <algorithm>
-
+#include "aco_ir.h"
 #include "amdgfxregs.h"
 
-#define SMEM_WINDOW_SIZE (350 - ctx.num_waves * 35)
-#define VMEM_WINDOW_SIZE (1024 - ctx.num_waves * 64)
+#include <algorithm>
+#include <unordered_set>
+#include <vector>
+
+#define SMEM_WINDOW_SIZE    (350 - ctx.num_waves * 35)
+#define VMEM_WINDOW_SIZE    (1024 - ctx.num_waves * 64)
 #define POS_EXP_WINDOW_SIZE 512
 #define SMEM_MAX_MOVES (64 - ctx.num_waves * 4)
 #define VMEM_MAX_MOVES (256 - ctx.num_waves * 16)
diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp
index c2670736855..87588be9d06 100644
--- a/src/amd/compiler/aco_spill.cpp
+++ b/src/amd/compiler/aco_spill.cpp
@@ -23,13 +23,15 @@
  *
  */
 
-#include "aco_ir.h"
 #include "aco_builder.h"
+#include "aco_ir.h"
 #include "sid.h"
 
 #include <map>
 #include <set>
 #include <stack>
+#include <unordered_set>
+#include <vector>
 
 /*
  * Implements the spilling algorithm on SSA-form from
diff --git a/src/amd/compiler/aco_ssa_elimination.cpp b/src/amd/compiler/aco_ssa_elimination.cpp
index 6b0c1229229..dcb8b162b76 100644
--- a/src/amd/compiler/aco_ssa_elimination.cpp
+++ b/src/amd/compiler/aco_ssa_elimination.cpp
@@ -22,10 +22,11 @@
  *
  */
 
-
 #include "aco_ir.h"
 
+#include <algorithm>
 #include <map>
+#include <vector>
 
 namespace aco {
 namespace {
diff --git a/src/amd/compiler/aco_statistics.cpp b/src/amd/compiler/aco_statistics.cpp
index f74206b9b55..a8652de8f56 100644
--- a/src/amd/compiler/aco_statistics.cpp
+++ b/src/amd/compiler/aco_statistics.cpp
@@ -21,12 +21,15 @@
  * IN THE SOFTWARE.
  *
  */
- 
-#include <deque>
 
 #include "aco_ir.h"
 #include "util/crc32.h"
 
+#include <algorithm>
+#include <deque>
+#include <set>
+#include <vector>
+
 namespace aco {
 
 /* sgpr_presched/vgpr_presched */
diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h
index af4addd5f72..dc75bf49bc4 100644
--- a/src/amd/compiler/aco_util.h
+++ b/src/amd/compiler/aco_util.h
@@ -25,6 +25,8 @@
 #ifndef ACO_UTIL_H
 #define ACO_UTIL_H
 
+#include "util/bitscan.h"
+
 #include <cassert>
 #include <iterator>
 #include <vector>
diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp
index a86328ca372..2a89dac6807 100644
--- a/src/amd/compiler/aco_validate.cpp
+++ b/src/amd/compiler/aco_validate.cpp
@@ -23,11 +23,12 @@
  */
 
 #include "aco_ir.h"
+#include "util/memstream.h"
 
 #include <array>
 #include <map>
-
-#include "util/memstream.h"
+#include <set>
+#include <vector>
 
 namespace aco {