From 262463a8677c4f09ee5ff07a6f687aaca8699388 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 11 Sep 2021 04:45:55 -0700 Subject: [PATCH] misc: Stop including arch/vecregs.hh and fix transitive includes. Change-Id: I7854e77517f52b7c19cdb91c67016315391fd87f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50255 Reviewed-by: Giacomo Travaglini Maintainer: Gabe Black Tested-by: kokoro --- src/arch/arm/aapcs32.hh | 1 + src/arch/arm/aapcs64.hh | 1 + src/arch/arm/isa.hh | 1 + src/arch/arm/system.hh | 1 + src/arch/arm/tracers/tarmac_base.hh | 1 + src/cpu/exec_context.hh | 1 - src/cpu/o3/regfile.hh | 1 - src/cpu/o3/rename_map.cc | 1 - src/cpu/o3/thread_context.cc | 1 - src/cpu/simple/exec_context.hh | 1 - src/cpu/simple_thread.hh | 1 - src/cpu/thread_context.hh | 1 - src/sim/insttracer.hh | 1 - 13 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/arch/arm/aapcs32.hh b/src/arch/arm/aapcs32.hh index a2d5627ec6..96de7ad072 100644 --- a/src/arch/arm/aapcs32.hh +++ b/src/arch/arm/aapcs32.hh @@ -34,6 +34,7 @@ #include #include "arch/arm/regs/int.hh" +#include "arch/arm/regs/vec.hh" #include "arch/arm/utility.hh" #include "base/intmath.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/arm/aapcs64.hh b/src/arch/arm/aapcs64.hh index f1792524e2..2f53822a70 100644 --- a/src/arch/arm/aapcs64.hh +++ b/src/arch/arm/aapcs64.hh @@ -34,6 +34,7 @@ #include #include "arch/arm/regs/int.hh" +#include "arch/arm/regs/vec.hh" #include "arch/arm/utility.hh" #include "base/intmath.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh index df9418e683..8958e56bc3 100644 --- a/src/arch/arm/isa.hh +++ b/src/arch/arm/isa.hh @@ -46,6 +46,7 @@ #include "arch/arm/pcstate.hh" #include "arch/arm/regs/int.hh" #include "arch/arm/regs/misc.hh" +#include "arch/arm/regs/vec.hh" #include "arch/arm/self_debug.hh" #include "arch/arm/system.hh" #include "arch/arm/types.hh" diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh index 013f7ca32a..a712615b6e 100644 --- a/src/arch/arm/system.hh +++ b/src/arch/arm/system.hh @@ -47,6 +47,7 @@ #include #include "arch/arm/page_size.hh" +#include "arch/arm/types.hh" #include "kern/linux/events.hh" #include "params/ArmSystem.hh" #include "sim/full_system.hh" diff --git a/src/arch/arm/tracers/tarmac_base.hh b/src/arch/arm/tracers/tarmac_base.hh index cbf87a3c36..7948ee64af 100644 --- a/src/arch/arm/tracers/tarmac_base.hh +++ b/src/arch/arm/tracers/tarmac_base.hh @@ -49,6 +49,7 @@ #ifndef __ARCH_ARM_TRACERS_TARMAC_BASE_HH__ #define __ARCH_ARM_TRACERS_TARMAC_BASE_HH__ +#include "arch/arm/types.hh" #include "base/trace.hh" #include "base/types.hh" #include "cpu/static_inst.hh" diff --git a/src/cpu/exec_context.hh b/src/cpu/exec_context.hh index 5fb2cac6f5..2cc767d914 100644 --- a/src/cpu/exec_context.hh +++ b/src/cpu/exec_context.hh @@ -42,7 +42,6 @@ #ifndef __CPU_EXEC_CONTEXT_HH__ #define __CPU_EXEC_CONTEXT_HH__ -#include "arch/vecregs.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "cpu/base.hh" diff --git a/src/cpu/o3/regfile.hh b/src/cpu/o3/regfile.hh index 18d2d518b2..89e7c26156 100644 --- a/src/cpu/o3/regfile.hh +++ b/src/cpu/o3/regfile.hh @@ -46,7 +46,6 @@ #include #include "arch/generic/isa.hh" -#include "arch/vecregs.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/o3/comm.hh" diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc index 6b20258174..a02cfc1f72 100644 --- a/src/cpu/o3/rename_map.cc +++ b/src/cpu/o3/rename_map.cc @@ -43,7 +43,6 @@ #include -#include "arch/vecregs.hh" #include "cpu/o3/dyn_inst.hh" #include "cpu/reg_class.hh" #include "debug/Rename.hh" diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc index e5395211b0..78e1252367 100644 --- a/src/cpu/o3/thread_context.cc +++ b/src/cpu/o3/thread_context.cc @@ -41,7 +41,6 @@ #include "cpu/o3/thread_context.hh" -#include "arch/vecregs.hh" #include "config/the_isa.hh" #include "debug/O3CPU.hh" diff --git a/src/cpu/simple/exec_context.hh b/src/cpu/simple/exec_context.hh index fa3c61c7fb..7a2c198a5f 100644 --- a/src/cpu/simple/exec_context.hh +++ b/src/cpu/simple/exec_context.hh @@ -41,7 +41,6 @@ #ifndef __CPU_SIMPLE_EXEC_CONTEXT_HH__ #define __CPU_SIMPLE_EXEC_CONTEXT_HH__ -#include "arch/vecregs.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "cpu/base.hh" diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index 1de5b370ae..1f7199be05 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -50,7 +50,6 @@ #include "arch/generic/pcstate.hh" #include "arch/generic/tlb.hh" #include "arch/isa.hh" -#include "arch/vecregs.hh" #include "base/logging.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh index 3874ec1479..fb5e87915a 100644 --- a/src/cpu/thread_context.hh +++ b/src/cpu/thread_context.hh @@ -48,7 +48,6 @@ #include "arch/generic/htm.hh" #include "arch/generic/isa.hh" #include "arch/generic/pcstate.hh" -#include "arch/vecregs.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "cpu/pc_event.hh" diff --git a/src/sim/insttracer.hh b/src/sim/insttracer.hh index ddc47fca44..e296a1ee78 100644 --- a/src/sim/insttracer.hh +++ b/src/sim/insttracer.hh @@ -44,7 +44,6 @@ #include #include "arch/generic/pcstate.hh" -#include "arch/vecregs.hh" #include "base/types.hh" #include "cpu/inst_res.hh" #include "cpu/inst_seq.hh"