Gabe Black has submitted this change. (
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
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40336
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
---
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/o3/regfile.hh
M src/cpu/o3/rename.hh
M src/cpu/simple/base.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/pseudo_inst.cc
M src/sim/syscall_emul.cc
M src/sim/vma.cc
18 files changed, 2 insertions(+), 29 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
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 b02f780..deaca5e 100644
--- a/src/arch/arm/tracers/tarmac_record.hh
+++ b/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"
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 870b293..8b2b578 100644
--- a/src/cpu/kvm/x86_cpu.cc
+++ b/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"
diff --git a/src/cpu/o3/regfile.hh b/src/cpu/o3/regfile.hh
index 543d19f..3447b36 100644
--- a/src/cpu/o3/regfile.hh
+++ b/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"
diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh
index 4f0e5b9..57990a8 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/o3/comm.hh"
#include "cpu/o3/commit.hh"
#include "cpu/o3/dyn_inst_ptr.hh"
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index 8d56c3b..c63db8b 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/thread_state.hh b/src/cpu/thread_state.hh
index cf36369..661dff2 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 e443996..3f91018 100644
--- a/src/kern/linux/helpers.cc
+++ b/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"
diff --git a/src/mem/ruby/system/GPUCoalescer.cc
b/src/mem/ruby/system/GPUCoalescer.cc
index ab1970b..43b8fd2 100644
--- a/src/mem/ruby/system/GPUCoalescer.cc
+++ b/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"
diff --git a/src/mem/ruby/system/VIPERCoalescer.cc
b/src/mem/ruby/system/VIPERCoalescer.cc
index d8d2fd9..df631b1 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 215e244..b613b55 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 d6f1a71..ee7624a 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/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index a5cba8e..8a3ff2a 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 eddc3bd..bb8b42a 100644
--- a/src/sim/syscall_emul.cc
+++ b/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"
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
22 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
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: 26
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Alex Dutu <alexandru.d...@amd.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
