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.

27 files changed, 0 insertions, 255 deletions

diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh
index 08ad95017..8640ba9b1 100644
--- a/src/mem/ruby/network/Network.hh
+++ b/src/mem/ruby/network/Network.hh
@@ -92,7 +92,6 @@ class Network : public SimObject
 
     virtual void printStats(std::ostream& out) const = 0;
     virtual void clearStats() = 0;
-    virtual void printConfig(std::ostream& out) const = 0;
     virtual void print(std::ostream& out) const = 0;
 
   protected:
diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc
index 540b6bdc0..e9f5ae13a 100644
--- a/src/mem/ruby/network/Topology.cc
+++ b/src/mem/ruby/network/Topology.cc
@@ -283,54 +283,6 @@ Topology::clearStats()
     }
 }
 
-void
-Topology::printConfig(std::ostream& out) const
-{
-    if (m_print_config == false)
-        return;
-
-    assert(m_component_latencies.size() > 0);
-
-    out << "--- Begin Topology Print ---" << endl
-        << endl
-        << "Topology print ONLY indicates the _NETWORK_ latency between two "
-        << "machines" << endl
-        << "It does NOT include the latency within the machines" << endl
-        << endl;
-
-    for (int m = 0; m < MachineType_NUM; m++) {
-        int i_end = MachineType_base_count((MachineType)m);
-        for (int i = 0; i < i_end; i++) {
-            MachineID cur_mach = {(MachineType)m, i};
-            out << cur_mach << " Network Latencies" << endl;
-            for (int n = 0; n < MachineType_NUM; n++) {
-                int j_end = MachineType_base_count((MachineType)n);
-                for (int j = 0; j < j_end; j++) {
-                    MachineID dest_mach = {(MachineType)n, j};
-                    if (cur_mach == dest_mach)
-                        continue;
-
-                    int src = MachineType_base_number((MachineType)m) + i;
-                    int dst = MachineType_base_number(MachineType_NUM) +
-                        MachineType_base_number((MachineType)n) + j;
-                    int link_latency = m_component_latencies[src][dst];
-                    int intermediate_switches =
-                        m_component_inter_switches[src][dst];
-
-                    // NOTE switches are assumed to have single
-                    // cycle latency
-                    out << "  " << cur_mach << " -> " << dest_mach
-                        << " net_lat: "
-                        << link_latency + intermediate_switches << endl;
-                }
-            }
-            out << endl;
-        }
-    }
-
-    out << "--- End Topology Print ---" << endl;
-}
-
 // The following all-pairs shortest path algorithm is based on the
 // discussion from Cormen et al., Chapter 26.1.
 void
diff --git a/src/mem/ruby/network/Topology.hh b/src/mem/ruby/network/Topology.hh
index e8510f810..1c675b939 100644
--- a/src/mem/ruby/network/Topology.hh
+++ b/src/mem/ruby/network/Topology.hh
@@ -79,7 +79,6 @@ class Topology : public SimObject
     const std::string getName() { return m_name; }
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
     void print(std::ostream& out) const { out << "[Topology]"; }
 
   protected:
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
index d03a8e125..b861b6a4e 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
@@ -336,40 +336,6 @@ GarnetNetwork_d::printPowerStats(ostream& out) const
 }
 
 void
-GarnetNetwork_d::printConfig(ostream& out) const
-{
-    out << endl;
-    out << "Network Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "network: Garnet Fixed 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_d::print(ostream& out) const
 {
     out << "[GarnetNetwork_d]";
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
index 37102c577..c8a3ea0f6 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
@@ -65,7 +65,6 @@ class GarnetNetwork_d : 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;
 
     VNET_type
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
index b62a7d2c7..3e3584bd8 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
@@ -94,13 +94,3 @@ InputUnit_d::wakeup()
         m_num_buffer_reads[vnet]++;
     }
 }
-
-void
-InputUnit_d::printConfig(ostream& out)
-{
-    out << endl;
-    out << "InputUnit Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "id = " << m_id << endl;
-    out << "In link is " << m_in_link->get_id() << endl;
-}
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
index de3fa9d40..79158d56d 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
@@ -50,7 +50,6 @@ class InputUnit_d : public Consumer
     ~InputUnit_d();
 
     void wakeup();
-    void printConfig(std::ostream& out);
     flitBuffer_d* getCreditQueue() { return creditQueue; }
     void print(std::ostream& out) const {};
 
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
index dd1ced1ad..4a2c9e26a 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
@@ -356,14 +356,6 @@ NetworkInterface_d::checkReschedule()
 }
 
 void
-NetworkInterface_d::printConfig(std::ostream& out) const
-{
-    out << "[Network Interface " << m_id << "] - ";
-    out << "[inLink " << inNetLink->get_id() << "] - ";
-    out << "[outLink " << outNetLink->get_id() << "]" << std::endl;
-}
-
-void
 NetworkInterface_d::print(std::ostream& out) const
 {
     out << "[Network Interface]";
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
index 3802082a6..c65496900 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
@@ -60,7 +60,6 @@ class NetworkInterface_d : public Consumer
     void wakeup();
     void addNode(std::vector<MessageBuffer *> &inNode,
                  std::vector<MessageBuffer *> &outNode);
-    void printConfig(std::ostream& out) const;
     void print(std::ostream& out) const;
     int get_vnet(int vc);
 
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc
index c2fba3ffd..159e02731 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc
@@ -107,13 +107,3 @@ OutputUnit_d::update_vc(int vc, int in_port, int in_vc)
     m_router->update_incredit(in_port, in_vc,
                               m_outvc_state[vc]->get_credit_count());
 }
