From b913af440b17b1eb146afafb2ce5a1577910dde1 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 12 Jul 2012 08:39:19 -0500
Subject: Ruby: remove config information from ruby.stats This patch removes
 printConfig() functions from all structures in Ruby. Most of the information
 is already part of config.ini, and where ever it is not, it would become in
 due course.

---
 .../garnet/flexible-pipeline/GarnetNetwork.cc      | 34 ----------------------
 .../garnet/flexible-pipeline/GarnetNetwork.hh      |  1 -
 .../garnet/flexible-pipeline/NetworkInterface.cc   |  8 -----
 .../garnet/flexible-pipeline/NetworkInterface.hh   |  1 -
 .../network/garnet/flexible-pipeline/Router.cc     | 19 ------------
 .../network/garnet/flexible-pipeline/Router.hh     |  1 -
 6 files changed, 64 deletions(-)

(limited to 'src/mem/ruby/network/garnet/flexible-pipeline')

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
index 020792a21..a167f5df0 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
@@ -243,40 +243,6 @@ GarnetNetwork::printPowerStats(ostream& out) const
     out << endl;
 }
 
-void
-GarnetNetwork::printConfig(ostream& out) const
-{
-    out << endl;
-    out << "Network Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "network: Garnet Flexible Pipeline" << endl;
-    out << "topology: " << m_topology_ptr->getName() << endl;
-    out << endl;
-
-    for (int i = 0; i < m_virtual_networks; i++) {
-        out << "virtual_net_" << i << ": ";
-        if (m_in_use[i]) {
-            out << "active, ";
-            if (m_ordered[i]) {
-                out << "ordered" << endl;
-            } else {
-                out << "unordered" << endl;
-            }
-        } else {
-            out << "inactive" << endl;
-        }
-    }
-    out << endl;
-
-    for (int i = 0; i < m_ni_ptr_vector.size(); i++) {
-        m_ni_ptr_vector[i]->printConfig(out);
-    }
-    for (int i = 0; i < m_router_ptr_vector.size(); i++) {
-        m_router_ptr_vector[i]->printConfig(out);
-    }
-    m_topology_ptr->printConfig(out);
-}
-
 void
 GarnetNetwork::print(ostream& out) const
 {
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
index fe29ef960..27c381ba3 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
@@ -65,7 +65,6 @@ class GarnetNetwork : public BaseGarnetNetwork
 
     void printLinkStats(std::ostream& out) const;
     void printPowerStats(std::ostream& out) const;
-    void printConfig(std::ostream& out) const;
     void print(std::ostream& out) const;
 
     // Methods used by Topology to setup the network
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
index 07a58de58..73425802b 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
@@ -337,14 +337,6 @@ NetworkInterface::checkReschedule()
     }
 }
 
-void
-NetworkInterface::printConfig(std::ostream& out) const
-{
-    out << "[Network Interface " << m_id << "] - ";
-    out << "[inLink " << inNetLink->get_id() << "] - ";
-    out << "[outLink " << outNetLink->get_id() << "]" << std::endl;
-}
-
 void
 NetworkInterface::print(std::ostream& out) const
 {
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
index c358f420f..e7035f51a 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh
@@ -70,7 +70,6 @@ class NetworkInterface : public FlexibleConsumer
     void request_vc(int in_vc, int in_port, NetDest destination,
                     Time request_time);
 
-    void printConfig(std::ostream& out) const;
     void print(std::ostream& out) const;
 
   private:
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
index 205a43138..791c0cffc 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc
@@ -417,25 +417,6 @@ Router::check_arbiter_reschedule()
     }
 }
 
-void
-Router::printConfig(ostream& out) const
-{
-    out << "[Router " << m_id << "] :: " << endl;
-    out << "[inLink - ";
-    for (int i = 0;i < m_in_link.size(); i++)
-        out << m_in_link[i]->get_id() << " - ";
-    out << "]" << endl;
-    out << "[outLink - ";
-    for (int i = 0;i < m_out_link.size(); i++)
-        out << m_out_link[i]->get_id() << " - ";
-    out << "]" << endl;
-#if 0
-    out << "---------- routing table -------------" << endl;
-    for (int i = 0; i < m_routing_table.size(); i++)
-        out << m_routing_table[i] << endl;
-#endif
-}
-
 void
 Router::print(ostream& out) const
 {
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
index e9b340c93..504284404 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh
@@ -67,7 +67,6 @@ class Router : public BasicRouter, public FlexibleConsumer
     void vc_arbitrate();
     int get_vnet(int vc);
 
-    void printConfig(std::ostream& out) const;
     void print(std::ostream& out) const;
 
     void init_net_ptr(GarnetNetwork* net_ptr) 
-- 
cgit v1.2.3