From e4218dd08f13a2f4f5f688f5fb03083658bb7705 Mon Sep 17 00:00:00 2001
From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Fri, 29 Jan 2010 20:29:33 -0800
Subject: [PATCH] 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.
---
 .../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 ---
 4 files changed, 7 insertions(+), 13 deletions(-)

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 6ee1dcdfbe..b5c58baa2b 100644
--- 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 505353089e..498a6cae1f 100644
--- 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 e9e1dc4abe..2c0561438f 100644
--- 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 62d5dfef54..99b38bc223 100644
--- 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()