summaryrefslogtreecommitdiff
path: root/src/mem/ruby/network/garnet
diff options
context:
space:
mode:
authorTushar Krishna <tushar@csail.mit.edu>2011-05-31 02:56:22 -0400
committerTushar Krishna <tushar@csail.mit.edu>2011-05-31 02:56:22 -0400
commit07e5b15953741029bd58e21844824615d0108099 (patch)
tree88aa0986d6e7fe44fa044755030c9fa559d46264 /src/mem/ruby/network/garnet
parent36899dc197c17a87077c59604e00482b6f63a2a8 (diff)
downloadgem5-07e5b15953741029bd58e21844824615d0108099.tar.xz
orion: bug fix in link power, and some reorg
Diffstat (limited to 'src/mem/ruby/network/garnet')
-rw-r--r--src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc3
-rw-r--r--src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh2
2 files changed, 5 insertions, 0 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 1fa4abbac..be9a92305 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
@@ -327,6 +327,7 @@ GarnetNetwork_d::printStats(ostream& out) const
double m_total_router_power = 0.0;
double m_dynamic_router_power = 0.0;
double m_static_router_power = 0.0;
+ double m_clk_power = 0.0;
for (int i = 0; i < m_link_ptr_vector.size(); i++) {
m_total_link_power += m_link_ptr_vector[i]->calculate_power();
@@ -338,11 +339,13 @@ GarnetNetwork_d::printStats(ostream& out) const
m_total_router_power += m_router_ptr_vector[i]->calculate_power();
m_dynamic_router_power += m_router_ptr_vector[i]->get_dynamic_power();
m_static_router_power += m_router_ptr_vector[i]->get_static_power();
+ m_clk_power += m_router_ptr_vector[i]->get_clk_power();
}
out << "Link Dynamic Power = " << m_dynamic_link_power << " W" << endl;
out << "Link Static Power = " << m_static_link_power << " W" << endl;
out << "Total Link Power = " << m_total_link_power << " W " << endl;
out << "Router Dynamic Power = " << m_dynamic_router_power << " W" << endl;
+ out << "Router Clock Power = " << m_clk_power << " W" << endl;
out << "Router Static Power = " << m_static_router_power << " W" << endl;
out << "Total Router Power = " << m_total_router_power << " W " <<endl;
out << "-------------" << endl;
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
index 286d13a20..e5a3a0ce2 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -92,6 +92,7 @@ class Router_d : public BasicRouter
double get_dynamic_power(){return m_power_dyn;}
double get_static_power(){return m_power_sta;}
+ double get_clk_power(){return m_clk_power;}
private:
int m_virtual_networks, m_num_vcs, m_vc_per_vnet;
@@ -113,6 +114,7 @@ class Router_d : public BasicRouter
double m_power_dyn;
double m_power_sta;
+ double m_clk_power;
};
#endif // __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_ROUTER_D_HH__