changeset 70f350b13ec0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=70f350b13ec0
description:
ruby: network: move message buffers to base network class.
diffstat:
src/mem/ruby/network/BasicRouter.hh | 3 ---
src/mem/ruby/network/Network.hh | 8 +++++++-
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc | 2 --
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh | 6 ------
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 3 ---
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 3 ---
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 3 ---
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh | 3 ---
src/mem/ruby/network/simple/SimpleNetwork.cc | 2 --
src/mem/ruby/network/simple/SimpleNetwork.hh | 10 ----------
10 files changed, 7 insertions(+), 36 deletions(-)
diffs (198 lines):
diff -r 26670ac8244e -r 70f350b13ec0 src/mem/ruby/network/BasicRouter.hh
--- a/src/mem/ruby/network/BasicRouter.hh Fri Feb 21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/BasicRouter.hh Fri Feb 21 08:02:05 2014 -0600
@@ -46,9 +46,6 @@
void init();
void print(std::ostream& out) const;
-
- friend class Topology;
-
protected:
//
// ID in relation to other routers in the system
diff -r 26670ac8244e -r 70f350b13ec0 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Fri Feb 21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/Network.hh Fri Feb 21 08:02:05 2014 -0600
@@ -54,7 +54,6 @@
class NetDest;
class MessageBuffer;
-class Throttle;
class Network : public ClockedObject
{
@@ -111,6 +110,13 @@
static uint32_t m_control_msg_size;
static uint32_t m_data_msg_size;
+ // vector of queues from the components
+ std::vector<std::vector<MessageBuffer*> > m_toNetQueues;
+ std::vector<std::vector<MessageBuffer*> > m_fromNetQueues;
+
+ std::vector<bool> m_in_use;
+ std::vector<bool> m_ordered;
+
private:
//! Callback class used for collating statistics from all the
//! controller of this type.
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Fri Feb 21 08:02:04
2014 -0600
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Fri Feb 21 08:02:05
2014 -0600
@@ -29,8 +29,6 @@
*/
#include "mem/ruby/buffers/MessageBuffer.hh"
-#include "mem/ruby/network/BasicLink.hh"
-#include "mem/ruby/network/Topology.hh"
#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
using namespace std;
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Fri Feb 21 08:02:04
2014 -0600
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Fri Feb 21 08:02:05
2014 -0600
@@ -88,12 +88,6 @@
int m_vcs_per_vnet;
bool m_enable_fault_model;
- std::vector<bool> m_in_use;
- std::vector<bool> m_ordered;
-
- std::vector<std::vector<MessageBuffer*> > m_toNetQueues;
- std::vector<std::vector<MessageBuffer*> > m_fromNetQueues;
-
// Statistical variables
Stats::Vector m_flits_received;
Stats::Vector m_flits_injected;
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Fri Feb
21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Fri Feb
21 08:02:05 2014 -0600
@@ -33,16 +33,13 @@
#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/MachineType.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/GarnetLink_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
#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/Topology.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Fri Feb
21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Fri Feb
21 08:02:05 2014 -0600
@@ -36,14 +36,11 @@
#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/Network.hh"
#include "params/GarnetNetwork_d.hh"
class FaultModel;
class NetworkInterface_d;
-class MessageBuffer;
class Router_d;
-class Topology;
class NetDest;
class NetworkLink_d;
class CreditLink_d;
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Fri Feb
21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Fri Feb
21 08:02:05 2014 -0600
@@ -33,7 +33,6 @@
#include "base/cast.hh"
#include "base/stl_helpers.hh"
#include "mem/protocol/MachineType.hh"
-#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/GarnetLink.hh"
@@ -41,7 +40,6 @@
#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
-#include "mem/ruby/network/Topology.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
@@ -145,7 +143,6 @@
m_routers[dest]->addInPort(net_link);
m_routers[src]->addOutPort(net_link, routing_table_entry,
link->m_weight);
-
}
void
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh Fri Feb
21 08:02:04 2014 -0600
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh Fri Feb
21 08:02:05 2014 -0600
@@ -36,13 +36,10 @@
#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
#include "mem/ruby/network/garnet/NetworkHeader.hh"
-#include "mem/ruby/network/Network.hh"
#include "params/GarnetNetwork.hh"
class NetworkInterface;
-class MessageBuffer;
class Router;
-class Topology;
class NetDest;
class NetworkLink;
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/simple/SimpleNetwork.cc
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc Fri Feb 21 08:02:04
2014 -0600
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Fri Feb 21 08:02:05
2014 -0600
@@ -33,12 +33,10 @@
#include "base/stl_helpers.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/common/NetDest.hh"
-#include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/simple/SimpleLink.hh"
#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/Topology.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/system/System.hh"
diff -r 26670ac8244e -r 70f350b13ec0
src/mem/ruby/network/simple/SimpleNetwork.hh
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh Fri Feb 21 08:02:04
2014 -0600
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh Fri Feb 21 08:02:05
2014 -0600
@@ -32,16 +32,13 @@
#include <iostream>
#include <vector>
-#include "mem/ruby/common/Global.hh"
#include "mem/ruby/network/Network.hh"
#include "params/SimpleNetwork.hh"
-#include "sim/sim_object.hh"
class NetDest;
class MessageBuffer;
class Throttle;
class Switch;
-class Topology;
class SimpleNetwork : public Network
{
@@ -94,13 +91,6 @@
// Private copy constructor and assignment operator
SimpleNetwork(const SimpleNetwork& obj);
SimpleNetwork& operator=(const SimpleNetwork& obj);
-
- // vector of queues from the components
- std::vector<std::vector<MessageBuffer*> > m_toNetQueues;
- std::vector<std::vector<MessageBuffer*> > m_fromNetQueues;
-
- std::vector<bool> m_in_use;
- std::vector<bool> m_ordered;
std::vector<Switch*> m_switches;
std::vector<MessageBuffer*> m_buffers_to_free;
std::vector<Switch*> m_endpoint_switches;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
