misc: Clean up ISA switching header includes.

Remove includes that aren't needed, including ones for
config/the_isa.hh.

Also stop using switching includes when the ISA is known.

Change-Id: I2af6c88dcaf511b086ec808b0ba3196179982af2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40336
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>

src/arch/arm/tracers/tarmac_parser.cc

@@ -45,7 +45,6 @@
 
 #include "arch/arm/insts/static_inst.hh"
 #include "arch/arm/mmu.hh"
-#include "config/the_isa.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"

src/arch/arm/tracers/tarmac_record.hh

@@ -48,7 +48,6 @@
 #include "arch/arm/regs/misc.hh"
 #include "arch/arm/tracers/tarmac_base.hh"
 #include "base/printable.hh"
-#include "config/the_isa.hh"
 #include "cpu/reg_class.hh"
 #include "cpu/static_inst.hh"
 

src/cpu/inteltrace.cc

@@ -30,7 +30,6 @@
 
 #include <iomanip>
 
-#include "config/the_isa.hh"
 #include "cpu/exetrace.hh"
 #include "cpu/static_inst.hh"
 

src/cpu/kvm/x86_cpu.cc

@@ -37,6 +37,7 @@
 #include "arch/x86/cpuid.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/interrupts.hh"
+#include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/msr.hh"
 #include "arch/x86/utility.hh"
 #include "base/compiler.hh"

src/cpu/o3/regfile.hh

@@ -45,7 +45,6 @@
 #include <vector>
 
 #include "arch/generic/isa.hh"
-#include "arch/pcstate.hh"
 #include "arch/vecregs.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"

src/cpu/o3/rename.hh

@@ -46,7 +46,6 @@
 #include <utility>
 
 #include "base/statistics.hh"
-#include "config/the_isa.hh"
 #include "cpu/o3/comm.hh"
 #include "cpu/o3/commit.hh"
 #include "cpu/o3/dyn_inst_ptr.hh"

src/cpu/simple/base.hh

@@ -43,7 +43,6 @@
 #define __CPU_SIMPLE_BASE_HH__
 
 #include "base/statistics.hh"
-#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/checker/cpu.hh"
 #include "cpu/exec_context.hh"
@@ -63,12 +62,6 @@ class Process;
 class Processor;
 class ThreadContext;
 
-namespace TheISA
-{
-    class DTB;
-    class ITB;
-}
-
 namespace Trace
 {
     class InstRecord;

src/cpu/thread_state.hh

@@ -29,8 +29,6 @@
 #ifndef __CPU_THREAD_STATE_HH__
 #define __CPU_THREAD_STATE_HH__
 
-#include "arch/pcstate.hh"
-#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "sim/process.hh"

src/gpu-compute/shader.hh

@@ -37,7 +37,6 @@
 #include <functional>
 #include <string>
 
-#include "arch/isa.hh"
 #include "base/statistics.hh"
 #include "base/stats/group.hh"
 #include "base/types.hh"
@@ -63,11 +62,6 @@ class BaseTLB;
 class GPUCommandProcessor;
 class GPUDispatcher;
 
-namespace TheISA
-{
-    class GpuTLB;
-}
-
 static const int LDS_SIZE = 65536;
 
 // aperture (APE) registers define the base/limit

src/gpu-compute/tlb_coalescer.hh

@@ -40,7 +40,7 @@
 #include <vector>
 
 #include "arch/generic/tlb.hh"
-#include "arch/isa.hh"
+#include "arch/x86/isa.hh"
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/regs/segment.hh"
 #include "base/logging.hh"

src/kern/linux/helpers.cc

@@ -38,7 +38,6 @@
 #include "kern/linux/helpers.hh"
 
 #include "base/compiler.hh"
-#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"
 #include "sim/byteswap.hh"

src/mem/ruby/system/GPUCoalescer.cc

@@ -36,7 +36,6 @@
 #include "base/compiler.hh"
 #include "base/logging.hh"
 #include "base/str.hh"
-#include "config/the_isa.hh"
 #include "cpu/testers/rubytest/RubyTester.hh"
 #include "debug/GPUCoalescer.hh"
 #include "debug/MemoryAccess.hh"

src/mem/ruby/system/VIPERCoalescer.cc

@@ -35,7 +35,6 @@
 
 #include "base/logging.hh"
 #include "base/str.hh"
-#include "config/the_isa.hh"
 #include "cpu/testers/rubytest/RubyTester.hh"
 #include "debug/GPUCoalescer.hh"
 #include "debug/MemoryAccess.hh"

src/sim/mem_state.hh

@@ -34,7 +34,6 @@
 #include <string>
 #include <vector>
 
-#include "config/the_isa.hh"
 #include "debug/Vma.hh"
 #include "mem/page_table.hh"
 #include "mem/se_translating_port_proxy.hh"

src/sim/process.cc

@@ -55,7 +55,6 @@
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/statistics.hh"
-#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "mem/se_translating_port_proxy.hh"

src/sim/pseudo_inst.cc

@@ -53,7 +53,6 @@
 
 #include "base/debug.hh"
 #include "base/output.hh"
-#include "config/the_isa.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Loader.hh"

src/sim/syscall_emul.cc

@@ -40,7 +40,6 @@
 
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
-#include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
 #include "dev/net/dist_iface.hh"
 #include "mem/page_table.hh"

src/sim/vma.cc

@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 
 #include "base/types.hh"
-#include "config/the_isa.hh"
 
 void
 VMA::fillMemPages(Addr start, Addr size, PortProxy &port) const