From b3980cdb9a511227d5b2eb2d4ba75fde34cb209b Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 28 Jun 2013 21:36:37 -0500 Subject: ruby: network: remove reconfiguration code This code seems not to be of any use now. There is no path in the simulator that allows for reconfiguring the network. A better approach would be to take a checkpoint and start the simulation from the checkpoint with the new configuration. --- src/mem/ruby/network/simple/SimpleNetwork.cc | 27 ++++----------------------- src/mem/ruby/network/simple/SimpleNetwork.hh | 11 ++++------- 2 files changed, 8 insertions(+), 30 deletions(-) (limited to 'src/mem/ruby/network/simple') diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index a51add4a5..071e1adae 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -96,8 +96,7 @@ SimpleNetwork::init() // The topology pointer should have already been initialized in // the parent class network constructor. assert(m_topology_ptr != NULL); - // false because this isn't a reconfiguration - m_topology_ptr->createLinks(this, false); + m_topology_ptr->createLinks(this); } void @@ -130,18 +129,12 @@ SimpleNetwork::~SimpleNetwork() void SimpleNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration) + const NetDest& routing_table_entry) { assert(dest < m_nodes); assert(src < m_switch_ptr_vector.size()); assert(m_switch_ptr_vector[src] != NULL); - if (isReconfiguration) { - m_switch_ptr_vector[src]->reconfigureOutPort(routing_table_entry); - return; - } - SimpleExtLink *simple_link = safe_cast(link); m_switch_ptr_vector[src]->addOutPort(m_fromNetQueues[dest], @@ -156,15 +149,9 @@ SimpleNetwork::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, void SimpleNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration) + const NetDest& routing_table_entry) { assert(src < m_nodes); - if (isReconfiguration) { - // do nothing - return; - } - m_switch_ptr_vector[dest]->addInPort(m_toNetQueues[src]); } @@ -172,14 +159,8 @@ SimpleNetwork::makeInLink(NodeID src, SwitchID dest, BasicLink* link, void SimpleNetwork::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration) + const NetDest& routing_table_entry) { - if (isReconfiguration) { - m_switch_ptr_vector[src]->reconfigureOutPort(routing_table_entry); - return; - } - // Create a set of new MessageBuffers std::vector queues; for (int i = 0; i < m_virtual_networks; i++) { diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh index 879446822..60831ad0f 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.hh +++ b/src/mem/ruby/network/simple/SimpleNetwork.hh @@ -73,16 +73,13 @@ class SimpleNetwork : public Network // Methods used by Topology to setup the network void makeOutLink(SwitchID src, NodeID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration); - void makeInLink(NodeID src, SwitchID dest, BasicLink* link, + const NetDest& routing_table_entry); + void makeInLink(NodeID src, SwitchID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration); + const NetDest& routing_table_entry); void makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, LinkDirection direction, - const NetDest& routing_table_entry, - bool isReconfiguration); + const NetDest& routing_table_entry); void print(std::ostream& out) const; -- cgit v1.2.3