From 36899dc197c17a87077c59604e00482b6f63a2a8 Mon Sep 17 00:00:00 2001 From: Tushar Krishna Date: Tue, 31 May 2011 02:55:14 -0400 Subject: garnet: added network ptr to links to be used by orion --- src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 7 +++++++ src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/mem/ruby/network/garnet') 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 7ba2e561a..1fa4abbac 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -90,6 +90,13 @@ GarnetNetwork_d::init() } // false because this isn't a reconfiguration m_topology_ptr->createLinks(this, false); + + // initialize the link's network pointers + for (vector::const_iterator i = m_link_ptr_vector.begin(); + i != m_link_ptr_vector.end(); ++i) { + NetworkLink_d* net_link = safe_cast(*i); + net_link->init_net_ptr(this); + } } GarnetNetwork_d::~GarnetNetwork_d() diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh index 5da006c4d..61dfe5c52 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh @@ -65,12 +65,17 @@ class NetworkLink_d : public SimObject, public Consumer inline bool isReady() { return linkBuffer->isReady(); } inline flit_d* peekLink() { return linkBuffer->peekTopFlit(); } inline flit_d* consumeLink() { return linkBuffer->getTopFlit(); } + void init_net_ptr(GarnetNetwork_d* net_ptr) + { + m_net_ptr = net_ptr; + } protected: int m_id; int m_latency; - int channel_width; + + GarnetNetwork_d *m_net_ptr; flitBuffer_d *linkBuffer; Consumer *link_consumer; flitBuffer_d *link_srcQueue; -- cgit v1.2.3