diff options
author | Tushar Krishna <tushar@ece.gatech.edu> | 2016-10-06 14:35:18 -0400 |
---|---|---|
committer | Tushar Krishna <tushar@ece.gatech.edu> | 2016-10-06 14:35:18 -0400 |
commit | 003c08fa90f8b3eb7fbbbc96e0caa5f46bf58196 (patch) | |
tree | 13b408554ffbebd11ae2322e8a070a0c4d5b9c56 /src/mem/ruby/network/garnet/flexible-pipeline | |
parent | b9e23a6d741cdcdf0ffb7364c6aae36a487335ef (diff) | |
download | gem5-003c08fa90f8b3eb7fbbbc96e0caa5f46bf58196.tar.xz |
config: make internal links in network topology unidirectional.
This patch makes the internal links within the network topology
unidirectional, thus allowing any deadlock-free routing algorithms to
be specified from the topology itself using weights.
This patch also renames Mesh.py and MeshDirCorners.py to
Mesh_XY.py and MeshDirCorners_XY.py (Mesh with XY routing).
It also adds a Mesh_westfirst.py and CrossbarGarnet.py topologies.
Diffstat (limited to 'src/mem/ruby/network/garnet/flexible-pipeline')
-rw-r--r-- | src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 13 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh | 7 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index bd96fc2ed..0b33ab009 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -94,14 +94,13 @@ GarnetNetwork::~GarnetNetwork() } void -GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, - LinkDirection direction, +GarnetNetwork::makeExtInLink(NodeID src, SwitchID dest, BasicLink* link, const NetDest& routing_table_entry) { assert(src < m_nodes); GarnetExtLink* garnet_link = safe_cast<GarnetExtLink*>(link); - NetworkLink *net_link = garnet_link->m_network_links[direction]; + NetworkLink *net_link = garnet_link->m_network_links[0]; net_link->init_net_ptr(this); m_links.push_back(net_link); @@ -110,8 +109,7 @@ GarnetNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, } void -GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, - LinkDirection direction, +GarnetNetwork::makeExtOutLink(SwitchID src, NodeID dest, BasicLink* link, const NetDest& routing_table_entry) { assert(dest < m_nodes); @@ -119,7 +117,7 @@ GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, assert(m_routers[src] != NULL); GarnetExtLink* garnet_link = safe_cast<GarnetExtLink*>(link); - NetworkLink *net_link = garnet_link->m_network_links[direction]; + NetworkLink *net_link = garnet_link->m_network_links[1]; net_link->init_net_ptr(this); m_links.push_back(net_link); @@ -130,11 +128,10 @@ GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, void GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, - LinkDirection direction, const NetDest& routing_table_entry) { GarnetIntLink* garnet_link = safe_cast<GarnetIntLink*>(link); - NetworkLink *net_link = garnet_link->m_network_links[direction]; + NetworkLink *net_link = garnet_link->m_network_links[0]; net_link->init_net_ptr(this); m_links.push_back(net_link); diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh index e9b94809f..18360d475 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh @@ -60,14 +60,11 @@ class GarnetNetwork : public BaseGarnetNetwork void print(std::ostream& out) const; // Methods used by Topology to setup the network - void makeOutLink(SwitchID src, NodeID dest, BasicLink* link, - LinkDirection direction, + void makeExtOutLink(SwitchID src, NodeID dest, BasicLink* link, const NetDest& routing_table_entry); - void makeInLink(NodeID src, SwitchID dest, BasicLink* link, - LinkDirection direction, + void makeExtInLink(NodeID src, SwitchID dest, BasicLink* link, const NetDest& routing_table_entry); void makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, - LinkDirection direction, const NetDest& routing_table_entry); //! Function for performing a functional read. The return value |