From 89f2d5eb54a6617c493c6ad68f85b93b3381b6f0 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 25 May 2020 04:35:10 -0700 Subject: [PATCH] misc: Make many includes explicit. A future change will adjust how some includes can be included transitively. This change fixes up those files so that they include the headers they need directly, instead of expecting to have them by accident through other files. Change-Id: I1f79aa11df2b46bb7018f39c964294c41db4fdac Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29407 Reviewed-by: Giacomo Travaglini Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/cpu/pred/loop_predictor.cc | 1 + src/cpu/testers/traffic_gen/pygen.cc | 1 + src/dev/arm/energy_ctrl.cc | 1 + src/dev/arm/smmu_v3_slaveifc.cc | 1 + src/dev/i2c/bus.cc | 1 + src/dev/mc146818.hh | 1 + src/dev/net/tcp_iface.cc | 2 ++ src/dev/ps2/device.cc | 1 + src/dev/ps2/keyboard.cc | 1 + src/dev/ps2/mouse.cc | 1 + src/dev/ps2/touchkit.cc | 1 + src/dev/x86/cmos.cc | 1 + src/dev/x86/i8042.cc | 1 + src/dev/x86/i8259.cc | 1 + src/learning_gem5/part2/goodbye_object.cc | 1 + src/learning_gem5/part2/hello_object.cc | 1 + src/learning_gem5/part2/simple_memobj.cc | 1 + src/mem/cache/compressors/base.cc | 1 + src/mem/cache/compressors/base_delta.cc | 1 + src/mem/cache/compressors/dictionary_compressor_impl.hh | 1 + src/mem/cache/compressors/multi.cc | 1 + src/mem/cache/compressors/repeated_qwords.cc | 1 + src/mem/cache/compressors/zero.cc | 1 + src/mem/cache/replacement_policies/bip_rp.cc | 1 + src/mem/cache/replacement_policies/fifo_rp.cc | 1 + src/mem/cache/replacement_policies/lru_rp.cc | 1 + src/mem/cache/replacement_policies/mru_rp.cc | 1 + src/mem/cache/replacement_policies/weighted_lru_rp.cc | 1 + src/mem/hmc_controller.cc | 1 + src/sim/global_event.cc | 2 ++ src/sim/power_domain.cc | 1 + src/sim/power_state.cc | 1 + 32 files changed, 34 insertions(+) diff --git a/src/cpu/pred/loop_predictor.cc b/src/cpu/pred/loop_predictor.cc index 43a005c94e..4b23fd1f93 100644 --- a/src/cpu/pred/loop_predictor.cc +++ b/src/cpu/pred/loop_predictor.cc @@ -34,6 +34,7 @@ #include "cpu/pred/loop_predictor.hh" #include "base/random.hh" +#include "base/trace.hh" #include "debug/LTage.hh" #include "params/LoopPredictor.hh" diff --git a/src/cpu/testers/traffic_gen/pygen.cc b/src/cpu/testers/traffic_gen/pygen.cc index da3a2f6abc..19ce914a3b 100644 --- a/src/cpu/testers/traffic_gen/pygen.cc +++ b/src/cpu/testers/traffic_gen/pygen.cc @@ -36,6 +36,7 @@ */ #include "cpu/testers/traffic_gen/pygen.hh" +#include "base/trace.hh" #include "config/have_protobuf.hh" #include "debug/TrafficGen.hh" #include "params/PyTrafficGen.hh" diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc index 17a3b521bd..15c29fe511 100644 --- a/src/dev/arm/energy_ctrl.cc +++ b/src/dev/arm/energy_ctrl.cc @@ -37,6 +37,7 @@ #include "dev/arm/energy_ctrl.hh" +#include "base/trace.hh" #include "debug/EnergyCtrl.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/arm/smmu_v3_slaveifc.cc b/src/dev/arm/smmu_v3_slaveifc.cc index b46bf9ebb0..5b3dd98abf 100644 --- a/src/dev/arm/smmu_v3_slaveifc.cc +++ b/src/dev/arm/smmu_v3_slaveifc.cc @@ -37,6 +37,7 @@ #include "dev/arm/smmu_v3_slaveifc.hh" +#include "base/trace.hh" #include "debug/SMMUv3.hh" #include "dev/arm/smmu_v3.hh" #include "dev/arm/smmu_v3_transl.hh" diff --git a/src/dev/i2c/bus.cc b/src/dev/i2c/bus.cc index 096102a6d5..7a8d1a056b 100644 --- a/src/dev/i2c/bus.cc +++ b/src/dev/i2c/bus.cc @@ -37,6 +37,7 @@ #include "dev/i2c/bus.hh" +#include "base/trace.hh" #include "debug/Checkpoint.hh" #include "dev/i2c/device.hh" #include "mem/packet_access.hh" diff --git a/src/dev/mc146818.hh b/src/dev/mc146818.hh index 734346f2df..0ed5636be1 100644 --- a/src/dev/mc146818.hh +++ b/src/dev/mc146818.hh @@ -31,6 +31,7 @@ #include "base/bitunion.hh" #include "base/logging.hh" +#include "sim/core.hh" #include "sim/eventq_impl.hh" /** Real-Time Clock (MC146818) */ diff --git a/src/dev/net/tcp_iface.cc b/src/dev/net/tcp_iface.cc index d2f8856de2..ba21334961 100644 --- a/src/dev/net/tcp_iface.cc +++ b/src/dev/net/tcp_iface.cc @@ -52,9 +52,11 @@ #include #include +#include "base/trace.hh" #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/ps2/device.cc b/src/dev/ps2/device.cc index a966b04656..81c26187b3 100644 --- a/src/dev/ps2/device.cc +++ b/src/dev/ps2/device.cc @@ -41,6 +41,7 @@ #include "dev/ps2/device.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2Device.hh" diff --git a/src/dev/ps2/keyboard.cc b/src/dev/ps2/keyboard.cc index e496fb9f23..a825ee1fcf 100644 --- a/src/dev/ps2/keyboard.cc +++ b/src/dev/ps2/keyboard.cc @@ -41,6 +41,7 @@ #include "dev/ps2/keyboard.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2Keyboard.hh" diff --git a/src/dev/ps2/mouse.cc b/src/dev/ps2/mouse.cc index 3f2b485284..7966bf8665 100644 --- a/src/dev/ps2/mouse.cc +++ b/src/dev/ps2/mouse.cc @@ -41,6 +41,7 @@ #include "dev/ps2/mouse.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2Mouse.hh" diff --git a/src/dev/ps2/touchkit.cc b/src/dev/ps2/touchkit.cc index eaa64ce974..7d651a648e 100644 --- a/src/dev/ps2/touchkit.cc +++ b/src/dev/ps2/touchkit.cc @@ -41,6 +41,7 @@ #include "dev/ps2/touchkit.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/PS2.hh" #include "dev/ps2/types.hh" #include "params/PS2TouchKit.hh" diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc index 85ff6b0362..5d8c680377 100644 --- a/src/dev/x86/cmos.cc +++ b/src/dev/x86/cmos.cc @@ -28,6 +28,7 @@ #include "dev/x86/cmos.hh" +#include "base/trace.hh" #include "debug/CMOS.hh" #include "dev/x86/intdev.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc index 41c1c368c4..35a86b2428 100644 --- a/src/dev/x86/i8042.cc +++ b/src/dev/x86/i8042.cc @@ -29,6 +29,7 @@ #include "dev/x86/i8042.hh" #include "base/bitunion.hh" +#include "base/trace.hh" #include "debug/I8042.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc index eb6d66d622..1e081d7f85 100644 --- a/src/dev/x86/i8259.cc +++ b/src/dev/x86/i8259.cc @@ -29,6 +29,7 @@ #include "dev/x86/i8259.hh" #include "base/bitfield.hh" +#include "base/trace.hh" #include "debug/I8259.hh" #include "dev/x86/i82094aa.hh" #include "mem/packet.hh" diff --git a/src/learning_gem5/part2/goodbye_object.cc b/src/learning_gem5/part2/goodbye_object.cc index 1314bb2e99..090458db33 100644 --- a/src/learning_gem5/part2/goodbye_object.cc +++ b/src/learning_gem5/part2/goodbye_object.cc @@ -28,6 +28,7 @@ #include "learning_gem5/part2/goodbye_object.hh" +#include "base/trace.hh" #include "debug/HelloExample.hh" #include "sim/sim_exit.hh" diff --git a/src/learning_gem5/part2/hello_object.cc b/src/learning_gem5/part2/hello_object.cc index fbce05889a..7207051da3 100644 --- a/src/learning_gem5/part2/hello_object.cc +++ b/src/learning_gem5/part2/hello_object.cc @@ -29,6 +29,7 @@ #include "learning_gem5/part2/hello_object.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/HelloExample.hh" HelloObject::HelloObject(HelloObjectParams *params) : diff --git a/src/learning_gem5/part2/simple_memobj.cc b/src/learning_gem5/part2/simple_memobj.cc index bd5ac21e12..6fd287c9eb 100644 --- a/src/learning_gem5/part2/simple_memobj.cc +++ b/src/learning_gem5/part2/simple_memobj.cc @@ -28,6 +28,7 @@ #include "learning_gem5/part2/simple_memobj.hh" +#include "base/trace.hh" #include "debug/SimpleMemobj.hh" SimpleMemobj::SimpleMemobj(SimpleMemobjParams *params) : diff --git a/src/mem/cache/compressors/base.cc b/src/mem/cache/compressors/base.cc index 391ff09924..d08a5b9ab6 100644 --- a/src/mem/cache/compressors/base.cc +++ b/src/mem/cache/compressors/base.cc @@ -37,6 +37,7 @@ #include #include +#include "base/trace.hh" #include "debug/CacheComp.hh" #include "mem/cache/tags/super_blk.hh" #include "params/BaseCacheCompressor.hh" diff --git a/src/mem/cache/compressors/base_delta.cc b/src/mem/cache/compressors/base_delta.cc index bf80272dd2..5af3b38f55 100644 --- a/src/mem/cache/compressors/base_delta.cc +++ b/src/mem/cache/compressors/base_delta.cc @@ -30,6 +30,7 @@ * Implementation of the specialized sub-compressors used by BDI. @see BDI */ +#include "base/trace.hh" #include "mem/cache/compressors/base_delta_impl.hh" #include "params/Base16Delta8.hh" #include "params/Base32Delta16.hh" diff --git a/src/mem/cache/compressors/dictionary_compressor_impl.hh b/src/mem/cache/compressors/dictionary_compressor_impl.hh index d29baec22b..d771d52786 100644 --- a/src/mem/cache/compressors/dictionary_compressor_impl.hh +++ b/src/mem/cache/compressors/dictionary_compressor_impl.hh @@ -35,6 +35,7 @@ #include +#include "base/trace.hh" #include "debug/CacheComp.hh" #include "mem/cache/compressors/dictionary_compressor.hh" #include "params/BaseDictionaryCompressor.hh" diff --git a/src/mem/cache/compressors/multi.cc b/src/mem/cache/compressors/multi.cc index fe22f5eb4f..d1e7fbc5d0 100644 --- a/src/mem/cache/compressors/multi.cc +++ b/src/mem/cache/compressors/multi.cc @@ -37,6 +37,7 @@ #include #include "base/bitfield.hh" +#include "base/trace.hh" #include "debug/CacheComp.hh" #include "params/MultiCompressor.hh" diff --git a/src/mem/cache/compressors/repeated_qwords.cc b/src/mem/cache/compressors/repeated_qwords.cc index fa9b9fa817..a51c05f908 100644 --- a/src/mem/cache/compressors/repeated_qwords.cc +++ b/src/mem/cache/compressors/repeated_qwords.cc @@ -33,6 +33,7 @@ #include "mem/cache/compressors/repeated_qwords.hh" +#include "base/trace.hh" #include "debug/CacheComp.hh" #include "mem/cache/compressors/dictionary_compressor_impl.hh" #include "params/RepeatedQwordsCompressor.hh" diff --git a/src/mem/cache/compressors/zero.cc b/src/mem/cache/compressors/zero.cc index 9662480003..45675e6943 100644 --- a/src/mem/cache/compressors/zero.cc +++ b/src/mem/cache/compressors/zero.cc @@ -33,6 +33,7 @@ #include "mem/cache/compressors/zero.hh" +#include "base/trace.hh" #include "debug/CacheComp.hh" #include "mem/cache/compressors/dictionary_compressor_impl.hh" #include "params/ZeroCompressor.hh" diff --git a/src/mem/cache/replacement_policies/bip_rp.cc b/src/mem/cache/replacement_policies/bip_rp.cc index 90867915ea..d65d21427f 100644 --- a/src/mem/cache/replacement_policies/bip_rp.cc +++ b/src/mem/cache/replacement_policies/bip_rp.cc @@ -32,6 +32,7 @@ #include "base/random.hh" #include "params/BIPRP.hh" +#include "sim/core.hh" BIPRP::BIPRP(const Params *p) : LRURP(p), btp(p->btp) diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc b/src/mem/cache/replacement_policies/fifo_rp.cc index 608f529124..0998a82e64 100644 --- a/src/mem/cache/replacement_policies/fifo_rp.cc +++ b/src/mem/cache/replacement_policies/fifo_rp.cc @@ -32,6 +32,7 @@ #include #include "params/FIFORP.hh" +#include "sim/core.hh" FIFORP::FIFORP(const Params *p) : BaseReplacementPolicy(p) diff --git a/src/mem/cache/replacement_policies/lru_rp.cc b/src/mem/cache/replacement_policies/lru_rp.cc index 82fb5cc1f9..f7d1f1d28d 100644 --- a/src/mem/cache/replacement_policies/lru_rp.cc +++ b/src/mem/cache/replacement_policies/lru_rp.cc @@ -32,6 +32,7 @@ #include #include "params/LRURP.hh" +#include "sim/core.hh" LRURP::LRURP(const Params *p) : BaseReplacementPolicy(p) diff --git a/src/mem/cache/replacement_policies/mru_rp.cc b/src/mem/cache/replacement_policies/mru_rp.cc index b84a484a25..892f9a000d 100644 --- a/src/mem/cache/replacement_policies/mru_rp.cc +++ b/src/mem/cache/replacement_policies/mru_rp.cc @@ -32,6 +32,7 @@ #include #include "params/MRURP.hh" +#include "sim/core.hh" MRURP::MRURP(const Params *p) : BaseReplacementPolicy(p) diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc b/src/mem/cache/replacement_policies/weighted_lru_rp.cc index 096381753a..eeaf2a62d5 100644 --- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc +++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc @@ -36,6 +36,7 @@ #include #include "params/WeightedLRURP.hh" +#include "sim/core.hh" WeightedLRUPolicy::WeightedLRUPolicy(const Params* p) : BaseReplacementPolicy(p) diff --git a/src/mem/hmc_controller.cc b/src/mem/hmc_controller.cc index c8938b7216..b706098a13 100644 --- a/src/mem/hmc_controller.cc +++ b/src/mem/hmc_controller.cc @@ -1,6 +1,7 @@ #include "mem/hmc_controller.hh" #include "base/random.hh" +#include "base/trace.hh" #include "debug/HMCController.hh" HMCController::HMCController(const HMCControllerParams* p) : diff --git a/src/sim/global_event.cc b/src/sim/global_event.cc index 9f9ee893f5..1f1bfc1867 100644 --- a/src/sim/global_event.cc +++ b/src/sim/global_event.cc @@ -29,6 +29,8 @@ #include "sim/global_event.hh" +#include "sim/core.hh" + std::mutex BaseGlobalEvent::globalQMutex; BaseGlobalEvent::BaseGlobalEvent(Priority p, Flags f) diff --git a/src/sim/power_domain.cc b/src/sim/power_domain.cc index fdb9b9930f..0434e1eb2f 100644 --- a/src/sim/power_domain.cc +++ b/src/sim/power_domain.cc @@ -39,6 +39,7 @@ #include +#include "base/trace.hh" #include "debug/PowerDomain.hh" PowerDomain::PowerDomain(const PowerDomainParams* p) : diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc index e116f7ea8e..cb74873001 100644 --- a/src/sim/power_state.cc +++ b/src/sim/power_state.cc @@ -38,6 +38,7 @@ #include "sim/power_state.hh" #include "base/logging.hh" +#include "base/trace.hh" #include "debug/PowerDomain.hh" #include "sim/power_domain.hh"