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.

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
index 6ee1dcdfbec95204409e8898079d2153faae9ac5..b5c58baa2b59703190631eac12ea311aaea36334 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
@@ -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()
         {

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 505353089e13643f80066d079ab955c96ec178e7..498a6cae1f415eead9f1b9a90835934e0d8abae8 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -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:

diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc
index e9e1dc4abeecafba14c78290ec2cccd175069f62..2c0561438fcd17bf1439b20532e6b81d7bfe4883 100644 (file)
--- a/src/mem/ruby/network/orion/NetworkPower.cc
+++ b/src/mem/ruby/network/orion/NetworkPower.cc
@@ -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 --git a/src/mem/ruby/network/orion/SConscript b/src/mem/ruby/network/orion/SConscript
index 62d5dfef5404d8741dd6689c7cb7c1f1b37c711f..99b38bc2233cb0dca7ff371658f31ea28597e232 100644 (file)
--- a/src/mem/ruby/network/orion/SConscript
+++ b/src/mem/ruby/network/orion/SConscript
@@ -30,9 +30,6 @@
 
 Import('*')
 
-# temporarily disable
-Return()
-
 if not env['RUBY']:
     Return()