sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: Re-enabled orion power models

Browse source 
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.
This commit is contained in:
Brad Beckmann 2010-01-29 20:29:33 -08:00
parent 26cce73e97
commit e4218dd08f
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
View file

@ -53,8 +53,8 @@ public:
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()
{

7
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
View file

@ -74,11 +74,8 @@ public:
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:

6
src/mem/ruby/network/orion/NetworkPower.cc
View file

@ -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"

3
src/mem/ruby/network/orion/SConscript
View file

@ -30,9 +30,6 @@
Import('*')
# temporarily disable
Return()
if not env['RUBY']:
Return()