From 3a8df68388d4e4bd1b9d6061c4bb5e41d12c3aeb Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Sun, 27 Dec 2020 13:35:48 -0300 Subject: [PATCH] misc: Fix some includes Fix some missing and extra includes around the codebase. Change-Id: Ibf314b43a966943a8096958f68382e1e245f29e3 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38738 Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce Tested-by: kokoro --- src/arch/generic/interrupts.hh | 1 + src/base/trace.cc | 2 -- src/base/trace.hh | 1 + src/cpu/minor/buffers.hh | 2 ++ src/cpu/minor/decode.cc | 2 ++ src/cpu/minor/decode.hh | 2 ++ src/cpu/minor/dyn_inst.hh | 4 ++- src/cpu/minor/execute.hh | 3 ++ src/cpu/minor/fetch1.cc | 2 ++ src/cpu/minor/fetch1.hh | 4 ++- src/cpu/minor/fetch2.cc | 2 ++ src/cpu/minor/fetch2.hh | 2 ++ src/cpu/minor/func_unit.cc | 1 + src/cpu/minor/func_unit.hh | 9 +++++- src/cpu/minor/lsq.cc | 2 +- src/cpu/minor/lsq.hh | 4 +++ src/cpu/minor/scoreboard.hh | 3 ++ src/cpu/o3/free_list.hh | 1 - src/cpu/o3/lsq.hh | 6 ++++ src/cpu/o3/scoreboard.cc | 3 -- src/cpu/o3/scoreboard.hh | 8 ++---- src/cpu/testers/traffic_gen/base_gen.cc | 4 --- src/cpu/testers/traffic_gen/base_gen.hh | 1 + src/dev/arm/energy_ctrl.cc | 1 + src/dev/arm/generic_timer.cc | 2 ++ src/dev/arm/generic_timer.hh | 9 ++++++ src/dev/arm/gic_v3_its.cc | 5 ++++ src/dev/arm/gic_v3_its.hh | 6 ++++ src/dev/arm/smmu_v3_proc.cc | 3 ++ src/dev/arm/timer_a9global.cc | 3 ++ src/dev/arm/timer_a9global.hh | 6 ++++ src/dev/arm/timer_cpulocal.cc | 3 ++ src/dev/arm/timer_cpulocal.hh | 6 ++++ src/dev/arm/timer_sp804.cc | 3 ++ src/dev/arm/timer_sp804.hh | 6 ++++ src/dev/hsa/hsa_packet_processor.cc | 3 ++ src/dev/hsa/hsa_packet_processor.hh | 6 ++-- src/dev/i2c/bus.cc | 1 + src/dev/net/dist_etherlink.hh | 4 +++ src/dev/net/etherlink.cc | 2 ++ src/dev/net/etherlink.hh | 1 + src/dev/net/etherswitch.hh | 3 ++ src/dev/net/i8254xGBe.hh | 4 +++ src/dev/ps2/device.cc | 1 + src/dev/ps2/mouse.cc | 1 + src/dev/serial/uart8250.cc | 1 + src/dev/storage/disk_image.cc | 1 + src/dev/virtio/base.cc | 1 + src/dev/virtio/base.hh | 4 +++ src/mem/mem_checker.cc | 29 +++++++++++--------- src/mem/mem_checker.hh | 4 ++- src/mem/mem_interface.cc | 1 + src/mem/physical.cc | 1 + src/mem/ruby/network/simple/PerfectSwitch.cc | 1 + src/sim/clock_domain.cc | 2 ++ src/sim/dvfs_handler.cc | 4 +-- src/sim/dvfs_handler.hh | 4 +++ src/sim/eventq.hh | 1 + src/sim/power/thermal_domain.cc | 1 + src/sim/power/thermal_model.cc | 1 + src/sim/power_state.cc | 3 ++ src/sim/power_state.hh | 1 + src/sim/redirect_path.cc | 2 ++ src/sim/root.hh | 1 + src/sim/serialize_handlers.hh | 2 +- src/sim/sim_exit.hh | 1 + src/sim/ticked_object.cc | 1 + src/sim/voltage_domain.cc | 4 +-- 68 files changed, 178 insertions(+), 41 deletions(-) diff --git a/src/arch/generic/interrupts.hh b/src/arch/generic/interrupts.hh index c8e1d0c35..9acb5b527 100644 --- a/src/arch/generic/interrupts.hh +++ b/src/arch/generic/interrupts.hh @@ -28,6 +28,7 @@ #ifndef __ARCH_GENERIC_INTERRUPTS_HH__ #define __ARCH_GENERIC_INTERRUPTS_HH__ +#include "base/logging.hh" #include "params/BaseInterrupts.hh" #include "sim/sim_object.hh" diff --git a/src/base/trace.cc b/src/base/trace.cc index ed6fbd21a..eee6a4dde 100644 --- a/src/base/trace.cc +++ b/src/base/trace.cc @@ -35,10 +35,8 @@ #include #include #include -#include #include "base/atomicio.hh" -#include "base/debug.hh" #include "base/logging.hh" #include "base/output.hh" #include "base/str.hh" diff --git a/src/base/trace.hh b/src/base/trace.hh index 34997ed70..f7c006686 100644 --- a/src/base/trace.hh +++ b/src/base/trace.hh @@ -32,6 +32,7 @@ #ifndef __BASE_TRACE_HH__ #define __BASE_TRACE_HH__ +#include #include #include diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh index cc013a991..90ab69497 100644 --- a/src/cpu/minor/buffers.hh +++ b/src/cpu/minor/buffers.hh @@ -47,8 +47,10 @@ #include #include #include +#include #include "base/logging.hh" +#include "base/types.hh" #include "cpu/activity.hh" #include "cpu/minor/trace.hh" #include "cpu/timebuf.hh" diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc index 2c90c8e23..136099a1c 100644 --- a/src/cpu/minor/decode.cc +++ b/src/cpu/minor/decode.cc @@ -37,6 +37,8 @@ #include "cpu/minor/decode.hh" +#include "base/logging.hh" +#include "base/trace.hh" #include "cpu/minor/pipeline.hh" #include "debug/Decode.hh" diff --git a/src/cpu/minor/decode.hh b/src/cpu/minor/decode.hh index 89ed00b9b..636d53ffd 100644 --- a/src/cpu/minor/decode.hh +++ b/src/cpu/minor/decode.hh @@ -45,6 +45,8 @@ #ifndef __CPU_MINOR_DECODE_HH__ #define __CPU_MINOR_DECODE_HH__ +#include + #include "cpu/minor/buffers.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/dyn_inst.hh" diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh index b90e27794..0328544d1 100644 --- a/src/cpu/minor/dyn_inst.hh +++ b/src/cpu/minor/dyn_inst.hh @@ -49,11 +49,13 @@ #include #include "base/refcnt.hh" -#include "cpu/minor/buffers.hh" +#include "base/types.hh" #include "cpu/inst_seq.hh" +#include "cpu/minor/buffers.hh" #include "cpu/static_inst.hh" #include "cpu/timing_expr.hh" #include "sim/faults.hh" +#include "sim/insttracer.hh" namespace Minor { diff --git a/src/cpu/minor/execute.hh b/src/cpu/minor/execute.hh index ba33b8191..4d36a5d88 100644 --- a/src/cpu/minor/execute.hh +++ b/src/cpu/minor/execute.hh @@ -45,6 +45,9 @@ #ifndef __CPU_MINOR_EXECUTE_HH__ #define __CPU_MINOR_EXECUTE_HH__ +#include + +#include "base/types.hh" #include "cpu/minor/buffers.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/func_unit.hh" diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc index 1a207779a..e20aacf6c 100644 --- a/src/cpu/minor/fetch1.cc +++ b/src/cpu/minor/fetch1.cc @@ -42,6 +42,8 @@ #include #include "base/cast.hh" +#include "base/logging.hh" +#include "base/trace.hh" #include "cpu/minor/pipeline.hh" #include "debug/Drain.hh" #include "debug/Fetch.hh" diff --git a/src/cpu/minor/fetch1.hh b/src/cpu/minor/fetch1.hh index 9889d4268..cb68611a5 100644 --- a/src/cpu/minor/fetch1.hh +++ b/src/cpu/minor/fetch1.hh @@ -45,10 +45,12 @@ #ifndef __CPU_MINOR_FETCH1_HH__ #define __CPU_MINOR_FETCH1_HH__ +#include + +#include "cpu/base.hh" #include "cpu/minor/buffers.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/pipe_data.hh" -#include "cpu/base.hh" #include "mem/packet.hh" namespace Minor diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc index 263a31903..08c280ab9 100644 --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -41,6 +41,8 @@ #include "arch/decoder.hh" #include "arch/utility.hh" +#include "base/logging.hh" +#include "base/trace.hh" #include "cpu/minor/pipeline.hh" #include "cpu/pred/bpred_unit.hh" #include "debug/Branch.hh" diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh index fbeb96d73..2a7814aed 100644 --- a/src/cpu/minor/fetch2.hh +++ b/src/cpu/minor/fetch2.hh @@ -45,6 +45,8 @@ #ifndef __CPU_MINOR_FETCH2_HH__ #define __CPU_MINOR_FETCH2_HH__ +#include + #include "cpu/minor/buffers.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/pipe_data.hh" diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc index a7ccc08fb..58f3a1e72 100644 --- a/src/cpu/minor/func_unit.cc +++ b/src/cpu/minor/func_unit.cc @@ -41,6 +41,7 @@ #include #include +#include "base/trace.hh" #include "debug/MinorTiming.hh" #include "enums/OpClass.hh" diff --git a/src/cpu/minor/func_unit.hh b/src/cpu/minor/func_unit.hh index 09290e3ee..ce51a99d0 100644 --- a/src/cpu/minor/func_unit.hh +++ b/src/cpu/minor/func_unit.hh @@ -44,15 +44,22 @@ #ifndef __CPU_MINOR_FUNC_UNIT_HH__ #define __CPU_MINOR_FUNC_UNIT_HH__ +#include +#include +#include +#include + +#include "base/types.hh" +#include "cpu/func_unit.hh" #include "cpu/minor/buffers.hh" #include "cpu/minor/dyn_inst.hh" -#include "cpu/func_unit.hh" #include "cpu/timing_expr.hh" #include "params/MinorFU.hh" #include "params/MinorFUPool.hh" #include "params/MinorOpClass.hh" #include "params/MinorOpClassSet.hh" #include "sim/clocked_object.hh" +#include "sim/sim_object.hh" /** Boxing for MinorOpClass to get around a build problem with C++11 but * also allow for future additions to op class checking */ diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc index 2283038d8..7e156ea3d 100644 --- a/src/cpu/minor/lsq.cc +++ b/src/cpu/minor/lsq.cc @@ -42,7 +42,7 @@ #include "arch/locked_mem.hh" #include "base/logging.hh" -#include "cpu/minor/cpu.hh" +#include "base/trace.hh" #include "cpu/minor/exec_context.hh" #include "cpu/minor/execute.hh" #include "cpu/minor/pipeline.hh" diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh index 1109868dc..11748835f 100644 --- a/src/cpu/minor/lsq.hh +++ b/src/cpu/minor/lsq.hh @@ -45,10 +45,14 @@ #ifndef __CPU_MINOR_NEW_LSQ_HH__ #define __CPU_MINOR_NEW_LSQ_HH__ +#include +#include + #include "cpu/minor/buffers.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/pipe_data.hh" #include "cpu/minor/trace.hh" +#include "mem/packet.hh" namespace Minor { diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh index b7547844f..aab0b2bc1 100644 --- a/src/cpu/minor/scoreboard.hh +++ b/src/cpu/minor/scoreboard.hh @@ -44,6 +44,9 @@ #ifndef __CPU_MINOR_SCOREBOARD_HH__ #define __CPU_MINOR_SCOREBOARD_HH__ +#include + +#include "base/types.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/dyn_inst.hh" #include "cpu/minor/trace.hh" diff --git a/src/cpu/o3/free_list.hh b/src/cpu/o3/free_list.hh index a4dfc2407..cb15b5be5 100644 --- a/src/cpu/o3/free_list.hh +++ b/src/cpu/o3/free_list.hh @@ -44,7 +44,6 @@ #include #include -#include #include "base/logging.hh" #include "base/trace.hh" diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh index 377ec5908..2eaa701e3 100644 --- a/src/cpu/o3/lsq.hh +++ b/src/cpu/o3/lsq.hh @@ -42,10 +42,16 @@ #ifndef __CPU_O3_LSQ_HH__ #define __CPU_O3_LSQ_HH__ +#include +#include +#include #include #include +#include #include "arch/generic/tlb.hh" +#include "base/flags.hh" +#include "base/types.hh" #include "cpu/inst_seq.hh" #include "cpu/o3/lsq_unit.hh" #include "cpu/utils.hh" diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc index 75853d189..271203520 100644 --- a/src/cpu/o3/scoreboard.cc +++ b/src/cpu/o3/scoreboard.cc @@ -29,9 +29,6 @@ #include "cpu/o3/scoreboard.hh" -#include "config/the_isa.hh" -#include "debug/Scoreboard.hh" - Scoreboard::Scoreboard(const std::string &_my_name, unsigned _numPhysicalRegs) : _name(_my_name), diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh index 1f3582f2a..0a37b4061 100644 --- a/src/cpu/o3/scoreboard.hh +++ b/src/cpu/o3/scoreboard.hh @@ -30,15 +30,13 @@ #ifndef __CPU_O3_SCOREBOARD_HH__ #define __CPU_O3_SCOREBOARD_HH__ -#include -#include +#include #include +#include "base/compiler.hh" #include "base/trace.hh" -#include "config/the_isa.hh" -#include "cpu/o3/comm.hh" +#include "cpu/reg_class.hh" #include "debug/Scoreboard.hh" - /** * Implements a simple scoreboard to track which registers are * ready. This class operates on the unified physical register space, diff --git a/src/cpu/testers/traffic_gen/base_gen.cc b/src/cpu/testers/traffic_gen/base_gen.cc index d8ce00132..c3891146b 100644 --- a/src/cpu/testers/traffic_gen/base_gen.cc +++ b/src/cpu/testers/traffic_gen/base_gen.cc @@ -40,11 +40,7 @@ #include #include "base/logging.hh" -#include "base/random.hh" -#include "base/trace.hh" #include "cpu/testers/traffic_gen/base.hh" -#include "debug/TrafficGen.hh" -#include "sim/system.hh" BaseGen::BaseGen(SimObject &obj, RequestorID requestor_id, Tick _duration) : _name(obj.name()), requestorId(requestor_id), diff --git a/src/cpu/testers/traffic_gen/base_gen.hh b/src/cpu/testers/traffic_gen/base_gen.hh index 8d5003336..664678eb3 100644 --- a/src/cpu/testers/traffic_gen/base_gen.hh +++ b/src/cpu/testers/traffic_gen/base_gen.hh @@ -43,6 +43,7 @@ #ifndef __CPU_TRAFFIC_GEN_BASE_GEN_HH__ #define __CPU_TRAFFIC_GEN_BASE_GEN_HH__ +#include #include #include "base/types.hh" diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc index be2155d6d..43d0d3ae9 100644 --- a/src/dev/arm/energy_ctrl.cc +++ b/src/dev/arm/energy_ctrl.cc @@ -43,6 +43,7 @@ #include "mem/packet_access.hh" #include "params/EnergyCtrl.hh" #include "sim/dvfs_handler.hh" +#include "sim/serialize.hh" EnergyCtrl::EnergyCtrl(const Params &p) : BasicPioDevice(p, PIO_NUM_FIELDS * 4), // each field is 32 bit diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc index 6c01049a1..a8b5cc50b 100644 --- a/src/dev/arm/generic_timer.cc +++ b/src/dev/arm/generic_timer.cc @@ -41,6 +41,8 @@ #include "arch/arm/system.hh" #include "arch/arm/utility.hh" +#include "base/logging.hh" +#include "base/trace.hh" #include "cpu/base.hh" #include "debug/Timer.hh" #include "dev/arm/base_gic.hh" diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh index b007ef155..16d2ce31b 100644 --- a/src/dev/arm/generic_timer.hh +++ b/src/dev/arm/generic_timer.hh @@ -38,11 +38,20 @@ #ifndef __DEV_ARM_GENERIC_TIMER_HH__ #define __DEV_ARM_GENERIC_TIMER_HH__ +#include +#include + #include "arch/arm/isa_device.hh" #include "arch/arm/system.hh" +#include "base/addr_range.hh" +#include "base/bitunion.hh" +#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" #include "sim/sim_object.hh" /// @file diff --git a/src/dev/arm/gic_v3_its.cc b/src/dev/arm/gic_v3_its.cc index caf058dd3..ee30eeee7 100644 --- a/src/dev/arm/gic_v3_its.cc +++ b/src/dev/arm/gic_v3_its.cc @@ -37,6 +37,11 @@ #include "dev/arm/gic_v3_its.hh" +#include +#include + +#include "base/logging.hh" +#include "base/trace.hh" #include "debug/AddrRanges.hh" #include "debug/Drain.hh" #include "debug/GIC.hh" diff --git a/src/dev/arm/gic_v3_its.hh b/src/dev/arm/gic_v3_its.hh index 0262f4631..e1688cdc7 100644 --- a/src/dev/arm/gic_v3_its.hh +++ b/src/dev/arm/gic_v3_its.hh @@ -38,9 +38,15 @@ #ifndef __DEV_ARM_GICV3_ITS_H__ #define __DEV_ARM_GICV3_ITS_H__ +#include +#include #include +#include +#include "base/addr_range.hh" +#include "base/bitunion.hh" #include "base/coroutine.hh" +#include "base/types.hh" #include "dev/dma_device.hh" #include "params/Gicv3Its.hh" diff --git a/src/dev/arm/smmu_v3_proc.cc b/src/dev/arm/smmu_v3_proc.cc index 0a11c1562..cb8aca5e2 100644 --- a/src/dev/arm/smmu_v3_proc.cc +++ b/src/dev/arm/smmu_v3_proc.cc @@ -37,6 +37,9 @@ #include "dev/arm/smmu_v3_proc.hh" +#include +#include + #include "dev/arm/smmu_v3.hh" #include "sim/system.hh" diff --git a/src/dev/arm/timer_a9global.cc b/src/dev/arm/timer_a9global.cc index e2c7a36e2..e1b191068 100644 --- a/src/dev/arm/timer_a9global.cc +++ b/src/dev/arm/timer_a9global.cc @@ -38,7 +38,10 @@ #include "dev/arm/timer_a9global.hh" +#include + #include "base/intmath.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" diff --git a/src/dev/arm/timer_a9global.hh b/src/dev/arm/timer_a9global.hh index 7a8cf85c8..72c0ea076 100644 --- a/src/dev/arm/timer_a9global.hh +++ b/src/dev/arm/timer_a9global.hh @@ -39,9 +39,15 @@ #ifndef __DEV_ARM_GLOBAL_TIMER_HH__ #define __DEV_ARM_GLOBAL_TIMER_HH__ +#include + +#include "base/types.hh" #include "base/bitunion.hh" +#include "base/types.hh" #include "dev/io_device.hh" #include "params/A9GlobalTimer.hh" +#include "sim/eventq.hh" +#include "sim/serialize.hh" /** @file * This implements the Cortex A9-MPCore global timer from TRM rev r4p1. diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc index 9b4f7f3da..760adf595 100644 --- a/src/dev/arm/timer_cpulocal.cc +++ b/src/dev/arm/timer_cpulocal.cc @@ -37,8 +37,11 @@ #include "dev/arm/timer_cpulocal.hh" +#include + #include "arch/arm/system.hh" #include "base/intmath.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" diff --git a/src/dev/arm/timer_cpulocal.hh b/src/dev/arm/timer_cpulocal.hh index 6966d3e83..a4fa45749 100644 --- a/src/dev/arm/timer_cpulocal.hh +++ b/src/dev/arm/timer_cpulocal.hh @@ -38,9 +38,15 @@ #ifndef __DEV_ARM_LOCALTIMER_HH__ #define __DEV_ARM_LOCALTIMER_HH__ +#include +#include +#include + #include "base/bitunion.hh" +#include "base/types.hh" #include "dev/io_device.hh" #include "params/CpuLocalTimer.hh" +#include "sim/serialize.hh" /** @file * This implements the cpu local timer from the Cortex-A9 MPCore diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc index 95fb30fe5..6403a7716 100644 --- a/src/dev/arm/timer_sp804.cc +++ b/src/dev/arm/timer_sp804.cc @@ -37,7 +37,10 @@ #include "dev/arm/timer_sp804.hh" +#include + #include "base/intmath.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/Checkpoint.hh" #include "debug/Timer.hh" diff --git a/src/dev/arm/timer_sp804.hh b/src/dev/arm/timer_sp804.hh index 34df8aac7..7cf3f2908 100644 --- a/src/dev/arm/timer_sp804.hh +++ b/src/dev/arm/timer_sp804.hh @@ -38,8 +38,14 @@ #ifndef __DEV_ARM_SP804_HH__ #define __DEV_ARM_SP804_HH__ +#include + +#include "base/bitunion.hh" +#include "base/types.hh" #include "dev/arm/amba_device.hh" #include "params/Sp804.hh" +#include "sim/eventq.hh" +#include "sim/serialize.hh" /** @file * This implements the dual Sp804 timer block diff --git a/src/dev/hsa/hsa_packet_processor.cc b/src/dev/hsa/hsa_packet_processor.cc index bba3c5940..756757a8f 100644 --- a/src/dev/hsa/hsa_packet_processor.cc +++ b/src/dev/hsa/hsa_packet_processor.cc @@ -35,10 +35,13 @@ #include "dev/hsa/hsa_packet_processor.hh" +#include #include #include "base/chunk_generator.hh" #include "base/compiler.hh" +#include "base/logging.hh" +#include "base/trace.hh" #include "debug/HSAPacketProcessor.hh" #include "dev/dma_device.hh" #include "dev/hsa/hsa_device.hh" diff --git a/src/dev/hsa/hsa_packet_processor.hh b/src/dev/hsa/hsa_packet_processor.hh index 0f82e9253..ed0fdff08 100644 --- a/src/dev/hsa/hsa_packet_processor.hh +++ b/src/dev/hsa/hsa_packet_processor.hh @@ -36,14 +36,16 @@ #ifndef __DEV_HSA_HSA_PACKET_PROCESSOR__ #define __DEV_HSA_HSA_PACKET_PROCESSOR__ +#include #include +#include -#include - +#include "base/types.hh" #include "dev/dma_device.hh" #include "dev/hsa/hsa.h" #include "dev/hsa/hsa_queue.hh" #include "params/HSAPacketProcessor.hh" +#include "sim/eventq.hh" #define AQL_PACKET_SIZE 64 #define PAGE_SIZE 4096 diff --git a/src/dev/i2c/bus.cc b/src/dev/i2c/bus.cc index 345d71ceb..7e362ac6a 100644 --- a/src/dev/i2c/bus.cc +++ b/src/dev/i2c/bus.cc @@ -41,6 +41,7 @@ #include "debug/Checkpoint.hh" #include "dev/i2c/device.hh" #include "mem/packet_access.hh" +#include "sim/serialize.hh" // clang complains about std::set being overloaded with Packet::set if // we open up the entire namespace std diff --git a/src/dev/net/dist_etherlink.hh b/src/dev/net/dist_etherlink.hh index bb99c33be..c86f8adc5 100644 --- a/src/dev/net/dist_etherlink.hh +++ b/src/dev/net/dist_etherlink.hh @@ -48,10 +48,14 @@ #ifndef __DEV_DIST_ETHERLINK_HH__ #define __DEV_DIST_ETHERLINK_HH__ +#include #include +#include "base/types.hh" #include "dev/net/etherlink.hh" #include "params/DistEtherLink.hh" +#include "sim/serialize.hh" +#include "sim/sim_object.hh" class DistIface; class EthPacketData; diff --git a/src/dev/net/etherlink.cc b/src/dev/net/etherlink.cc index 9bf805f98..eff38e6d8 100644 --- a/src/dev/net/etherlink.cc +++ b/src/dev/net/etherlink.cc @@ -44,11 +44,13 @@ #include "dev/net/etherlink.hh" +#include #include #include #include #include +#include "base/logging.hh" #include "base/random.hh" #include "base/trace.hh" #include "debug/Ethernet.hh" diff --git a/src/dev/net/etherlink.hh b/src/dev/net/etherlink.hh index 036d7defc..940d2bd61 100644 --- a/src/dev/net/etherlink.hh +++ b/src/dev/net/etherlink.hh @@ -46,6 +46,7 @@ #define __DEV_NET_ETHERLINK_HH__ #include +#include #include "base/types.hh" #include "dev/net/etherint.hh" diff --git a/src/dev/net/etherswitch.hh b/src/dev/net/etherswitch.hh index 7f7f36e96..9b3709006 100644 --- a/src/dev/net/etherswitch.hh +++ b/src/dev/net/etherswitch.hh @@ -35,6 +35,8 @@ #include #include +#include +#include #include "base/inet.hh" #include "dev/net/etherint.hh" @@ -43,6 +45,7 @@ #include "dev/net/pktfifo.hh" #include "params/EtherSwitch.hh" #include "sim/eventq.hh" +#include "sim/serialize.hh" #include "sim/sim_object.hh" class EtherSwitch : public SimObject diff --git a/src/dev/net/i8254xGBe.hh b/src/dev/net/i8254xGBe.hh index 070edde82..422318b9c 100644 --- a/src/dev/net/i8254xGBe.hh +++ b/src/dev/net/i8254xGBe.hh @@ -33,10 +33,13 @@ #ifndef __DEV_NET_I8254XGBE_HH__ #define __DEV_NET_I8254XGBE_HH__ +#include #include #include #include "base/inet.hh" +#include "base/trace.hh" +#include "base/types.hh" #include "debug/EthernetDesc.hh" #include "debug/EthernetIntr.hh" #include "dev/net/etherdevice.hh" @@ -47,6 +50,7 @@ #include "dev/pci/device.hh" #include "params/IGbE.hh" #include "sim/eventq.hh" +#include "sim/serialize.hh" class IGbEInt; diff --git a/src/dev/ps2/device.cc b/src/dev/ps2/device.cc index c32288e3e..47eb026af 100644 --- a/src/dev/ps2/device.cc +++ b/src/dev/ps2/device.cc @@ -45,6 +45,7 @@ #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2Device.hh" +#include "sim/serialize.hh" PS2Device::PS2Device(const PS2DeviceParams &p) : SimObject(p) diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc index bc3d3f15c..d8e32f452 100644 --- a/src/dev/ps2/mouse.cc +++ b/src/dev/ps2/mouse.cc @@ -45,6 +45,7 @@ #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2Mouse.hh" +#include "sim/serialize.hh" PS2Mouse::PS2Mouse(const PS2MouseParams &p) : PS2Device(p), diff --git a/src/dev/serial/uart8250.cc b/src/dev/serial/uart8250.cc index a6e9bd150..83238d60c 100644 --- a/src/dev/serial/uart8250.cc +++ b/src/dev/serial/uart8250.cc @@ -41,6 +41,7 @@ #include "dev/platform.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" +#include "sim/serialize.hh" using namespace std; diff --git a/src/dev/storage/disk_image.cc b/src/dev/storage/disk_image.cc index 58d2ac032..199ecc23b 100644 --- a/src/dev/storage/disk_image.cc +++ b/src/dev/storage/disk_image.cc @@ -47,6 +47,7 @@ #include "debug/DiskImageRead.hh" #include "debug/DiskImageWrite.hh" #include "sim/byteswap.hh" +#include "sim/serialize.hh" #include "sim/sim_exit.hh" using namespace std; diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc index f5332e900..0624c7e51 100644 --- a/src/dev/virtio/base.cc +++ b/src/dev/virtio/base.cc @@ -41,6 +41,7 @@ #include "debug/VIO.hh" #include "params/VirtIODeviceBase.hh" #include "params/VirtIODummyDevice.hh" +#include "sim/serialize.hh" VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, ByteOrder bo, VirtQueue &_queue, Index descIndex) diff --git a/src/dev/virtio/base.hh b/src/dev/virtio/base.hh index 776c2a351..d9ade7f66 100644 --- a/src/dev/virtio/base.hh +++ b/src/dev/virtio/base.hh @@ -38,11 +38,15 @@ #ifndef __DEV_VIRTIO_BASE_HH__ #define __DEV_VIRTIO_BASE_HH__ +#include #include +#include #include "base/bitunion.hh" +#include "base/types.hh" #include "dev/virtio/virtio_ring.h" #include "mem/port_proxy.hh" +#include "sim/serialize.hh" #include "sim/sim_object.hh" struct VirtIODeviceBaseParams; diff --git a/src/mem/mem_checker.cc b/src/mem/mem_checker.cc index f4f24d442..5e839fb75 100644 --- a/src/mem/mem_checker.cc +++ b/src/mem/mem_checker.cc @@ -37,7 +37,7 @@ #include "mem/mem_checker.hh" -#include +#include "base/logging.hh" void MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start, @@ -54,9 +54,9 @@ MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start, ++numIncomplete; if (complete != TICK_FUTURE) { - // Reopen a closed write cluster - assert(_start < complete); // should open a new write cluster, instead; - // also somewhat fishy wrt causality / ordering of calls vs time + // Reopen a closed write cluster + assert(_start < complete); // Should open a new write cluster instead + // Also somewhat fishy wrt causality / ordering of calls vs time // progression TODO: Check me! complete = TICK_FUTURE; } @@ -67,13 +67,14 @@ MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start, } void -MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial, Tick _complete) +MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial, + Tick _complete) { auto it = writes.find(serial); if (it == writes.end()) { - warn("Could not locate write transaction: serial = %d, complete = %d\n", - serial, _complete); + warn("Could not locate write transaction: serial = %d, " + "complete = %d\n", serial, _complete); return; } @@ -90,9 +91,9 @@ MemChecker::WriteCluster::completeWrite(MemChecker::Serial serial, Tick _complet // All writes have completed, this cluster is now complete and will be // assigned the max of completion tick values among all writes. // - // Note that we cannot simply keep updating complete, because that would - // count the cluster as closed already. Instead, we keep TICK_FUTURE - // until all writes have completed. + // Note that we cannot simply keep updating complete, because that + // would count the cluster as closed already. Instead, we keep + // TICK_FUTURE until all writes have completed. complete = completeMax; } } @@ -124,7 +125,8 @@ MemChecker::ByteTracker::startRead(MemChecker::Serial serial, Tick start) } bool -MemChecker::ByteTracker::inExpectedData(Tick start, Tick complete, uint8_t data) +MemChecker::ByteTracker::inExpectedData(Tick start, Tick complete, + uint8_t data) { _lastExpectedData.clear(); @@ -259,7 +261,8 @@ MemChecker::ByteTracker::startWrite(MemChecker::Serial serial, Tick start, } void -MemChecker::ByteTracker::completeWrite(MemChecker::Serial serial, Tick complete) +MemChecker::ByteTracker::completeWrite(MemChecker::Serial serial, + Tick complete) { getIncompleteWriteCluster()->completeWrite(serial, complete); pruneTransactions(); @@ -282,7 +285,7 @@ MemChecker::ByteTracker::pruneTransactions() // Pruning of readObservations readObservations.erase(readObservations.begin(), - lastCompletedTransaction(&readObservations, before)); + lastCompletedTransaction(&readObservations, before)); // Pruning of writeClusters if (!writeClusters.empty()) { diff --git a/src/mem/mem_checker.hh b/src/mem/mem_checker.hh index 41aa691e7..c924b1db4 100644 --- a/src/mem/mem_checker.hh +++ b/src/mem/mem_checker.hh @@ -38,13 +38,15 @@ #ifndef __MEM_MEM_CHECKER_HH__ #define __MEM_MEM_CHECKER_HH__ +#include +#include #include #include #include #include #include -#include "base/logging.hh" +#include "base/cprintf.hh" #include "base/trace.hh" #include "base/types.hh" #include "debug/MemChecker.hh" diff --git a/src/mem/mem_interface.cc b/src/mem/mem_interface.cc index c86683e6f..407eb1d90 100644 --- a/src/mem/mem_interface.cc +++ b/src/mem/mem_interface.cc @@ -41,6 +41,7 @@ #include "mem/mem_interface.hh" #include "base/bitfield.hh" +#include "base/cprintf.hh" #include "base/trace.hh" #include "debug/DRAM.hh" #include "debug/DRAMPower.hh" diff --git a/src/mem/physical.cc b/src/mem/physical.cc index a03f20053..9877fadfb 100644 --- a/src/mem/physical.cc +++ b/src/mem/physical.cc @@ -54,6 +54,7 @@ #include "debug/AddrRanges.hh" #include "debug/Checkpoint.hh" #include "mem/abstract_mem.hh" +#include "sim/serialize.hh" /** * On Linux, MAP_NORESERVE allow us to simulate a very large memory diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 156b96d23..432b6d698 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -31,6 +31,7 @@ #include #include "base/cast.hh" +#include "base/cprintf.hh" #include "base/random.hh" #include "debug/RubyNetwork.hh" #include "mem/ruby/network/MessageBuffer.hh" diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc index 61d565472..f27a8f3f1 100644 --- a/src/sim/clock_domain.cc +++ b/src/sim/clock_domain.cc @@ -41,12 +41,14 @@ #include #include +#include "base/logging.hh" #include "base/trace.hh" #include "debug/ClockDomain.hh" #include "params/ClockDomain.hh" #include "params/DerivedClockDomain.hh" #include "params/SrcClockDomain.hh" #include "sim/clocked_object.hh" +#include "sim/serialize.hh" #include "sim/voltage_domain.hh" ClockDomain::ClockDomainStats::ClockDomainStats(ClockDomain &cd) diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc index 38ca35cef..53b4271a8 100644 --- a/src/sim/dvfs_handler.cc +++ b/src/sim/dvfs_handler.cc @@ -40,12 +40,10 @@ #include #include -#include "base/logging.hh" #include "base/trace.hh" #include "debug/DVFS.hh" #include "params/DVFSHandler.hh" -#include "sim/clock_domain.hh" -#include "sim/eventq.hh" +#include "sim/serialize.hh" #include "sim/stat_control.hh" #include "sim/voltage_domain.hh" diff --git a/src/sim/dvfs_handler.hh b/src/sim/dvfs_handler.hh index da04fc5c9..fccaf6303 100644 --- a/src/sim/dvfs_handler.hh +++ b/src/sim/dvfs_handler.hh @@ -46,8 +46,12 @@ #ifndef __SIM_DVFS_HANDLER_HH__ #define __SIM_DVFS_HANDLER_HH__ +#include +#include #include +#include "base/logging.hh" +#include "base/types.hh" #include "debug/DVFS.hh" #include "params/DVFSHandler.hh" #include "sim/clock_domain.hh" diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh index 5fb087774..a9ab29b0e 100644 --- a/src/sim/eventq.hh +++ b/src/sim/eventq.hh @@ -40,6 +40,7 @@ #include #include #include +#include #include #include diff --git a/src/sim/power/thermal_domain.cc b/src/sim/power/thermal_domain.cc index dabf2fe99..e9f4d3ca2 100644 --- a/src/sim/power/thermal_domain.cc +++ b/src/sim/power/thermal_domain.cc @@ -46,6 +46,7 @@ #include "sim/linear_solver.hh" #include "sim/power/thermal_model.hh" #include "sim/probe/probe.hh" +#include "sim/serialize.hh" #include "sim/sub_system.hh" ThermalDomain::ThermalDomain(const Params &p) diff --git a/src/sim/power/thermal_model.cc b/src/sim/power/thermal_model.cc index 65649e513..408642ccf 100644 --- a/src/sim/power/thermal_model.cc +++ b/src/sim/power/thermal_model.cc @@ -44,6 +44,7 @@ #include "sim/clocked_object.hh" #include "sim/linear_solver.hh" #include "sim/power/thermal_domain.hh" +#include "sim/serialize.hh" #include "sim/sim_object.hh" /** diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc index a11ed430b..ffa19721a 100644 --- a/src/sim/power_state.cc +++ b/src/sim/power_state.cc @@ -37,10 +37,13 @@ #include "sim/power_state.hh" +#include + #include "base/logging.hh" #include "base/trace.hh" #include "debug/PowerDomain.hh" #include "sim/power_domain.hh" +#include "sim/serialize.hh" PowerState::PowerState(const PowerStateParams &p) : SimObject(p), _currState(p.default_state), diff --git a/src/sim/power_state.hh b/src/sim/power_state.hh index fe869ff71..fb9a5818d 100644 --- a/src/sim/power_state.hh +++ b/src/sim/power_state.hh @@ -44,6 +44,7 @@ #define __SIM_POWER_STATE_HH__ #include +#include #include "base/callback.hh" #include "base/statistics.hh" diff --git a/src/sim/redirect_path.cc b/src/sim/redirect_path.cc index f270057c2..57286f7a8 100644 --- a/src/sim/redirect_path.cc +++ b/src/sim/redirect_path.cc @@ -30,6 +30,8 @@ #include +#include "base/str.hh" + static std::string normalizePath(std::string path) { diff --git a/src/sim/root.hh b/src/sim/root.hh index 817e2f334..2db422367 100644 --- a/src/sim/root.hh +++ b/src/sim/root.hh @@ -53,6 +53,7 @@ #include "base/statistics.hh" #include "base/time.hh" +#include "base/types.hh" #include "params/Root.hh" #include "sim/eventq.hh" #include "sim/sim_object.hh" diff --git a/src/sim/serialize_handlers.hh b/src/sim/serialize_handlers.hh index 8efd895ba..5e5c3ff4a 100644 --- a/src/sim/serialize_handlers.hh +++ b/src/sim/serialize_handlers.hh @@ -47,8 +47,8 @@ #include -#include #include +#include #include "base/str.hh" diff --git a/src/sim/sim_exit.hh b/src/sim/sim_exit.hh index a79d3e2cd..d1791f58b 100644 --- a/src/sim/sim_exit.hh +++ b/src/sim/sim_exit.hh @@ -29,6 +29,7 @@ #ifndef __SIM_EXIT_HH__ #define __SIM_EXIT_HH__ +#include #include #include "base/types.hh" diff --git a/src/sim/ticked_object.cc b/src/sim/ticked_object.cc index 3564b4d03..79cbd41a9 100644 --- a/src/sim/ticked_object.cc +++ b/src/sim/ticked_object.cc @@ -39,6 +39,7 @@ #include "params/TickedObject.hh" #include "sim/clocked_object.hh" +#include "sim/serialize.hh" Ticked::Ticked(ClockedObject &object_, Stats::Scalar *imported_num_cycles, diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc index f6f839627..d770af852 100644 --- a/src/sim/voltage_domain.cc +++ b/src/sim/voltage_domain.cc @@ -39,11 +39,11 @@ #include -#include "base/statistics.hh" +#include "base/logging.hh" #include "base/trace.hh" #include "debug/VoltageDomain.hh" #include "params/VoltageDomain.hh" -#include "sim/sim_object.hh" +#include "sim/serialize.hh" VoltageDomain::VoltageDomain(const Params &p) : SimObject(p), voltageOpPoints(p.voltage), _perfLevel(0), stats(*this) -- 2.30.2