Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40336 )
Change subject: misc: Clean up ISA switching header includes.
......................................................................
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
---
M src/arch/arm/tracers/tarmac_base.cc
M src/arch/arm/tracers/tarmac_parser.cc
M src/arch/arm/tracers/tarmac_record.hh
M src/cpu/inteltrace.cc
M src/cpu/kvm/x86_cpu.cc
M src/cpu/minor/dyn_inst.cc
M src/cpu/minor/execute.cc
M src/cpu/o3/free_list.cc
M src/cpu/o3/impl.hh
M src/cpu/o3/regfile.hh
M src/cpu/o3/rename.hh
M src/cpu/o3/rename_impl.hh
M src/cpu/o3/rename_map.hh
M src/cpu/o3/rob.hh
M src/cpu/simple/base.hh
M src/cpu/static_inst.hh
M src/cpu/thread_state.hh
M src/gpu-compute/shader.hh
M src/gpu-compute/tlb_coalescer.hh
M src/kern/linux/helpers.cc
M src/mem/ruby/system/GPUCoalescer.cc
M src/mem/ruby/system/VIPERCoalescer.cc
M src/sim/mem_state.hh
M src/sim/process.cc
M src/sim/process.hh
M src/sim/pseudo_inst.cc
M src/sim/syscall_emul.cc
M src/sim/vma.cc
28 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/src/arch/arm/tracers/tarmac_base.cc
b/src/arch/arm/tracers/tarmac_base.cc
index e3364c4..fa4d400 100644
--- a/src/arch/arm/tracers/tarmac_base.cc
+++ b/src/arch/arm/tracers/tarmac_base.cc
@@ -40,7 +40,6 @@
#include <algorithm>
#include <string>
-#include "config/the_isa.hh"
#include "cpu/reg_class.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/arm/tracers/tarmac_parser.cc
b/src/arch/arm/tracers/tarmac_parser.cc
index db9c7e1..c18c6ca 100644
--- a/src/arch/arm/tracers/tarmac_parser.cc
+++ b/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"
diff --git a/src/arch/arm/tracers/tarmac_record.hh
b/src/arch/arm/tracers/tarmac_record.hh
index e5179ce..03812ea 100644
--- a/src/arch/arm/tracers/tarmac_record.hh
+++ b/src/arch/arm/tracers/tarmac_record.hh
@@ -47,7 +47,6 @@
#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"
diff --git a/src/cpu/inteltrace.cc b/src/cpu/inteltrace.cc
index 2212dbf..469cc98 100644
--- a/src/cpu/inteltrace.cc
+++ b/src/cpu/inteltrace.cc
@@ -30,7 +30,6 @@
#include <iomanip>
-#include "config/the_isa.hh"
#include "cpu/exetrace.hh"
#include "cpu/static_inst.hh"
diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc
index 4a7d21b..8861c00 100644
--- a/src/cpu/kvm/x86_cpu.cc
+++ b/src/cpu/kvm/x86_cpu.cc
@@ -34,10 +34,10 @@
#include <cerrno>
#include <memory>
-#include "arch/registers.hh"
#include "arch/x86/cpuid.hh"
#include "arch/x86/faults.hh"
#include "arch/x86/interrupts.hh"
+#include "arch/x86/registers.hh"
#include "arch/x86/regs/msr.hh"
#include "arch/x86/utility.hh"
#include "cpu/kvm/base.hh"
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 5a08da8..90c562a 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -41,7 +41,6 @@
#include <sstream>
#include "arch/isa.hh"
-#include "arch/registers.hh"
#include "cpu/base.hh"
#include "cpu/minor/trace.hh"
#include "cpu/reg_class.hh"
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 3eb7811..ed582ad 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -38,7 +38,6 @@
#include "cpu/minor/execute.hh"
#include "arch/locked_mem.hh"
-#include "arch/registers.hh"
#include "arch/utility.hh"
#include "cpu/minor/cpu.hh"
#include "cpu/minor/exec_context.hh"
diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc
index 0e92e2c..f293fa0 100644
--- a/src/cpu/o3/free_list.cc
+++ b/src/cpu/o3/free_list.cc
@@ -29,9 +29,7 @@
#include "cpu/o3/free_list.hh"
-#include "arch/registers.hh"
#include "base/trace.hh"
-#include "config/the_isa.hh"
#include "debug/FreeList.hh"
UnifiedFreeList::UnifiedFreeList(const std::string &_my_name,
diff --git a/src/cpu/o3/impl.hh b/src/cpu/o3/impl.hh
index f180e94..0d36b5a 100644
--- a/src/cpu/o3/impl.hh
+++ b/src/cpu/o3/impl.hh
@@ -29,7 +29,6 @@
#ifndef __CPU_O3_IMPL_HH__
#define __CPU_O3_IMPL_HH__
-#include "config/the_isa.hh"
#include "cpu/o3/cpu_policy.hh"
// Forward declarations.
diff --git a/src/cpu/o3/regfile.hh b/src/cpu/o3/regfile.hh
index b6fbcd00..a0d0f62 100644
--- a/src/cpu/o3/regfile.hh
+++ b/src/cpu/o3/regfile.hh
@@ -44,7 +44,7 @@
#include <vector>
-#include "arch/pcstate.hh"
+#include "arch/registers.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "cpu/o3/comm.hh"
diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh
index 47302c6..c0c9ba4 100644
--- a/src/cpu/o3/rename.hh
+++ b/src/cpu/o3/rename.hh
@@ -46,7 +46,6 @@
#include <utility>
#include "base/statistics.hh"
-#include "config/the_isa.hh"
#include "cpu/timebuf.hh"
#include "sim/probe/probe.hh"
diff --git a/src/cpu/o3/rename_impl.hh b/src/cpu/o3/rename_impl.hh
index 4035667..ddca979 100644
--- a/src/cpu/o3/rename_impl.hh
+++ b/src/cpu/o3/rename_impl.hh
@@ -44,8 +44,6 @@
#include <list>
-#include "arch/registers.hh"
-#include "config/the_isa.hh"
#include "cpu/o3/rename.hh"
#include "cpu/reg_class.hh"
#include "debug/Activity.hh"
diff --git a/src/cpu/o3/rename_map.hh b/src/cpu/o3/rename_map.hh
index e196787..818f0eb 100644
--- a/src/cpu/o3/rename_map.hh
+++ b/src/cpu/o3/rename_map.hh
@@ -46,8 +46,6 @@
#include <utility>
#include <vector>
-#include "arch/pcstate.hh"
-#include "config/the_isa.hh"
#include "cpu/o3/free_list.hh"
#include "cpu/o3/regfile.hh"
#include "cpu/reg_class.hh"
diff --git a/src/cpu/o3/rob.hh b/src/cpu/o3/rob.hh
index 60bcdcf..880796a 100644
--- a/src/cpu/o3/rob.hh
+++ b/src/cpu/o3/rob.hh
@@ -45,9 +45,7 @@
#include <utility>
#include <vector>
-#include "arch/registers.hh"
#include "base/types.hh"
-#include "config/the_isa.hh"
#include "enums/SMTQueuePolicy.hh"
struct DerivO3CPUParams;
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index 55f648e..c49f2de 100644
--- a/src/cpu/simple/base.hh
+++ b/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 Processor;
class ThreadContext;
-namespace TheISA
-{
- class DTB;
- class ITB;
-}
-
namespace Trace {
class InstRecord;
}
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index dfbe261..742cd93 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -47,7 +47,6 @@
#include <string>
#include "arch/pcstate.hh"
-#include "arch/registers.hh"
#include "base/logging.hh"
#include "base/refcnt.hh"
#include "base/types.hh"
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index ad026f5..84abd46 100644
--- a/src/cpu/thread_state.hh
+++ b/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"
diff --git a/src/gpu-compute/shader.hh b/src/gpu-compute/shader.hh
index 300fae1..9d14ddd 100644
--- a/src/gpu-compute/shader.hh
+++ b/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 GPUCommandProcessor;
class GPUDispatcher;
-namespace TheISA
-{
- class GpuTLB;
-}
-
static const int LDS_SIZE = 65536;
// aperture (APE) registers define the base/limit
diff --git a/src/gpu-compute/tlb_coalescer.hh
b/src/gpu-compute/tlb_coalescer.hh
index ef35ecb..5ee7572 100644
--- a/src/gpu-compute/tlb_coalescer.hh
+++ b/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"
diff --git a/src/kern/linux/helpers.cc b/src/kern/linux/helpers.cc
index 5dd4599..09404f6 100644
--- a/src/kern/linux/helpers.cc
+++ b/src/kern/linux/helpers.cc
@@ -37,7 +37,6 @@
#include "kern/linux/helpers.hh"
-#include "config/the_isa.hh"
#include "cpu/thread_context.hh"
#include "mem/port_proxy.hh"
#include "sim/byteswap.hh"
diff --git a/src/mem/ruby/system/GPUCoalescer.cc
b/src/mem/ruby/system/GPUCoalescer.cc
index c5c1c08..62fb4e5 100644
--- a/src/mem/ruby/system/GPUCoalescer.cc
+++ b/src/mem/ruby/system/GPUCoalescer.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"
diff --git a/src/mem/ruby/system/VIPERCoalescer.cc
b/src/mem/ruby/system/VIPERCoalescer.cc
index ac9d64f..905a8cf 100644
--- a/src/mem/ruby/system/VIPERCoalescer.cc
+++ b/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"
diff --git a/src/sim/mem_state.hh b/src/sim/mem_state.hh
index c052389..13b7343 100644
--- a/src/sim/mem_state.hh
+++ b/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"
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 21d4c2a..af20221 100644
--- a/src/sim/process.cc
+++ b/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"
diff --git a/src/sim/process.hh b/src/sim/process.hh
index c9e6a8b..9dc5f22 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -37,11 +37,9 @@
#include <string>
#include <vector>
-#include "arch/registers.hh"
#include "base/loader/memory_image.hh"
#include "base/statistics.hh"
#include "base/types.hh"
-#include "config/the_isa.hh"
#include "mem/se_translating_port_proxy.hh"
#include "sim/fd_array.hh"
#include "sim/fd_entry.hh"
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 9b51b9f..dfcf8c0 100644
--- a/src/sim/pseudo_inst.cc
+++ b/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"
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 8f04cd5..decc120 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -38,10 +38,8 @@
#include <string>
#include <unordered_map>
-#include "arch/utility.hh"
#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"
diff --git a/src/sim/vma.cc b/src/sim/vma.cc
index 6f6306c..e26cc38 100644
--- a/src/sim/vma.cc
+++ b/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
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40336
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I2af6c88dcaf511b086ec808b0ba3196179982af2
Gerrit-Change-Number: 40336
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
