[gem5-dev] Change in gem5/gem5[develop]: misc: Remove sim/cur_tick dependency from sim/core.hh

[Daniel Carvalho (Gerrit) via gem5-dev]

Daniel Carvalho has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/43592 )

Change subject: misc: Remove sim/cur_tick dependency from sim/core.hh
......................................................................

misc: Remove sim/cur_tick dependency from sim/core.hh

Remove this unnecessary dependency. Fixed all incorrect
includes of sim/core.hh.

Change-Id: I3ae282dbaeb45fbf4630237a3ab9b1a593ffbe0c
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
---
M ext/sst/gem5.cc
M src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
M src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
M src/arch/arm/linux/fs_workload.hh
M src/arch/arm/semihosting.hh
M src/arch/arm/tracers/tarmac_parser.cc
M src/arch/riscv/isa.cc
M src/arch/x86/regs/int.hh
M src/base/pollevent.cc
M src/base/pollevent.hh
M src/base/stats/storage.hh
M src/base/trace.hh
M src/base/vnc/vncserver.cc
M src/cpu/inst_pb_trace.cc
M src/cpu/o3/cpu.cc
M src/cpu/o3/fetch_impl.hh
M src/cpu/o3/inst_queue_impl.hh
M src/cpu/pc_event.cc
M src/cpu/static_inst.cc
M src/cpu/testers/traffic_gen/trace_gen.cc
M src/dev/arm/generic_timer.cc
M src/dev/arm/generic_timer.hh
M src/dev/intel_8254_timer.cc
M src/dev/net/dist_etherlink.cc
M src/dev/net/dist_iface.cc
M src/dev/net/dist_iface.hh
M src/dev/net/etherbus.cc
M src/dev/net/etherdump.cc
M src/dev/net/etherlink.cc
M src/dev/net/etherswitch.cc
M src/dev/net/ethertap.cc
M src/dev/net/tcp_iface.cc
M src/dev/pci/device.cc
M src/dev/storage/ide_disk.cc
M src/dev/virtio/fs9p.cc
M src/kern/freebsd/events.cc
M src/mem/cache/base.cc
M src/mem/cache/cache_blk.hh
M src/mem/cache/mshr.cc
M src/mem/cache/mshr.hh
M src/mem/cache/queue.hh
M src/mem/cache/replacement_policies/bip_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/write_queue_entry.hh
M src/mem/comm_monitor.cc
M src/mem/mem_checker.cc
M src/mem/mem_checker.hh
M src/mem/packet.hh
M src/mem/probes/mem_trace.cc
M src/mem/request.hh
M src/mem/ruby/profiler/StoreTrace.cc
M src/mem/ruby/structures/BankedArray.cc
M src/mem/ruby/structures/BankedArray.hh
M src/python/pybind11/core.cc
M src/sim/core.hh
M src/sim/eventq.cc
M src/sim/eventq.hh
M src/sim/global_event.cc
M src/sim/init.cc
M src/sim/init_signals.cc
M src/sim/power_state.cc
M src/sim/power_state.hh
M src/sim/root.cc
M src/sim/stat_control.hh
M src/systemc/channel/sc_clock.cc
M src/systemc/core/event.cc
M src/systemc/core/sc_main.cc
M src/systemc/core/scheduler.hh
M src/systemc/tlm_bridge/tlm_to_gem5.cc
M src/systemc/utils/tracefile.cc
M src/systemc/utils/vcd.cc
M src/unittest/stattest.cc
M util/systemc/gem5_within_systemc/sc_module.cc
M util/tlm/examples/common/report_handler.cc
77 files changed, 56 insertions(+), 60 deletions(-)



diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index 3d48e93..b0a111e 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -52,7 +52,7 @@
 #include <string>

 // gem5 Headers
-#include <sim/core.hh>
+#include <sim/cur_tick.hh>
 #include <sim/init.hh>
 #include <sim/init_signals.hh>
 #include <sim/system.hh>
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc  
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
index 72ce17e..f59e1ab 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
@@ -30,7 +30,6 @@
 #include "arch/arm/fastmodel/iris/cpu.hh"
 #include "base/logging.hh"
 #include "dev/arm/base_gic.hh"