-
-void
-OutputUnit_d::printConfig(ostream& out)
-{
-    out << endl;
-    out << "OutputUnit Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "id = " << m_id << endl;
-    out << "Out link is " << m_out_link->get_id() << endl;
-}
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
index 3ed1cb4b2..eada61554 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
@@ -52,7 +52,6 @@ class OutputUnit_d : public Consumer
     void set_credit_link(CreditLink_d *credit_link);
     void wakeup();
     flitBuffer_d* getOutQueue();
-    void printConfig(std::ostream& out);
     void update_vc(int vc, int in_port, int in_vc);
     void print(std::ostream& out) const {};
     void decrement_credit(int out_vc);
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
index b638c9aca..ce36dd753 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
@@ -176,20 +176,6 @@ Router_d::calculate_performance_numbers()
 }
 
 void
-Router_d::printConfig(ostream& out)
-{
-    out << name() << endl;
-    out << "[inLink - ";
-    for (int i = 0;i < m_input_unit.size(); i++)
-        out << m_input_unit[i]->get_inlink_id() << " - ";
-    out << "]" << endl;
-    out << "[outLink - ";
-    for (int i = 0;i < m_output_unit.size(); i++)
-        out << m_output_unit[i]->get_outlink_id() << " - ";
-    out << "]" << endl;
-}
-
-void
 Router_d::printFaultVector(ostream& out)
 {
     int temperature_celcius = BASELINE_TEMPERATURE_CELCIUS;
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 babc0d443..93ee46f47 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -86,7 +86,6 @@ class Router_d : public BasicRouter
     void route_req(flit_d *t_flit, InputUnit_d* in_unit, int invc);
     void vcarb_req();
     void swarb_req();
-    void printConfig(std::ostream& out);
     void printFaultVector(std::ostream& out);
     void printAggregateFaultProbability(std::ostream& out);
 
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
@@ -244,40 +244,6 @@ GarnetNetwork::printPowerStats(ostream& out) const
 }
 
 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
 {
     out << "[GarnetNetwork]";
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
@@ -338,14 +338,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
 {
     out << "[Network Interface]";
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
@@ -418,25 +418,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
 {
     out << "[Router]";
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) 
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 885e93796..50b2055b5 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -334,11 +334,6 @@ PerfectSwitch::clearStats()
 }
 
 void
-PerfectSwitch::printConfig(std::ostream& out) const
-{
-}
-
-void
 PerfectSwitch::print(std::ostream& out) const
 {
     out << "[PerfectSwitch " << m_switch_id << "]";
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index d761c398d..65a52eb08 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -76,8 +76,6 @@ class PerfectSwitch : public Consumer
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void print(std::ostream& out) const;
 
   private:
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index c2bf5c955..84d2ee97f 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -314,44 +314,11 @@ SimpleNetwork::clearStats()
 }
 
 void
-SimpleNetwork::printConfig(ostream& out) const
-{
-    out << endl;
-    out << "Network Configuration" << endl;
-    out << "---------------------" << endl;
-    out << "network: SIMPLE_NETWORK" << 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_switch_ptr_vector.size(); i++) {
-        m_switch_ptr_vector[i]->printConfig(out);
-    }
-
-    m_topology_ptr->printConfig(out);
-}
-
-void
 SimpleNetwork::print(ostream& out) const
 {
     out << "[SimpleNetwork]";
 }
 
-
 SimpleNetwork *
 SimpleNetworkParams::create()
 {
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.hh b/src/mem/ruby/network/simple/SimpleNetwork.hh
index 54e1ee36e..6dfaa2724 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.hh
+++ b/src/mem/ruby/network/simple/SimpleNetwork.hh
@@ -58,8 +58,6 @@ class SimpleNetwork : public Network
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void reset();
 
     // returns the queue requested for the given component
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index d9dadbd00..922807a0b 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -209,16 +209,6 @@ Switch::clearStats()
 }
 
 void
-Switch::printConfig(std::ostream& out) const
-{
-    m_perfect_switch_ptr->printConfig(out);
-    for (int i = 0; i < m_throttles.size(); i++) {
-        if (m_throttles[i] != NULL)
-            m_throttles[i]->printConfig(out);
-    }
-}
-
-void
 Switch::print(std::ostream& out) const
 {
     // FIXME printing
diff --git a/src/mem/ruby/network/simple/Switch.hh b/src/mem/ruby/network/simple/Switch.hh
index c7630f200..31ea6add1 100644
--- a/src/mem/ruby/network/simple/Switch.hh
+++ b/src/mem/ruby/network/simple/Switch.hh
@@ -68,8 +68,6 @@ class Switch
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
-
     void print(std::ostream& out) const;
 
   private:
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 80697cb58..7936e71dc 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -238,11 +238,6 @@ Throttle::clearStats()
     }
 }
 
-void
-Throttle::printConfig(ostream& out) const
-{
-}
-
 double
 Throttle::getUtilization() const
 {
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index 28fe046b4..37a53b80a 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -67,7 +67,6 @@ class Throttle : public Consumer
 
     void printStats(std::ostream& out) const;
     void clearStats();
-    void printConfig(std::ostream& out) const;
     // The average utilization (a percent) since last clearStats()
     double getUtilization() const;
     int