[gem5-dev] Change in gem5/gem5[develop]: misc: Make many includes explicit.

Gabe Black (Gerrit) via gem5-dev Mon, 25 May 2020 05:28:31 -0700

Gabe Black has uploaded this change for review. (https://gem5-review.googlesource.com/c/public/gem5/+/29407 )


Change subject: misc: Make many includes explicit.
......................................................................

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
---
M src/cpu/pred/loop_predictor.cc
M src/cpu/testers/traffic_gen/pygen.cc
M src/dev/arm/energy_ctrl.cc
M src/dev/arm/smmu_v3_slaveifc.cc
M src/dev/i2c/bus.cc
M src/dev/mc146818.hh
M src/dev/net/tcp_iface.cc
M src/dev/ps2/device.cc
M src/dev/ps2/keyboard.cc
M src/dev/ps2/mouse.cc
M src/dev/ps2/touchkit.cc
M src/dev/x86/cmos.cc
M src/dev/x86/i8042.cc
M src/dev/x86/i8259.cc
M src/learning_gem5/part2/goodbye_object.cc
M src/learning_gem5/part2/hello_object.cc
M src/learning_gem5/part2/simple_memobj.cc
M src/mem/cache/compressors/base.cc
M src/mem/cache/compressors/base_delta.cc
M src/mem/cache/compressors/dictionary_compressor_impl.hh
M src/mem/cache/compressors/multi.cc
M src/mem/cache/compressors/repeated_qwords.cc
M src/mem/cache/compressors/zero.cc
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/hmc_controller.cc
M src/sim/global_event.cc
M src/sim/power_domain.cc
M src/sim/power_state.cc
32 files changed, 34 insertions(+), 0 deletions(-)



diff --git a/src/cpu/pred/loop_predictor.cc b/src/cpu/pred/loop_predictor.cc
index 43a005c..4b23fd1 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.ccb/src/cpu/testers/traffic_gen/pygen.cc

index da3a2f6..19ce914 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 17a3b52..15c29fe 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.ccb/src/dev/arm/smmu_v3_slaveifc.cc

index b46bf9e..5b3dd98 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 096102a..7a8d1a0 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 734346f..0ed5636 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 d2f8856..ba21334 100644
--- 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 a966b04..81c2618 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 e496fb9..a825ee1 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 3f2b485..7966bf8 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 eaa64ce..7d651a6 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 85ff6b0..5d8c680 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 41c1c36..35a86b2 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 eb6d66d..1e081d7 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.ccb/src/learning_gem5/part2/goodbye_object.cc

index 1314bb2..090458d 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.ccb/src/learning_gem5/part2/hello_object.cc

index fbce058..7207051 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.ccb/src/learning_gem5/part2/simple_memobj.cc

index bd5ac21..6fd287c 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.ccb/src/mem/cache/compressors/base.cc

index 391ff09..d08a5b9 100644
--- 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.ccb/src/mem/cache/compressors/base_delta.cc

index bf80272..5af3b38 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.hhb/src/mem/cache/compressors/dictionary_compressor_impl.hh

index d29baec..d771d52 100644
--- 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.ccb/src/mem/cache/compressors/multi.cc

index fe22f5e..d1e7fbc 100644
--- 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.ccb/src/mem/cache/compressors/repeated_qwords.cc

index fa9b9fa..a51c05f 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.ccb/src/mem/cache/compressors/zero.cc

index 9662480..45675e6 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.ccb/src/mem/cache/replacement_policies/bip_rp.cc

index 9086791..d65d214 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.ccb/src/mem/cache/replacement_policies/fifo_rp.cc

index 608f529..0998a82 100644
--- 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.ccb/src/mem/cache/replacement_policies/lru_rp.cc

index 82fb5cc..f7d1f1d 100644
--- 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.ccb/src/mem/cache/replacement_policies/mru_rp.cc

index b84a484..892f9a0 100644
--- 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.ccb/src/mem/cache/replacement_policies/weighted_lru_rp.cc

index 0963817..eeaf2a6 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 <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 c8938b7..b706098 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 9f9ee89..1f1bfc1 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 fdb9b99..0434e1e 100644
--- 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 e116f7e..cb74873 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"


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29407

To unsubscribe, or for help writing mail filters, visithttps://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I1f79aa11df2b46bb7018f39c964294c41db4fdac
Gerrit-Change-Number: 29407
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
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

[gem5-dev] Change in gem5/gem5[develop]: misc: Make many includes explicit.

Reply via email to