changeset e031f09a7dcc in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=e031f09a7dcc
description:
ruby: Re-enabled orion power models
Removed the dummy power function implementations so that Orion can
implement
them correctly. Since Orion lacks modular design, this patch simply
enables
scons to compile it. There are no python configuration changes in this
patch.
diffstat:
4 files changed, 7 insertions(+), 13 deletions(-)
src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh | 4 ++--
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | 7 ++-----
src/mem/ruby/network/orion/NetworkPower.cc | 6 +++---
src/mem/ruby/network/orion/SConscript | 3 ---
diffs (60 lines):
diff -r dd45a54732aa -r e031f09a7dcc
src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh Fri Jan
29 20:29:33 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh Fri Jan
29 20:29:33 2010 -0800
@@ -53,8 +53,8 @@
int get_id(){return m_id;}
void wakeup();
- double calculate_offline_power(power_bus*) { return 0.0; }
- double calculate_power() { return 0.0; }
+ double calculate_offline_power(power_bus*);
+ double calculate_power();
inline bool isReady()
{
diff -r dd45a54732aa -r e031f09a7dcc
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Fri Jan 29
20:29:33 2010 -0800
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Fri Jan 29
20:29:33 2010 -0800
@@ -74,11 +74,8 @@
void swarb_req();
void power_router_initialize(power_router *router, power_router_info
*info);
- double calculate_power() { return 0.0; }
- double calculate_offline_power(power_router*, power_router_info*)
- {
- return 0.0;
- }
+ double calculate_power();
+ double calculate_offline_power(power_router*, power_router_info*);
void calculate_performance_numbers();
private:
diff -r dd45a54732aa -r e031f09a7dcc src/mem/ruby/network/orion/NetworkPower.cc
--- a/src/mem/ruby/network/orion/NetworkPower.cc Fri Jan 29 20:29:33
2010 -0800
+++ b/src/mem/ruby/network/orion/NetworkPower.cc Fri Jan 29 20:29:33
2010 -0800
@@ -35,9 +35,9 @@
#include "mem/ruby/network/orion/power_arbiter.hh"
#include "mem/ruby/network/orion/power_bus.hh"
#include "mem/ruby/network/orion/NetworkPower.hh"
-#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
-#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
-#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/ruby/network/orion/SIM_port.hh"
#include "mem/ruby/network/orion/parm_technology.hh"
diff -r dd45a54732aa -r e031f09a7dcc src/mem/ruby/network/orion/SConscript
--- a/src/mem/ruby/network/orion/SConscript Fri Jan 29 20:29:33 2010 -0800
+++ b/src/mem/ruby/network/orion/SConscript Fri Jan 29 20:29:33 2010 -0800
@@ -30,9 +30,6 @@
Import('*')
-# temporarily disable
-Return()
-
if not env['RUBY']:
Return()
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
