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 <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/cpu/pred/loop_predictor.cc b/src/cpu/pred/loop_predictor.cc
index 43a005c94e1c5fa1c5e3b1b863c150be24ec16ad..4b23fd1f933392c764b97e34aa86eeb46452dc78 100644 (file)
--- 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 da3a2f6abca1c9a9b33d511f17fc36864e18a74c..19ce914a3b9803e2ce50f05d33615191796138ed 100644 (file)
--- 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 17a3b521bd893b510aa23a5b59d4932fcdadca09..15c29fe51149447aaabbf181d7bd46b2481ac271 100644 (file)
--- 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 b46bf9ebb0355181cfba89d792c73bf81791db3e..5b3dd98abf4b432d16e3f91de41e59abc0eb44ec 100644 (file)
--- 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 096102a6d5366ec030cbe972ee1a31774abaa89f..7a8d1a056b1a11815be1a63018fc1f0065c2b85d 100644 (file)
--- 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 734346f2df9d5b7c35e5794e5db24d73abc6c490..0ed5636be1c026d7e41b320617e6ad5cc736cb94 100644 (file)
--- 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 d2f8856de291b88e54c86b3305096f2103f243b6..ba213349610d036ea8c89ca3e0adcb9eca0ff7db 100644 (file)
--- a/src/dev/net/tcp_iface.cc
+++ b/src/dev/net/tcp_iface.cc
@@ -52,9 +52,11 @@
 #include <cstring>
 #include <vector>
 
+#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 a966b046563ed2ea22718959420b932f136f0e85..81c26187b37edddba5128b0d8c6b76c4f7f8307c 100644 (file)
--- 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 e496fb9f23dcefa2d696222511a064af7e33499f..a825ee1fcf1fbd1c9512794e01e21688e79adaca 100644 (file)
--- 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 3f2b4852847871c85c0d0b930d30322d0a2d434f..7966bf8665f86a13a411ede6ede5f417306c346b 100644 (file)
--- 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 eaa64ce9746467c448cfdec8af107fe0f6dea89d..7d651a648e9d700dd57d8dec68ce5c9e009c22a5 100644 (file)
--- 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 85ff6b03628460b7c1f43b4a86dad76fee3927d3..5d8c680377459b887c5f35af52c03d01f0b3668c 100644 (file)
--- 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 41c1c368c4b5f402e134a6db83ec7ebffbf286f5..35a86b2428232713530706f2bc8aaf276b56c151 100644 (file)
--- 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 eb6d66d6227079792fc2488e8f0f03143b0288f6..1e081d7f85450f46e7800cb0b6c9c239a7f10d2a 100644 (file)
--- 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 1314bb2e9922dfb3927db1432136e50460216aa7..090458db33f5ce1f8d13afa0b383e33cf705bf2c 100644 (file)
--- 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 fbce05889a51503ef19303850ba6a8bab99696f8..7207051da3762be724d0800e460195b2047ee1fe 100644 (file)
--- 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 bd5ac21e1270a2bc447635fddd5e60315ace9b38..6fd287c9ebb7b0e802637e32314d1376943f9d7d 100644 (file)
--- 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 391ff09924f6c241ae12883d06e5e13add53cadd..d08a5b9ab6c98928ba31e5969f0bb1b667b545a4 100644 (file)
--- a/src/mem/cache/compressors/base.cc
+++ b/src/mem/cache/compressors/base.cc
@@ -37,6 +37,7 @@
 #include <cstdint>
 #include <string>
 
+#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 bf80272dd21b2a1d4b3326dd82c82318590018b5..5af3b38f55223211b44bce986617b0989590e7c6 100644 (file)
--- 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 d29baec22bb2742303e8036e5848364fda73e2be..d771d52786fd9fc3cafa9cc854d4293c1733ab87 100644 (file)
--- a/src/mem/cache/compressors/dictionary_compressor_impl.hh
+++ b/src/mem/cache/compressors/dictionary_compressor_impl.hh
@@ -35,6 +35,7 @@
 
 #include <algorithm>
 
+#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 fe22f5eb4ff80feb5739516104bfe605017e2c66..d1e7fbc5d0a2241308c803353eeccbae770ce98b 100644 (file)
--- a/src/mem/cache/compressors/multi.cc
+++ b/src/mem/cache/compressors/multi.cc
@@ -37,6 +37,7 @@
 #include <queue>
 
 #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 fa9b9fa817097750533719870dc95029281ce796..a51c05f908a63d274e7fa1c7a1c49e21a0744dcd 100644 (file)
--- 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 96624800035482ac1a9c31680ea5e2eb2062599a..45675e6943118d7d76a5fd09b4aef12863169fb7 100644 (file)
--- 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 90867915ea86372f6fedc7fa41776a17ac59cfa1..d65d21427f05daf557c6d1312f71496a8d47a66f 100644 (file)
--- 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 608f5291244fe493df3ed9b3c3459654cd82e736..0998a82e64b87a2574857dbd0ff3f71d7c36a45c 100644 (file)
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -32,6 +32,7 @@
 #include <memory>
 
 #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 82fb5cc1f99d92cfcf244dbfd58f0c96239d09e8..f7d1f1d28daa7babfcb2ca5fd222c8908999e4b2 100644 (file)
--- a/src/mem/cache/replacement_policies/lru_rp.cc
+++ b/src/mem/cache/replacement_policies/lru_rp.cc
@@ -32,6 +32,7 @@
 #include <memory>
 
 #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 b84a484a25809d3b0ff9e98afa68d5fb8b977836..892f9a000dc0f9335502314372ac4489efe91f94 100644 (file)
--- a/src/mem/cache/replacement_policies/mru_rp.cc
+++ b/src/mem/cache/replacement_policies/mru_rp.cc
@@ -32,6 +32,7 @@
 #include <memory>
 
 #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 096381753a6a3158e24e19f45ce3ae7d8f15844a..eeaf2a62d5bef78fc76e9334e4f3bd91f44a9058 100644 (file)
--- 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 <cassert>
 
 #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 c8938b7216cfb8e62f673164d4285f1164191d76..b706098a1362ff5427f3d4f7c577f68cb04eb184 100644 (file)
--- 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 9f9ee893f558e4dcb8fdd2e41e0b883b0a002663..1f1bfc1867416e0cad93ce10bf4c3d85f46e9871 100644 (file)
--- 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 fdb9b9930fca4e92c82b4302eac1b25d9a938779..0434e1eb2f581f0f2a5a61799846f961cfc3e456 100644 (file)
--- a/src/sim/power_domain.cc
+++ b/src/sim/power_domain.cc
@@ -39,6 +39,7 @@
 
 #include <unordered_map>
 
+#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 e116f7ea8e387ccb0e8c58ce1c37f88cbba3fff7..cb748730017610b2db0d8be9ca7299e44ea7fc8b 100644 (file)
--- 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"