diff -r 3f37cc5d25bc -r c8bc96030487 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Mon May 23 14:36:22 2011 -0400 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Mon May 23 21:11:03 2011 -0400 @@ -90,6 +90,13 @@ } // 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 -r 3f37cc5d25bc -r c8bc96030487 src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh Mon May 23 14:36:22 2011 -0400 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh Mon May 23 21:11:03 2011 -0400 @@ -65,12 +65,17 @@ 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; - int channel_width; + GarnetNetwork_d *m_net_ptr; flitBuffer_d *linkBuffer; Consumer *link_consumer; flitBuffer_d *link_srcQueue; diff -r 3f37cc5d25bc -r c8bc96030487 src/mem/ruby/network/orion/NetworkPower.cc --- a/src/mem/ruby/network/orion/NetworkPower.cc Mon May 23 14:36:22 2011 -0400 +++ b/src/mem/ruby/network/orion/NetworkPower.cc Mon May 23 21:11:03 2011 -0400 @@ -245,13 +245,9 @@ channel_width /* channel width */, orion_cfg_ptr); -// -// NOTE! I believe this calculation will be moved to McPAT, thus this -// reference to the net_ptr can be removed -// // // Dynamic Power - double sim_cycles = 0.0; -// (double)(g_eventQueue_ptr->getTime() - m_net_ptr->getRubyStartTime()); + double sim_cycles = + (double)(g_eventQueue_ptr->getTime() - m_net_ptr->getRubyStartTime()); double Plink_dyn = orion_link_ptr->calc_dynamic_energy(channel_width/2)* (m_link_utilized/ sim_cycles)*freq_Hz;