diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-10-11 15:02:23 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-10-11 15:02:23 -0500 |
| commit | 9321a41c62c25643d7b6381abbcf5694a012e056 (patch) | |
| tree | b1de81385d622c0f820e12e25062f94dd146ae4e /src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | |
| parent | b6d804a1e6281f9916de216cdb8b9c64859dd348 (diff) | |
| download | gem5-9321a41c62c25643d7b6381abbcf5694a012e056.tar.xz | |
ruby: drop Orion network power model
Orion is being dropped from ruby. It would be replaced with DSENT
which has better models. Note that the power / energy numbers reported
after this patch has been applied are not for use.
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh')
| -rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | 7 |
1 files changed, 3 insertions, 4 deletions
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 17ba54fa5..7dae0bb52 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh @@ -35,13 +35,12 @@ #include <vector> #include "mem/ruby/common/NetDest.hh" -#include "mem/ruby/network/BasicRouter.hh" +#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh" #include "mem/ruby/network/garnet/NetworkHeader.hh" -#include "mem/ruby/network/orion/NetworkPower.hh" +#include "mem/ruby/network/BasicRouter.hh" #include "params/GarnetRouter_d.hh" -class GarnetNetwork_d; class NetworkLink_d; class CreditLink_d; class InputUnit_d; @@ -89,7 +88,7 @@ class Router_d : public BasicRouter void printFaultVector(std::ostream& out); void printAggregateFaultProbability(std::ostream& out); - void calculate_power(); + void calculate_power() {} void calculate_performance_numbers(); double get_dynamic_power() const { return m_power_dyn; } double get_static_power() const { return m_power_sta; } |