diff options
-rw-r--r-- | src/mem/ruby/network/Network.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/network/SConscript | 1 | ||||
-rw-r--r-- | src/mem/ruby/network/Topology.cc (renamed from src/mem/ruby/network/simple/Topology.cc) | 2 | ||||
-rw-r--r-- | src/mem/ruby/network/Topology.hh (renamed from src/mem/ruby/network/simple/Topology.hh) | 0 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 2 | ||||
-rw-r--r-- | src/mem/ruby/network/simple/SConscript | 1 | ||||
-rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.cc | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc index 3003ce7d9..aad6574fb 100644 --- a/src/mem/ruby/network/Network.cc +++ b/src/mem/ruby/network/Network.cc @@ -28,8 +28,8 @@ #include "base/misc.hh" #include "mem/protocol/MachineType.hh" -#include "mem/ruby/network/simple/Topology.hh" #include "mem/ruby/network/Network.hh" +#include "mem/ruby/network/Topology.hh" Network::Network(const Params *p) : SimObject(p) diff --git a/src/mem/ruby/network/SConscript b/src/mem/ruby/network/SConscript index 28151e5cb..079ecf9f6 100644 --- a/src/mem/ruby/network/SConscript +++ b/src/mem/ruby/network/SConscript @@ -36,3 +36,4 @@ if not env['RUBY']: SimObject('Network.py') Source('Network.cc') +Source('Topology.cc') diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/Topology.cc index 95f94e9e8..61f3ad361 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/Topology.cc @@ -33,8 +33,8 @@ #include "mem/protocol/Protocol.hh" #include "mem/protocol/TopologyType.hh" #include "mem/ruby/common/NetDest.hh" -#include "mem/ruby/network/simple/Topology.hh" #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" diff --git a/src/mem/ruby/network/simple/Topology.hh b/src/mem/ruby/network/Topology.hh index c92848d8f..c92848d8f 100644 --- a/src/mem/ruby/network/simple/Topology.hh +++ b/src/mem/ruby/network/Topology.hh diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index ad0c06452..265023b7e 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -39,7 +39,7 @@ #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" -#include "mem/ruby/network/simple/Topology.hh" +#include "mem/ruby/network/Topology.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index b6a9d599d..b3cb8737d 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -40,7 +40,7 @@ #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" #include "mem/ruby/network/simple/SimpleNetwork.hh" -#include "mem/ruby/network/simple/Topology.hh" +#include "mem/ruby/network/Topology.hh" using namespace std; using m5::stl_helpers::deletePointers; diff --git a/src/mem/ruby/network/simple/SConscript b/src/mem/ruby/network/simple/SConscript index 1c952abf4..c0fb84770 100644 --- a/src/mem/ruby/network/simple/SConscript +++ b/src/mem/ruby/network/simple/SConscript @@ -39,4 +39,3 @@ Source('PerfectSwitch.cc') Source('SimpleNetwork.cc') Source('Switch.cc') Source('Throttle.cc') -Source('Topology.cc') diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 3b215b849..879ae2f7f 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -38,7 +38,7 @@ #include "mem/ruby/network/simple/SimpleNetwork.hh" #include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Throttle.hh" -#include "mem/ruby/network/simple/Topology.hh" +#include "mem/ruby/network/Topology.hh" #include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/system/System.hh" |