changeset 09b482ee9ae0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=09b482ee9ae0
description:
Ruby: Shuffle some of the included files
This patch adds and removes included files from some of the files so as
to
organize remove some false dependencies and include some files directly
instead of transitively.
diffstat:
src/mem/ruby/eventqueue/RubyEventQueue.cc | 1 -
src/mem/ruby/network/Network.cc | 1 +
src/mem/ruby/network/Network.hh | 3 +--
src/mem/ruby/network/Topology.cc | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 1 +
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 1 +
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc | 1 +
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc | 1 +
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 1 +
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc | 1 +
src/mem/ruby/network/garnet/flexible-pipeline/Router.cc | 1 +
src/mem/ruby/network/simple/PerfectSwitch.cc | 1 +
src/mem/ruby/network/simple/SimpleNetwork.cc | 1 +
src/mem/ruby/network/simple/Switch.cc | 1 +
src/mem/ruby/network/simple/Throttle.cc | 1 +
src/mem/ruby/slicc_interface/AbstractController.cc | 1 +
src/mem/ruby/slicc_interface/AbstractEntry.hh | 2 --
src/mem/ruby/system/AbstractReplacementPolicy.hh | 2 +-
src/mem/ruby/system/DMASequencer.cc | 1 -
src/mem/ruby/system/DirectoryMemory.hh | 1 -
src/mem/ruby/system/MemoryControl.cc | 3 +--
src/mem/ruby/system/MemoryControl.hh | 3 ---
src/mem/ruby/system/PersistentTable.hh | 1 -
23 files changed, 16 insertions(+), 15 deletions(-)
diffs (274 lines):
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/eventqueue/RubyEventQueue.cc
--- a/src/mem/ruby/eventqueue/RubyEventQueue.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/eventqueue/RubyEventQueue.cc Sat Dec 31 18:44:51 2011 -0600
@@ -31,7 +31,6 @@
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
-#include "mem/ruby/system/System.hh"
RubyEventQueue::RubyEventQueue(EventQueue* eventq, Tick _clock)
: EventManager(eventq), m_clock(_clock)
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/Network.cc Sat Dec 31 18:44:51 2011 -0600
@@ -30,6 +30,7 @@
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/network/Topology.hh"
+#include "mem/ruby/system/System.hh"
Network::Network(const Params *p)
: SimObject(p)
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/Network.hh Sat Dec 31 18:44:51 2011 -0600
@@ -46,8 +46,7 @@
#include "mem/protocol/LinkDirection.hh"
#include "mem/protocol/MessageSizeType.hh"
-#include "mem/ruby/common/Global.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/TypeDefines.hh"
#include "params/RubyNetwork.hh"
#include "sim/sim_object.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/network/Topology.cc
--- a/src/mem/ruby/network/Topology.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/Topology.cc Sat Dec 31 18:44:51 2011 -0600
@@ -37,7 +37,6 @@
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/network/Topology.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh"
-#include "mem/ruby/system/System.hh"
using namespace std;
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Sat Dec
31 18:44:51 2011 -0600
@@ -30,6 +30,7 @@
#include <cassert>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Sat Dec
31 18:44:51 2011 -0600
@@ -31,6 +31,7 @@
#include <cassert>
#include <cmath>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Sat Dec
31 18:44:51 2011 -0600
@@ -28,6 +28,7 @@
* Authors: Niket Agarwal
*/
+#include "mem/ruby/common/Global.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc Sat Dec
31 18:44:51 2011 -0600
@@ -28,6 +28,7 @@
* Authors: Niket Agarwal
*/
+#include "base/cast.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Sat Dec
31 18:44:51 2011 -0600
@@ -30,6 +30,7 @@
#include <cassert>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Sat Dec
31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Sat Dec
31 18:44:51 2011 -0600
@@ -31,6 +31,7 @@
#include <cassert>
#include <cmath>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc Sat Dec 31
16:38:30 2011 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc Sat Dec 31
18:44:51 2011 -0600
@@ -28,6 +28,7 @@
* Authors: Niket Agarwal
*/
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/InVcState.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/simple/PerfectSwitch.cc
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc Sat Dec 31 16:38:30
2011 -0600
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc Sat Dec 31 18:44:51
2011 -0600
@@ -28,6 +28,7 @@
#include <algorithm>
+#include "base/cast.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/simple/PerfectSwitch.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/network/simple/SimpleNetwork.cc
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc Sat Dec 31 16:38:30
2011 -0600
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Sat Dec 31 18:44:51
2011 -0600
@@ -29,6 +29,7 @@
#include <cassert>
#include <numeric>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/TopologyType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/network/simple/Switch.cc
--- a/src/mem/ruby/network/simple/Switch.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/simple/Switch.cc Sat Dec 31 18:44:51 2011 -0600
@@ -28,6 +28,7 @@
#include <numeric>
+#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/MessageSizeType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/network/simple/Throttle.cc
--- a/src/mem/ruby/network/simple/Throttle.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/network/simple/Throttle.cc Sat Dec 31 18:44:51 2011 -0600
@@ -28,6 +28,7 @@
#include <cassert>
+#include "base/cast.hh"
#include "base/cprintf.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/slicc_interface/AbstractController.cc
--- a/src/mem/ruby/slicc_interface/AbstractController.cc Sat Dec 31
16:38:30 2011 -0600
+++ b/src/mem/ruby/slicc_interface/AbstractController.cc Sat Dec 31
18:44:51 2011 -0600
@@ -27,6 +27,7 @@
*/
#include "mem/ruby/slicc_interface/AbstractController.hh"
+#include "mem/ruby/system/System.hh"
AbstractController::AbstractController(const Params *p) : SimObject(p)
{
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/slicc_interface/AbstractEntry.hh
--- a/src/mem/ruby/slicc_interface/AbstractEntry.hh Sat Dec 31 16:38:30
2011 -0600
+++ b/src/mem/ruby/slicc_interface/AbstractEntry.hh Sat Dec 31 18:44:51
2011 -0600
@@ -32,8 +32,6 @@
#include <iostream>
#include "mem/protocol/AccessPermission.hh"
-#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
class DataBlock;
diff -r abeb4ac78033 -r 09b482ee9ae0
src/mem/ruby/system/AbstractReplacementPolicy.hh
--- a/src/mem/ruby/system/AbstractReplacementPolicy.hh Sat Dec 31 16:38:30
2011 -0600
+++ b/src/mem/ruby/system/AbstractReplacementPolicy.hh Sat Dec 31 18:44:51
2011 -0600
@@ -29,7 +29,7 @@
#ifndef __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
#define __MEM_RUBY_SYSTEM_ABSTRACTREPLACEMENTPOLICY_HH__
-#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/TypeDefines.hh"
class AbstractReplacementPolicy
{
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/system/DMASequencer.cc
--- a/src/mem/ruby/system/DMASequencer.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/system/DMASequencer.cc Sat Dec 31 18:44:51 2011 -0600
@@ -30,7 +30,6 @@
#include "mem/protocol/SequencerMsg.hh"
#include "mem/protocol/SequencerRequestType.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/slicc_interface/AbstractController.hh"
#include "mem/ruby/system/DMASequencer.hh"
#include "mem/ruby/system/System.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/system/DirectoryMemory.hh
--- a/src/mem/ruby/system/DirectoryMemory.hh Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/system/DirectoryMemory.hh Sat Dec 31 18:44:51 2011 -0600
@@ -33,7 +33,6 @@
#include <string>
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/slicc_interface/AbstractEntry.hh"
#include "mem/ruby/system/MemoryVector.hh"
#include "mem/ruby/system/SparseMemory.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/system/MemoryControl.cc
--- a/src/mem/ruby/system/MemoryControl.cc Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/system/MemoryControl.cc Sat Dec 31 18:44:51 2011 -0600
@@ -104,8 +104,8 @@
*
*/
+#include "base/cast.hh"
#include "base/cprintf.hh"
-#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/network/Network.hh"
@@ -113,7 +113,6 @@
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/system/MemoryControl.hh"
-#include "mem/ruby/system/System.hh"
using namespace std;
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/system/MemoryControl.hh
--- a/src/mem/ruby/system/MemoryControl.hh Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/system/MemoryControl.hh Sat Dec 31 18:44:51 2011 -0600
@@ -34,14 +34,11 @@
#include <string>
#include "mem/protocol/MemoryMsg.hh"
-#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/Consumer.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/profiler/MemCntrlProfiler.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/system/AbstractMemOrCache.hh"
#include "mem/ruby/system/MemoryNode.hh"
-#include "mem/ruby/system/System.hh"
#include "params/RubyMemoryControl.hh"
#include "sim/sim_object.hh"
diff -r abeb4ac78033 -r 09b482ee9ae0 src/mem/ruby/system/PersistentTable.hh
--- a/src/mem/ruby/system/PersistentTable.hh Sat Dec 31 16:38:30 2011 -0600
+++ b/src/mem/ruby/system/PersistentTable.hh Sat Dec 31 18:44:51 2011 -0600
@@ -34,7 +34,6 @@
#include "base/hashmap.hh"
#include "mem/protocol/AccessType.hh"
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/system/MachineID.hh"
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