-#include "sim/core.hh"
 #include "systemc/tlm_bridge/gem5_to_tlm.hh"

 namespace FastModel
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc  
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
index 98184f9..05cbcda 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
@@ -30,7 +30,6 @@
 #include "arch/arm/fastmodel/iris/cpu.hh"
 #include "base/logging.hh"
 #include "dev/arm/base_gic.hh"
-#include "sim/core.hh"
 #include "systemc/tlm_bridge/gem5_to_tlm.hh"

 namespace FastModel
diff --git a/src/arch/arm/linux/fs_workload.hh  
b/src/arch/arm/linux/fs_workload.hh
index 03fb6c1..568d33e 100644
--- a/src/arch/arm/linux/fs_workload.hh
+++ b/src/arch/arm/linux/fs_workload.hh
@@ -52,7 +52,6 @@
 #include "base/output.hh"
 #include "kern/linux/events.hh"
 #include "params/ArmFsLinux.hh"
-#include "sim/core.hh"

 namespace ArmISA
 {
diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh
index 991b65b..f0bb971 100644
--- a/src/arch/arm/semihosting.hh
+++ b/src/arch/arm/semihosting.hh
@@ -49,6 +49,7 @@
 #include "arch/arm/utility.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"
+#include "sim/core.hh"
 #include "sim/guest_abi.hh"
 #include "sim/sim_object.hh"

diff --git a/src/arch/arm/tracers/tarmac_parser.cc  
b/src/arch/arm/tracers/tarmac_parser.cc
index db9c7e1..fbae4c2 100644
--- a/src/arch/arm/tracers/tarmac_parser.cc
+++ b/src/arch/arm/tracers/tarmac_parser.cc
@@ -50,7 +50,7 @@
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"
 #include "mem/port_proxy.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/faults.hh"
 #include "sim/sim_exit.hh"

diff --git a/src/arch/riscv/isa.cc b/src/arch/riscv/isa.cc
index c6f0ca0..66bd9e8 100644
--- a/src/arch/riscv/isa.cc
+++ b/src/arch/riscv/isa.cc
@@ -43,7 +43,6 @@
 #include "debug/Checkpoint.hh"
 #include "debug/RiscvMisc.hh"
 #include "params/RiscvISA.hh"
-#include "sim/core.hh"
 #include "sim/pseudo_inst.hh"

 namespace RiscvISA
diff --git a/src/arch/x86/regs/int.hh b/src/arch/x86/regs/int.hh
index aa26224..ea9d002 100644
--- a/src/arch/x86/regs/int.hh
+++ b/src/arch/x86/regs/int.hh
@@ -41,7 +41,6 @@
 #include "arch/x86/x86_traits.hh"
 #include "base/bitunion.hh"
 #include "base/logging.hh"
-#include "sim/core.hh"

 namespace X86ISA
 {
diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index 7691ba6..8775f0e 100644
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -46,7 +46,6 @@
 #include "base/logging.hh"
 #include "base/types.hh"
 #include "sim/async.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "sim/serialize.hh"

diff --git a/src/base/pollevent.hh b/src/base/pollevent.hh
index 5efa4fd..7be74ff 100644
--- a/src/base/pollevent.hh
+++ b/src/base/pollevent.hh
@@ -33,7 +33,6 @@

 #include <vector>

-#include "sim/core.hh"
 #include "sim/serialize.hh"

 class PollQueue;
diff --git a/src/base/stats/storage.hh b/src/base/stats/storage.hh
index 2ee1eb2..1003596 100644
--- a/src/base/stats/storage.hh
+++ b/src/base/stats/storage.hh
@@ -37,8 +37,7 @@
 #include "base/logging.hh"
 #include "base/stats/info.hh"
 #include "base/stats/types.hh"
-// For curTick().
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace Stats {

diff --git a/src/base/trace.hh b/src/base/trace.hh
index 86dec09..8f16e09 100644
--- a/src/base/trace.hh
+++ b/src/base/trace.hh
@@ -41,7 +41,7 @@
 #include "base/debug.hh"
 #include "base/match.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace Trace {

diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index a2d4105..f991a14 100644
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -67,7 +67,6 @@
 #include "base/trace.hh"
 #include "debug/VNC.hh"
 #include "sim/byteswap.hh"
-#include "sim/core.hh"

 const PixelConverter VncServer::pixelConverter(
     4,        // 4 bytes / pixel
diff --git a/src/cpu/inst_pb_trace.cc b/src/cpu/inst_pb_trace.cc
index f4a40f8..f020e7f 100644
--- a/src/cpu/inst_pb_trace.cc
+++ b/src/cpu/inst_pb_trace.cc
@@ -46,6 +46,7 @@
 #include "params/InstPBTrace.hh"
 #include "proto/inst.pb.h"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace Trace {

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 04a9ee7..e1e7477 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -55,7 +55,7 @@
 #include "debug/O3CPU.hh"
 #include "debug/Quiesce.hh"
 #include "enums/MemoryMode.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/full_system.hh"
 #include "sim/process.hh"
 #include "sim/stat_control.hh"
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 13e8643..6f01acf 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -64,7 +64,7 @@
 #include "mem/packet.hh"
 #include "params/DerivO3CPU.hh"
 #include "sim/byteswap.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/full_system.hh"
 #include "sim/system.hh"
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index 0f8716b..8c07f6a 100644
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -51,7 +51,7 @@
 #include "debug/IQ.hh"
 #include "enums/OpClass.hh"
 #include "params/DerivO3CPU.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 // clang complains about std::set being overloaded with Packet::set if
 // we open up the entire namespace std
diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index dd52c71..586d326 100644
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -35,7 +35,7 @@
 #include "base/debug.hh"
 #include "base/trace.hh"
 #include "debug/PCEvent.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/system.hh"

 PCEventQueue::PCEventQueue()
diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc
index c42b1d2..c65a839 100644
--- a/src/cpu/static_inst.cc
+++ b/src/cpu/static_inst.cc
@@ -30,8 +30,6 @@

 #include <iostream>

-#include "sim/core.hh"
-
 namespace {

 class NopStaticInst : public StaticInst
diff --git a/src/cpu/testers/traffic_gen/trace_gen.cc  
b/src/cpu/testers/traffic_gen/trace_gen.cc
index 1da2645..b0d780c 100644
--- a/src/cpu/testers/traffic_gen/trace_gen.cc
+++ b/src/cpu/testers/traffic_gen/trace_gen.cc
@@ -43,6 +43,8 @@
 #include "base/trace.hh"
 #include "debug/TrafficGen.hh"
 #include "proto/packet.pb.h"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 TraceGen::InputStream::InputStream(const std::string& filename)
     : trace(filename)
diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index 3938092..dd8a5d7 100644
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -51,6 +51,8 @@
 #include "params/GenericTimerFrame.hh"
 #include "params/GenericTimerMem.hh"
 #include "params/SystemCounter.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 using namespace ArmISA;

diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index 6424549..20bf8e3 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -48,7 +48,6 @@
 #include "base/types.hh"
 #include "dev/arm/base_gic.hh"
 #include "dev/arm/generic_timer_miscregs_types.hh"
-#include "sim/core.hh"
 #include "sim/drain.hh"
 #include "sim/eventq.hh"
 #include "sim/serialize.hh"
diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc
index a2ba7a4..bcbe3c3 100644
--- a/src/dev/intel_8254_timer.cc
+++ b/src/dev/intel_8254_timer.cc
@@ -30,6 +30,8 @@

 #include "base/logging.hh"
 #include "debug/Intel8254Timer.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 Intel8254Timer::Intel8254Timer(EventManager *em, const std::string &name,
     Counter *counter0, Counter *counter1, Counter *counter2) :
diff --git a/src/dev/net/dist_etherlink.cc b/src/dev/net/dist_etherlink.cc
index 8cbf6ef..271cdb0 100644
--- a/src/dev/net/dist_etherlink.cc
+++ b/src/dev/net/dist_etherlink.cc
@@ -62,7 +62,7 @@
 #include "dev/net/etherpkt.hh"
 #include "dev/net/tcp_iface.hh"
 #include "params/EtherLink.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"

diff --git a/src/dev/net/dist_iface.cc b/src/dev/net/dist_iface.cc
index 7f8a4a0..c62771f 100644
--- a/src/dev/net/dist_iface.cc
+++ b/src/dev/net/dist_iface.cc
@@ -50,6 +50,7 @@
 #include "debug/DistEthernet.hh"
 #include "debug/DistEthernetPkt.hh"
 #include "dev/net/etherpkt.hh"
+#include "sim/cur_tick.hh"
 #include "sim/sim_exit.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
diff --git a/src/dev/net/dist_iface.hh b/src/dev/net/dist_iface.hh
index 04843aa..d9fcfb3 100644
--- a/src/dev/net/dist_iface.hh
+++ b/src/dev/net/dist_iface.hh
@@ -84,7 +84,6 @@
 #include "base/logging.hh"
 #include "dev/net/dist_packet.hh"
 #include "dev/net/etherpkt.hh"
-#include "sim/core.hh"
 #include "sim/drain.hh"
 #include "sim/global_event.hh"
 #include "sim/serialize.hh"
diff --git a/src/dev/net/etherbus.cc b/src/dev/net/etherbus.cc
index bc9379e..6a2b39c 100644
--- a/src/dev/net/etherbus.cc
+++ b/src/dev/net/etherbus.cc
@@ -44,7 +44,7 @@
 #include "dev/net/etherint.hh"
 #include "dev/net/etherpkt.hh"
 #include "params/EtherBus.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 EtherBus::EtherBus(const Params &p)
     : SimObject(p), ticksPerByte(p.speed), loopback(p.loopback),
diff --git a/src/dev/net/etherdump.cc b/src/dev/net/etherdump.cc
index c363def..468ebe6 100644
--- a/src/dev/net/etherdump.cc
+++ b/src/dev/net/etherdump.cc
@@ -39,6 +39,7 @@
 #include "base/logging.hh"
 #include "base/output.hh"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"

 using std::string;

diff --git a/src/dev/net/etherlink.cc b/src/dev/net/etherlink.cc
index 3c9bfea..6b0cf53 100644
--- a/src/dev/net/etherlink.cc
+++ b/src/dev/net/etherlink.cc
@@ -59,7 +59,7 @@
 #include "dev/net/etherint.hh"
 #include "dev/net/etherpkt.hh"
 #include "params/EtherLink.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/serialize.hh"
 #include "sim/system.hh"

diff --git a/src/dev/net/etherswitch.cc b/src/dev/net/etherswitch.cc
index b88d630..9384b29 100644
--- a/src/dev/net/etherswitch.cc
+++ b/src/dev/net/etherswitch.cc
@@ -36,6 +36,7 @@
 #include "base/trace.hh"
 #include "debug/EthernetAll.hh"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"

 EtherSwitch::EtherSwitch(const Params &p)
     : SimObject(p), ttl(p.time_to_live)
diff --git a/src/dev/net/ethertap.cc b/src/dev/net/ethertap.cc
index 1ac9b66..c838481 100644
--- a/src/dev/net/ethertap.cc
+++ b/src/dev/net/ethertap.cc
@@ -66,6 +66,8 @@
 #include "dev/net/etherdump.hh"
 #include "dev/net/etherint.hh"
 #include "dev/net/etherpkt.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 class TapEvent : public PollEvent
 {
diff --git a/src/dev/net/tcp_iface.cc b/src/dev/net/tcp_iface.cc
index 0148442..111342a 100644
--- a/src/dev/net/tcp_iface.cc
+++ b/src/dev/net/tcp_iface.cc
@@ -56,7 +56,6 @@
 #include "base/types.hh"
 #include "debug/DistEthernet.hh"
 #include "debug/DistEthernetCmd.hh"
-#include "sim/core.hh"
 #include "sim/sim_exit.hh"

 #if defined(__FreeBSD__)
diff --git a/src/dev/pci/device.cc b/src/dev/pci/device.cc
index 9c5117b..d43e676 100644
--- a/src/dev/pci/device.cc
+++ b/src/dev/pci/device.cc
@@ -57,7 +57,6 @@
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "sim/byteswap.hh"
-#include "sim/core.hh"

 PciDevice::PciDevice(const PciDeviceParams &p)
     : DmaDevice(p),
diff --git a/src/dev/storage/ide_disk.cc b/src/dev/storage/ide_disk.cc
index 1c48df6..454a8ba 100644
--- a/src/dev/storage/ide_disk.cc
+++ b/src/dev/storage/ide_disk.cc
@@ -55,7 +55,7 @@
 #include "debug/IdeDisk.hh"
 #include "dev/storage/disk_image.hh"
 #include "dev/storage/ide_ctrl.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/sim_object.hh"

 IdeDisk::IdeDisk(const Params &p)
diff --git a/src/dev/virtio/fs9p.cc b/src/dev/virtio/fs9p.cc
index 025a173..25e27fe 100644
--- a/src/dev/virtio/fs9p.cc
+++ b/src/dev/virtio/fs9p.cc
@@ -58,6 +58,7 @@
 #include "params/VirtIO9PDiod.hh"
 #include "params/VirtIO9PProxy.hh"
 #include "params/VirtIO9PSocket.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"

 struct P9MsgInfo
diff --git a/src/kern/freebsd/events.cc b/src/kern/freebsd/events.cc
index 5b8b8cc..24acd70 100644
--- a/src/kern/freebsd/events.cc
+++ b/src/kern/freebsd/events.cc
@@ -38,6 +38,7 @@
 #include "cpu/thread_context.hh"
 #include "debug/DebugPrintf.hh"
 #include "kern/system_events.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"

 namespace FreeBSD
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index e35cace..cd4c940 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -60,7 +60,7 @@
 #include "mem/cache/tags/super_blk.hh"
 #include "params/BaseCache.hh"
 #include "params/WriteAllocator.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 BaseCache::CacheResponsePort::CacheResponsePort(const std::string &_name,
                                           BaseCache *_cache,
diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh
index ac2878a..70bc9d6 100644
--- a/src/mem/cache/cache_blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -57,7 +57,7 @@
 #include "mem/cache/tags/tagged_entry.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 /**
  * A Basic Cache block.
diff --git a/src/mem/cache/mshr.cc b/src/mem/cache/mshr.cc
index 9dae03d..3cc9faf 100644
--- a/src/mem/cache/mshr.cc
+++ b/src/mem/cache/mshr.cc
@@ -55,7 +55,6 @@
 #include "debug/Cache.hh"
 #include "mem/cache/base.hh"
 #include "mem/request.hh"
-#include "sim/core.hh"

 MSHR::MSHR() : downstreamPending(false),
                pendingModified(false),
diff --git a/src/mem/cache/mshr.hh b/src/mem/cache/mshr.hh
index 306b5ac..ff582d9 100644
--- a/src/mem/cache/mshr.hh
+++ b/src/mem/cache/mshr.hh
@@ -57,7 +57,7 @@
 #include "mem/cache/queue_entry.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 class BaseCache;

diff --git a/src/mem/cache/queue.hh b/src/mem/cache/queue.hh
index 8ab0cbb..a2108e4 100644
--- a/src/mem/cache/queue.hh
+++ b/src/mem/cache/queue.hh
@@ -55,7 +55,7 @@
 #include "debug/Drain.hh"
 #include "mem/cache/queue_entry.hh"
 #include "mem/packet.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/drain.hh"

 /**
diff --git a/src/mem/cache/replacement_policies/bip_rp.cc  
b/src/mem/cache/replacement_policies/bip_rp.cc
index d45105d..aab37eb 100644
--- a/src/mem/cache/replacement_policies/bip_rp.cc
+++ b/src/mem/cache/replacement_policies/bip_rp.cc
@@ -32,7 +32,7 @@

 #include "base/random.hh"
 #include "params/BIPRP.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace ReplacementPolicy {

diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc  
b/src/mem/cache/replacement_policies/fifo_rp.cc
index 496d86a..c7bc0c2 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -32,7 +32,7 @@
 #include <memory>

 #include "params/FIFORP.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace ReplacementPolicy {

diff --git a/src/mem/cache/replacement_policies/lru_rp.cc  
b/src/mem/cache/replacement_policies/lru_rp.cc
index fd89703..742c76c 100644
--- a/src/mem/cache/replacement_policies/lru_rp.cc
+++ b/src/mem/cache/replacement_policies/lru_rp.cc
@@ -32,7 +32,7 @@
 #include <memory>

 #include "params/LRURP.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace ReplacementPolicy {

diff --git a/src/mem/cache/replacement_policies/mru_rp.cc  
b/src/mem/cache/replacement_policies/mru_rp.cc
index cc2016b..a61ebd9 100644
--- a/src/mem/cache/replacement_policies/mru_rp.cc
+++ b/src/mem/cache/replacement_policies/mru_rp.cc
@@ -32,7 +32,7 @@
 #include <memory>

 #include "params/MRURP.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace ReplacementPolicy {

diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc  
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
index 0e2043d..77e9061 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -36,7 +36,7 @@
 #include <cassert>

 #include "params/WeightedLRURP.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace ReplacementPolicy {

diff --git a/src/mem/cache/write_queue_entry.hh  
b/src/mem/cache/write_queue_entry.hh
index d50de35..fa92318 100644
--- a/src/mem/cache/write_queue_entry.hh
+++ b/src/mem/cache/write_queue_entry.hh
@@ -55,7 +55,6 @@
 #include "base/types.hh"
 #include "mem/cache/queue_entry.hh"
 #include "mem/packet.hh"
-#include "sim/core.hh"

 class BaseCache;

diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc
index 8807a73..b1499e2 100644
--- a/src/mem/comm_monitor.cc
+++ b/src/mem/comm_monitor.cc
@@ -41,6 +41,8 @@

 #include "base/trace.hh"
 #include "debug/CommMonitor.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/stats.hh"

 CommMonitor::CommMonitor(const Params &params)
diff --git a/src/mem/mem_checker.cc b/src/mem/mem_checker.cc
index 5e839fb..d0f17ea 100644
--- a/src/mem/mem_checker.cc
+++ b/src/mem/mem_checker.cc
@@ -38,6 +38,7 @@
 #include "mem/mem_checker.hh"

 #include "base/logging.hh"
+#include "sim/cur_tick.hh"

 void
 MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick  
_start,
diff --git a/src/mem/mem_checker.hh b/src/mem/mem_checker.hh
index 101da4f..798965c 100644
--- a/src/mem/mem_checker.hh
+++ b/src/mem/mem_checker.hh
@@ -52,7 +52,6 @@
 #include "base/types.hh"
 #include "debug/MemChecker.hh"
 #include "params/MemChecker.hh"
-#include "sim/core.hh"
 #include "sim/sim_object.hh"

 /**
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 4ad8d46..52b7270 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -61,7 +61,6 @@
 #include "mem/htm.hh"
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
-#include "sim/core.hh"

 class Packet;
 typedef Packet *PacketPtr;
diff --git a/src/mem/probes/mem_trace.cc b/src/mem/probes/mem_trace.cc
index 0674014..20fcbc3 100644
--- a/src/mem/probes/mem_trace.cc
+++ b/src/mem/probes/mem_trace.cc
@@ -41,6 +41,8 @@
 #include "base/output.hh"
 #include "params/MemTraceProbe.hh"
 #include "proto/packet.pb.h"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/system.hh"

 MemTraceProbe::MemTraceProbe(const MemTraceProbeParams &p)
diff --git a/src/mem/request.hh b/src/mem/request.hh
index c01d84f..784a88b 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -61,7 +61,7 @@
 #include "base/types.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/htm.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 /**
  * Special TaskIds that are used for per-context-switch stats dumps
diff --git a/src/mem/ruby/profiler/StoreTrace.cc  
b/src/mem/ruby/profiler/StoreTrace.cc
index c0f070d..a53f74d 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -28,7 +28,7 @@

 #include "mem/ruby/profiler/StoreTrace.hh"

-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 bool StoreTrace::s_init = false; // Total number of store lifetimes of
                                  // all lines
diff --git a/src/mem/ruby/structures/BankedArray.cc  
b/src/mem/ruby/structures/BankedArray.cc
index 091bcbd..a4bc9c5 100644
--- a/src/mem/ruby/structures/BankedArray.cc
+++ b/src/mem/ruby/structures/BankedArray.cc
@@ -33,6 +33,7 @@

 #include "base/intmath.hh"
 #include "mem/ruby/system/RubySystem.hh"
+#include "sim/cur_tick.hh"

 BankedArray::BankedArray(unsigned int banks, Cycles accessLatency,
                          unsigned int startIndexBit, RubySystem *rs)
diff --git a/src/mem/ruby/structures/BankedArray.hh  
b/src/mem/ruby/structures/BankedArray.hh
index e2359af..1ea91b3 100644
--- a/src/mem/ruby/structures/BankedArray.hh
+++ b/src/mem/ruby/structures/BankedArray.hh
@@ -36,7 +36,6 @@

 #include "mem/ruby/common/TypeDefines.hh"
 #include "mem/ruby/system/RubySystem.hh"
-#include "sim/core.hh"

 class BankedArray
 {
diff --git a/src/python/pybind11/core.cc b/src/python/pybind11/core.cc
index 53216dd..c4e8707 100644
--- a/src/python/pybind11/core.cc
+++ b/src/python/pybind11/core.cc
@@ -55,6 +55,7 @@
 #include "base/temperature.hh"
 #include "base/types.hh"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/drain.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_object.hh"
diff --git a/src/sim/core.hh b/src/sim/core.hh
index 30c8949..7adc3b1 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -39,9 +39,6 @@
 #include <string>

 #include "base/types.hh"
-// @todo The next include is not needed in this file, but must be kept
-// until the transitive includes are fixed
-#include "sim/cur_tick.hh"

 /// These are variables that are set based on the simulator frequency
 ///@{
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index 3e99683..18828af 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -41,7 +41,6 @@
 #include "base/trace.hh"
 #include "cpu/smt.hh"
 #include "debug/Checkpoint.hh"
-#include "sim/core.hh"

 Tick simQuantum = 0;

diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index 0b8b9e4..66e3f73 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -49,7 +49,7 @@
 #include "base/types.hh"
 #include "base/uncontended_mutex.hh"
 #include "debug/Event.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/serialize.hh"

 class EventQueue;       // forward declaration
diff --git a/src/sim/global_event.cc b/src/sim/global_event.cc
index 1f1bfc1..2b84ca3 100644
--- a/src/sim/global_event.cc
+++ b/src/sim/global_event.cc
@@ -29,7 +29,7 @@

 #include "sim/global_event.hh"

-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 std::mutex BaseGlobalEvent::globalQMutex;

diff --git a/src/sim/init.cc b/src/sim/init.cc
index df53c29..9f2c7a3 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -58,7 +58,6 @@
 #include "config/have_protobuf.hh"
 #include "python/pybind11/pybind.hh"
 #include "sim/async.hh"
-#include "sim/core.hh"

 #if HAVE_PROTOBUF
 #include <google/protobuf/stubs/common.h>
diff --git a/src/sim/init_signals.cc b/src/sim/init_signals.cc
index db82682..b75485c 100644
--- a/src/sim/init_signals.cc
+++ b/src/sim/init_signals.cc
@@ -58,7 +58,6 @@
 #include "base/logging.hh"
 #include "sim/async.hh"
 #include "sim/backtrace.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"

 // Use an separate stack for fatal signal handlers
diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc
index 8281d2f..554a5cf 100644
--- a/src/sim/power_state.cc
+++ b/src/sim/power_state.cc
@@ -42,6 +42,7 @@
 #include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/PowerDomain.hh"
+#include "sim/cur_tick.hh"
 #include "sim/power_domain.hh"
 #include "sim/serialize.hh"

diff --git a/src/sim/power_state.hh b/src/sim/power_state.hh
index b9c41d4..6d6174b 100644
--- a/src/sim/power_state.hh
+++ b/src/sim/power_state.hh
@@ -50,7 +50,6 @@
 #include "base/statistics.hh"
 #include "enums/PwrState.hh"
 #include "params/PowerState.hh"
-#include "sim/core.hh"
 #include "sim/sim_object.hh"

 class PowerDomain;
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 35afe70..33fc5a9 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -44,6 +44,8 @@
 #include "base/trace.hh"
 #include "config/the_isa.hh"
 #include "debug/TimeSync.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/full_system.hh"
 #include "sim/root.hh"
diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 55930b4..7d7606f 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -42,7 +42,7 @@
 #define __SIM_STAT_CONTROL_HH__

 #include "base/types.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace Stats {

diff --git a/src/systemc/channel/sc_clock.cc  
b/src/systemc/channel/sc_clock.cc
index 137a7a1..89e7217 100644
--- a/src/systemc/channel/sc_clock.cc
+++ b/src/systemc/channel/sc_clock.cc
@@ -27,7 +27,6 @@

 #include "base/logging.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/kernel.hh"
 #include "systemc/core/process_types.hh"
diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 928996d..69a3392 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -31,7 +31,6 @@
 #include <cstring>
 #include <utility>

-#include "sim/core.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/messages.hh"
diff --git a/src/systemc/core/sc_main.cc b/src/systemc/core/sc_main.cc
index d5c3e21..0cb4404 100644
--- a/src/systemc/core/sc_main.cc
+++ b/src/systemc/core/sc_main.cc
@@ -26,7 +26,6 @@
  */

 #include "base/types.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/kernel.hh"
 #include "systemc/core/sc_main_fiber.hh"
diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh
index 13f35ed..4323d1f 100644
--- a/src/systemc/core/scheduler.hh
+++ b/src/systemc/core/scheduler.hh
@@ -37,7 +37,6 @@
 #include <vector>

 #include "base/logging.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/channel.hh"
 #include "systemc/core/list.hh"
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc  
b/src/systemc/tlm_bridge/tlm_to_gem5.cc
index 143eeac..be2136d 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -61,6 +61,7 @@

 #include "params/TlmToGem5Bridge32.hh"
 #include "params/TlmToGem5Bridge64.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"
 #include "systemc/ext/core/sc_module_name.hh"
 #include "systemc/ext/core/sc_time.hh"
diff --git a/src/systemc/utils/tracefile.cc b/src/systemc/utils/tracefile.cc
index e8f844d..368c6f2 100644
--- a/src/systemc/utils/tracefile.cc
+++ b/src/systemc/utils/tracefile.cc
@@ -31,7 +31,6 @@
 #include <iomanip>

 #include "base/output.hh"
-#include "sim/core.hh"
 #include "systemc/core/time.hh"
 #include "systemc/ext/core/sc_main.hh"
 #include "systemc/ext/core/sc_time.hh"
diff --git a/src/systemc/utils/vcd.cc b/src/systemc/utils/vcd.cc
index 4da417d..cb9398e 100644
--- a/src/systemc/utils/vcd.cc
+++ b/src/systemc/utils/vcd.cc
@@ -32,6 +32,7 @@

 #include "base/bitfield.hh"
 #include "base/cprintf.hh"
+#include "sim/core.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_main.hh"
diff --git a/src/unittest/stattest.cc b/src/unittest/stattest.cc
index 7e80669..717b208 100644
--- a/src/unittest/stattest.cc
+++ b/src/unittest/stattest.cc
@@ -36,7 +36,7 @@
 #include "base/logging.hh"
 #include "base/statistics.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/init.hh"
 #include "sim/stat_control.hh"
diff --git a/util/systemc/gem5_within_systemc/sc_module.cc  
b/util/systemc/gem5_within_systemc/sc_module.cc
index a0f36c7..4e280d7 100644
--- a/util/systemc/gem5_within_systemc/sc_module.cc
+++ b/util/systemc/gem5_within_systemc/sc_module.cc
@@ -58,6 +58,7 @@
 #include "sc_module.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
 #include "sim/stat_control.hh"
diff --git a/util/tlm/examples/common/report_handler.cc  
b/util/tlm/examples/common/report_handler.cc
index 7902936..6616647 100644
--- a/util/tlm/examples/common/report_handler.cc
+++ b/util/tlm/examples/common/report_handler.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <systemc>

-#include <sim/core.hh>
+#include <sim/cur_tick.hh>
 #include <sim/simulate.hh>

 #include "report_handler.hh"

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43592
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: I3ae282dbaeb45fbf4630237a3ab9b1a593ffbe0c
Gerrit-Change-Number: 43592
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-MessageType: newchange
_______________________________________________
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