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 <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43592
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

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>

src/arch/arm/fastmodel/CortexA76/cortex_a76.cc

@@ -31,7 +31,6 @@
 #include "arch/arm/regs/misc.hh"
 #include "base/logging.hh"
 #include "dev/arm/base_gic.hh"
-#include "sim/core.hh"
 #include "systemc/tlm_bridge/gem5_to_tlm.hh"
 
 namespace gem5

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 gem5

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 gem5
 {

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"
 

src/arch/arm/tracers/tarmac_parser.cc

@@ -49,7 +49,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"
 

src/arch/riscv/isa.cc

@@ -47,7 +47,6 @@
 #include "debug/Checkpoint.hh"
 #include "debug/RiscvMisc.hh"
 #include "params/RiscvISA.hh"
-#include "sim/core.hh"
 #include "sim/pseudo_inst.hh"
 
 namespace gem5

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 gem5
 {

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"
 

src/base/pollevent.hh

@@ -33,7 +33,6 @@
 
 #include <vector>
 
-#include "sim/core.hh"
 #include "sim/serialize.hh"
 
 namespace gem5

src/base/stats/storage.hh

@@ -38,8 +38,7 @@
 #include "base/logging.hh"
 #include "base/stats/info.hh"
 #include "base/stats/types.hh"
-// For curTick().
+#include "sim/cur_tick.hh"
-#include "sim/core.hh"
 
 namespace gem5
 {

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"
 
 // Return the global context name "global".  This function gets called when
 // the DPRINTF macros are used in a context without a visible name() function

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"
 
 namespace gem5
 {

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 gem5
 {

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"

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"
 
 namespace gem5

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"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

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"

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"
 
 namespace gem5
 {

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"
 

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"

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"

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"
 
 namespace gem5
 {

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;
 

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"
 

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"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

src/dev/net/tcp_iface.cc

@@ -57,7 +57,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__)

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"
 
 namespace gem5
 {

src/dev/storage/ide_disk.cc

@@ -56,7 +56,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"
 
 namespace gem5

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"
 
 namespace gem5

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 gem5

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"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

src/mem/cache/mshr.cc

@@ -55,7 +55,6 @@
 #include "debug/MSHR.hh"
 #include "mem/cache/base.hh"
 #include "mem/request.hh"
-#include "sim/core.hh"
 
 namespace gem5
 {

src/mem/cache/mshr.hh

@@ -59,7 +59,7 @@
 #include "mem/cache/queue_entry.hh"
 #include "mem/packet.hh"
 #include "mem/request.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 
 namespace gem5
 {

src/mem/cache/queue.hh

@@ -56,7 +56,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"
 
 namespace gem5

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 gem5
 {

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 gem5
 {

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 gem5
 {

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 gem5
 {

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 gem5
 {

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"
 
 namespace gem5
 {

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"
 
 namespace gem5

src/mem/mem_checker.cc

@@ -38,6 +38,7 @@
 #include "mem/mem_checker.hh"
 
 #include "base/logging.hh"
+#include "sim/cur_tick.hh"
 
 namespace gem5
 {

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"
 
 namespace gem5

src/mem/packet.hh

@@ -62,7 +62,6 @@
 #include "mem/htm.hh"
 #include "mem/request.hh"
 #include "sim/byteswap.hh"
-#include "sim/core.hh"
 
 namespace gem5
 {

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"
 
 namespace gem5

src/mem/request.hh

@@ -62,7 +62,7 @@
 #include "base/types.hh"
 #include "cpu/inst_seq.hh"
 #include "mem/htm.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

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"
 
 namespace gem5
 {

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"

src/sim/core.hh

@@ -40,9 +40,6 @@
 
 #include "base/compiler.hh"
 #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"
 
 namespace gem5
 {

src/sim/eventq.cc

@@ -41,7 +41,6 @@
 #include "base/trace.hh"
 #include "cpu/smt.hh"
 #include "debug/Checkpoint.hh"
-#include "sim/core.hh"
 
 namespace gem5
 {

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"
 
 namespace gem5

src/sim/global_event.cc

@@ -29,7 +29,7 @@
 
 #include "sim/global_event.hh"
 
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 
 namespace gem5
 {

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>

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"
 
 namespace gem5

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"
 

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"
 
 namespace gem5

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"

src/sim/stat_control.hh

@@ -43,7 +43,7 @@
 
 #include "base/compiler.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 
 namespace gem5
 {

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"

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"

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"

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"

src/systemc/tlm_bridge/tlm_to_gem5.cc

@@ -64,6 +64,7 @@
 #include "params/TlmToGem5Bridge128.hh"
 #include "params/TlmToGem5Bridge256.hh"
 #include "params/TlmToGem5Bridge512.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"
 #include "systemc/ext/core/sc_module_name.hh"
 #include "systemc/ext/core/sc_time.hh"

src/systemc/utils/tracefile.cc

@@ -30,7 +30,6 @@
 #include <ctime>
 #include <iomanip>
 
-#include "sim/core.hh"
 #include "systemc/core/time.hh"
 #include "systemc/ext/core/sc_main.hh"
 #include "systemc/ext/core/sc_time.hh"

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"

util/systemc/gem5_within_systemc/sc_module.cc

@@ -61,6 +61,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"