summaryrefslogtreecommitdiff
path: root/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-02-21 08:02:04 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2014-02-21 08:02:04 -0600
commitbd8f954526bc33ab2b57fbc91f2caa82b2115db8 (patch)
tree6d3b77faf35ce68adb000edc315d92300803cec0 /src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
parent307f53e1640231c4f3d080f7e0c0561ee74d251b (diff)
downloadgem5-bd8f954526bc33ab2b57fbc91f2caa82b2115db8.tar.xz
ruby: network: garnet: fixed: removes net_ptr from links
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc')
-rw-r--r--src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc10
1 files changed, 2 insertions, 8 deletions
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 8db57267e..831c0b2fe 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
@@ -90,13 +90,6 @@ GarnetNetwork_d::init()
}
m_topology_ptr->createLinks(this);
- // initialize the link's network pointers
- for (vector<NetworkLink_d*>::const_iterator i = m_links.begin();
- i != m_links.end(); ++i) {
- NetworkLink_d* net_link = safe_cast<NetworkLink_d*>(*i);
- net_link->init_net_ptr(this);
- }
-
// FaultModel: declare each router to the fault model
if(isFaultModelEnabled()){
for (vector<Router_d*>::const_iterator i= m_routers.begin();
@@ -285,8 +278,9 @@ GarnetNetwork_d::collateLinkStats()
void
GarnetNetwork_d::collatePowerStats()
{
+ double sim_cycles = (double)(curCycle() - g_ruby_start);
for (int i = 0; i < m_links.size(); i++) {
- m_links[i]->calculate_power();
+ m_links[i]->calculate_power(sim_cycles);
m_dynamic_link_power += m_links[i]->get_dynamic_power();
m_static_link_power += m_links[i]->get_static_power();
}