From b913af440b17b1eb146afafb2ce5a1577910dde1 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Thu, 12 Jul 2012 08:39:19 -0500 Subject: [PATCH] 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. --- src/mem/ruby/buffers/MessageBuffer.hh | 1 - src/mem/ruby/filters/GenericBloomFilter.hh | 5 -- src/mem/ruby/network/Network.hh | 1 - src/mem/ruby/network/Topology.cc | 48 ------------------- src/mem/ruby/network/Topology.hh | 1 - .../garnet/fixed-pipeline/GarnetNetwork_d.cc | 34 ------------- .../garnet/fixed-pipeline/GarnetNetwork_d.hh | 1 - .../garnet/fixed-pipeline/InputUnit_d.cc | 10 ---- .../garnet/fixed-pipeline/InputUnit_d.hh | 1 - .../fixed-pipeline/NetworkInterface_d.cc | 8 ---- .../fixed-pipeline/NetworkInterface_d.hh | 1 - .../garnet/fixed-pipeline/OutputUnit_d.cc | 10 ---- .../garnet/fixed-pipeline/OutputUnit_d.hh | 1 - .../network/garnet/fixed-pipeline/Router_d.cc | 14 ------ .../network/garnet/fixed-pipeline/Router_d.hh | 1 - .../garnet/flexible-pipeline/GarnetNetwork.cc | 34 ------------- .../garnet/flexible-pipeline/GarnetNetwork.hh | 1 - .../flexible-pipeline/NetworkInterface.cc | 8 ---- .../flexible-pipeline/NetworkInterface.hh | 1 - .../garnet/flexible-pipeline/Router.cc | 19 -------- .../garnet/flexible-pipeline/Router.hh | 1 - src/mem/ruby/network/simple/PerfectSwitch.cc | 5 -- src/mem/ruby/network/simple/PerfectSwitch.hh | 2 - src/mem/ruby/network/simple/SimpleNetwork.cc | 33 ------------- src/mem/ruby/network/simple/SimpleNetwork.hh | 2 - src/mem/ruby/network/simple/Switch.cc | 10 ---- src/mem/ruby/network/simple/Switch.hh | 2 - src/mem/ruby/network/simple/Throttle.cc | 5 -- src/mem/ruby/network/simple/Throttle.hh | 1 - src/mem/ruby/profiler/Profiler.cc | 9 ---- src/mem/ruby/profiler/Profiler.hh | 1 - .../slicc_interface/AbstractController.hh | 1 - src/mem/ruby/system/AbstractMemOrCache.hh | 1 - src/mem/ruby/system/CacheMemory.cc | 25 ---------- src/mem/ruby/system/CacheMemory.hh | 2 - src/mem/ruby/system/DMASequencer.cc | 5 -- src/mem/ruby/system/DMASequencer.hh | 2 - src/mem/ruby/system/DirectoryMemory.cc | 28 ----------- src/mem/ruby/system/DirectoryMemory.hh | 2 - src/mem/ruby/system/MemoryControl.cc | 2 - src/mem/ruby/system/MemoryControl.hh | 4 -- src/mem/ruby/system/PerfectCacheMemory.hh | 8 ---- src/mem/ruby/system/PersistentTable.hh | 2 - src/mem/ruby/system/RubyMemoryControl.cc | 31 ------------ src/mem/ruby/system/RubyMemoryControl.hh | 4 -- src/mem/ruby/system/Sequencer.cc | 10 ---- src/mem/ruby/system/Sequencer.hh | 2 - src/mem/ruby/system/SparseMemory.hh | 2 - src/mem/ruby/system/System.cc | 25 ---------- src/mem/ruby/system/System.hh | 1 - src/mem/ruby/system/TBETable.hh | 6 --- src/mem/ruby/system/TimerTable.hh | 2 - src/mem/ruby/system/WireBuffer.cc | 5 -- src/mem/ruby/system/WireBuffer.hh | 1 - 54 files changed, 442 deletions(-) diff --git a/src/mem/ruby/buffers/MessageBuffer.hh b/src/mem/ruby/buffers/MessageBuffer.hh index 0000aef16..4193c9f73 100644 --- a/src/mem/ruby/buffers/MessageBuffer.hh +++ b/src/mem/ruby/buffers/MessageBuffer.hh @@ -55,7 +55,6 @@ class MessageBuffer std::string name() const { return m_name; } - static void printConfig(std::ostream& out) {} void setRecycleLatency(int recycle_latency) { diff --git a/src/mem/ruby/filters/GenericBloomFilter.hh b/src/mem/ruby/filters/GenericBloomFilter.hh index a9d6b9ea2..a632bbd2d 100644 --- a/src/mem/ruby/filters/GenericBloomFilter.hh +++ b/src/mem/ruby/filters/GenericBloomFilter.hh @@ -65,11 +65,6 @@ class GenericBloomFilter void writeBit(const int index, const int value); void print(std::ostream& out) const; - void - printConfig(std::ostream& out) - { - out << "GenericBloomFilter" << std::endl; - } private: AbstractBloomFilter* m_filter; 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 @@ -335,40 +335,6 @@ GarnetNetwork_d::printPowerStats(ostream& out) const out << endl; } -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 { 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 @@ -355,14 +355,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 { 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 &inNode, std::vector &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 @@ -175,20 +175,6 @@ Router_d::calculate_performance_numbers() crossbar_count = m_switch->get_crossbar_count(); } -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) { 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 @@ -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) 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 @@ -333,11 +333,6 @@ PerfectSwitch::clearStats() { } -void -PerfectSwitch::printConfig(std::ostream& out) const -{ -} - void PerfectSwitch::print(std::ostream& out) const { 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 @@ -313,45 +313,12 @@ SimpleNetwork::clearStats() m_topology_ptr->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 @@ -208,16 +208,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 { 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 diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc index 098eb9b1f..c3c337a3c 100644 --- a/src/mem/ruby/profiler/Profiler.cc +++ b/src/mem/ruby/profiler/Profiler.cc @@ -164,15 +164,6 @@ Profiler::setPeriodicStatsInterval(integer_t period) g_eventQueue_ptr->scheduleEvent(this, 1); } -void -Profiler::printConfig(ostream& out) const -{ - out << endl; - out << "Profiler Configuration" << endl; - out << "----------------------" << endl; - out << "periodic_stats_period: " << m_stats_period << endl; -} - void Profiler::print(ostream& out) const { diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh index 258fc6f98..7945b6c73 100644 --- a/src/mem/ruby/profiler/Profiler.hh +++ b/src/mem/ruby/profiler/Profiler.hh @@ -86,7 +86,6 @@ class Profiler : public SimObject, public Consumer void printShortStats(std::ostream& out) { printStats(out, true); } void printTraceStats(std::ostream& out) const; void clearStats(); - void printConfig(std::ostream& out) const; void printResourceUsage(std::ostream& out) const; AddressProfiler* getAddressProfiler() { return m_address_profiler_ptr; } diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh index a0e3b3fbb..70b9968c7 100644 --- a/src/mem/ruby/slicc_interface/AbstractController.hh +++ b/src/mem/ruby/slicc_interface/AbstractController.hh @@ -63,7 +63,6 @@ class AbstractController : public SimObject, public Consumer virtual void print(std::ostream & out) const = 0; virtual void printStats(std::ostream & out) const = 0; - virtual void printConfig(std::ostream & out) const = 0; virtual void wakeup() = 0; // virtual void dumpStats(std::ostream & out) = 0; virtual void clearStats() = 0; diff --git a/src/mem/ruby/system/AbstractMemOrCache.hh b/src/mem/ruby/system/AbstractMemOrCache.hh index 88f9f4d87..4d1fee69a 100644 --- a/src/mem/ruby/system/AbstractMemOrCache.hh +++ b/src/mem/ruby/system/AbstractMemOrCache.hh @@ -51,7 +51,6 @@ class AbstractMemOrCache virtual bool isReady () = 0; virtual MemoryNode peekNode () = 0; virtual bool areNSlotsAvailable (int n) = 0; - virtual void printConfig (std::ostream& out) = 0; virtual void print (std::ostream& out) const = 0; }; diff --git a/src/mem/ruby/system/CacheMemory.cc b/src/mem/ruby/system/CacheMemory.cc index a8e3523d3..6ba879e90 100644 --- a/src/mem/ruby/system/CacheMemory.cc +++ b/src/mem/ruby/system/CacheMemory.cc @@ -105,31 +105,6 @@ CacheMemory::~CacheMemory() } } -void -CacheMemory::printConfig(ostream& out) -{ - int block_size = RubySystem::getBlockSizeBytes(); - - out << "Cache config: " << m_cache_name << endl; - out << " cache_associativity: " << m_cache_assoc << endl; - out << " num_cache_sets_bits: " << m_cache_num_set_bits << endl; - const int cache_num_sets = 1 << m_cache_num_set_bits; - out << " num_cache_sets: " << cache_num_sets << endl; - out << " cache_set_size_bytes: " << cache_num_sets * block_size << endl; - out << " cache_set_size_Kbytes: " - << double(cache_num_sets * block_size) / (1<<10) << endl; - out << " cache_set_size_Mbytes: " - << double(cache_num_sets * block_size) / (1<<20) << endl; - out << " cache_size_bytes: " - << cache_num_sets * block_size * m_cache_assoc << endl; - out << " cache_size_Kbytes: " - << double(cache_num_sets * block_size * m_cache_assoc) / (1<<10) - << endl; - out << " cache_size_Mbytes: " - << double(cache_num_sets * block_size * m_cache_assoc) / (1<<20) - << endl; -} - // convert a Address to its location in the cache Index CacheMemory::addressToCacheSet(const Address& address) const diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh index ee3c1a7fc..8adc892a7 100644 --- a/src/mem/ruby/system/CacheMemory.hh +++ b/src/mem/ruby/system/CacheMemory.hh @@ -60,8 +60,6 @@ class CacheMemory : public SimObject void init(); // Public Methods - void printConfig(std::ostream& out); - // perform a cache access and see if we hit or not. Return true on a hit. bool tryCacheAccess(const Address& address, RubyRequestType type, DataBlock*& data_ptr); diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc index b1502573b..84450fda4 100644 --- a/src/mem/ruby/system/DMASequencer.cc +++ b/src/mem/ruby/system/DMASequencer.cc @@ -164,11 +164,6 @@ DMASequencer::ackCallback() issueNext(); } -void -DMASequencer::printConfig(std::ostream & out) -{ -} - void DMASequencer::recordRequestType(DMASequencerRequestType requestType) { DPRINTF(RubyStats, "Recorded statistic: %s\n", diff --git a/src/mem/ruby/system/DMASequencer.hh b/src/mem/ruby/system/DMASequencer.hh index d1fb2ff49..ce85c20c7 100644 --- a/src/mem/ruby/system/DMASequencer.hh +++ b/src/mem/ruby/system/DMASequencer.hh @@ -64,8 +64,6 @@ class DMASequencer : public RubyPort void dataCallback(const DataBlock & dblk); void ackCallback(); - void printConfig(std::ostream & out); - void recordRequestType(DMASequencerRequestType requestType); private: diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc index c67babda4..b44f77435 100644 --- a/src/mem/ruby/system/DirectoryMemory.cc +++ b/src/mem/ruby/system/DirectoryMemory.cc @@ -92,34 +92,6 @@ DirectoryMemory::~DirectoryMemory() } } -void -DirectoryMemory::printConfig(ostream& out) const -{ - out << "DirectoryMemory module config: " << m_name << endl - << " version: " << m_version << endl - << " memory_bits: " << m_size_bits << endl - << " memory_size_bytes: " << m_size_bytes << endl - << " memory_size_Kbytes: " << double(m_size_bytes) / (1<<10) << endl - << " memory_size_Mbytes: " << double(m_size_bytes) / (1<<20) << endl - << " memory_size_Gbytes: " << double(m_size_bytes) / (1<<30) << endl; -} - -// Static method -void -DirectoryMemory::printGlobalConfig(ostream & out) -{ - out << "DirectoryMemory Global Config: " << endl; - out << " number of directory memories: " << m_num_directories << endl; - if (m_num_directories > 1) { - out << " number of selection bits: " << m_num_directories_bits << endl - << " selection bits: " << m_numa_high_bit - << "-" << m_numa_high_bit-m_num_directories_bits - << endl; - } - out << " total memory size bytes: " << m_total_size_bytes << endl; - out << " total memory bits: " << floorLog2(m_total_size_bytes) << endl; -} - uint64 DirectoryMemory::mapAddressToDirectoryVersion(PhysAddress address) { diff --git a/src/mem/ruby/system/DirectoryMemory.hh b/src/mem/ruby/system/DirectoryMemory.hh index 61938f7c8..c47a73089 100644 --- a/src/mem/ruby/system/DirectoryMemory.hh +++ b/src/mem/ruby/system/DirectoryMemory.hh @@ -55,8 +55,6 @@ class DirectoryMemory : public SimObject bool isSparseImplementation() { return m_use_map; } uint64 getSize() { return m_size_bytes; } - void printConfig(std::ostream& out) const; - static void printGlobalConfig(std::ostream & out); bool isPresent(PhysAddress address); AbstractEntry* lookup(PhysAddress address); AbstractEntry* allocate(const PhysAddress& address, diff --git a/src/mem/ruby/system/MemoryControl.cc b/src/mem/ruby/system/MemoryControl.cc index 14a34be4a..c5f6ecb83 100644 --- a/src/mem/ruby/system/MemoryControl.cc +++ b/src/mem/ruby/system/MemoryControl.cc @@ -60,5 +60,3 @@ RubyMemoryControlParams::create() { return new RubyMemoryControl(this); } - - diff --git a/src/mem/ruby/system/MemoryControl.hh b/src/mem/ruby/system/MemoryControl.hh index 6a3ca48d9..80a55e9c1 100644 --- a/src/mem/ruby/system/MemoryControl.hh +++ b/src/mem/ruby/system/MemoryControl.hh @@ -76,10 +76,6 @@ class MemoryControl : virtual bool isReady() = 0; virtual bool areNSlotsAvailable(int n) = 0; // infinite queue length - //// Called from L3 cache: - //void writeBack(physical_address_t addr); - - virtual void printConfig(std::ostream& out) = 0; virtual void print(std::ostream& out) const = 0; virtual void clearStats() const = 0; virtual void printStats(std::ostream& out) const = 0; diff --git a/src/mem/ruby/system/PerfectCacheMemory.hh b/src/mem/ruby/system/PerfectCacheMemory.hh index 33419c5c7..b56543c41 100644 --- a/src/mem/ruby/system/PerfectCacheMemory.hh +++ b/src/mem/ruby/system/PerfectCacheMemory.hh @@ -54,8 +54,6 @@ class PerfectCacheMemory public: PerfectCacheMemory(); - static void printConfig(std::ostream& out); - // tests to see if an address is present in the cache bool isTagPresent(const Address& address) const; @@ -107,12 +105,6 @@ PerfectCacheMemory::PerfectCacheMemory() { } -template -inline void -PerfectCacheMemory::printConfig(std::ostream& out) -{ -} - // tests to see if an address is present in the cache template inline bool diff --git a/src/mem/ruby/system/PersistentTable.hh b/src/mem/ruby/system/PersistentTable.hh index a57b3ec76..f634c35d1 100644 --- a/src/mem/ruby/system/PersistentTable.hh +++ b/src/mem/ruby/system/PersistentTable.hh @@ -69,8 +69,6 @@ class PersistentTable int countStarvingForAddress(const Address& addr) const; int countReadStarvingForAddress(const Address& addr) const; - static void printConfig(std::ostream& out) {} - void print(std::ostream& out) const; private: diff --git a/src/mem/ruby/system/RubyMemoryControl.cc b/src/mem/ruby/system/RubyMemoryControl.cc index 4879f4fa6..54585e275 100644 --- a/src/mem/ruby/system/RubyMemoryControl.cc +++ b/src/mem/ruby/system/RubyMemoryControl.cc @@ -361,37 +361,6 @@ RubyMemoryControl::print(ostream& out) const { } -void -RubyMemoryControl::printConfig(ostream& out) -{ - out << "Memory Control " << name() << ":" << endl; - out << " Ruby cycles per memory cycle: " << m_mem_bus_cycle_multiplier - << endl; - out << " Basic read latency: " << m_mem_ctl_latency << endl; - if (m_mem_fixed_delay) { - out << " Fixed Latency mode: Added cycles = " << m_mem_fixed_delay - << endl; - } else { - out << " Bank busy time: " << m_bank_busy_time << " memory cycles" - << endl; - out << " Memory channel busy time: " << m_basic_bus_busy_time << endl; - out << " Dead cycles between reads to different ranks: " - << m_rank_rank_delay << endl; - out << " Dead cycle between a read and a write: " - << m_read_write_delay << endl; - out << " tFaw (four-activate) window: " << m_tFaw << endl; - } - out << " Banks per rank: " << m_banks_per_rank << endl; - out << " Ranks per DIMM: " << m_ranks_per_dimm << endl; - out << " DIMMs per channel: " << m_dimms_per_channel << endl; - out << " LSB of bank field in address: " << m_bank_bit_0 << endl; - out << " LSB of rank field in address: " << m_rank_bit_0 << endl; - out << " LSB of DIMM field in address: " << m_dimm_bit_0 << endl; - out << " Max size of each bank queue: " << m_bank_queue_size << endl; - out << " Refresh period (within one bank): " << m_refresh_period << endl; - out << " Arbitration randomness: " << m_mem_random_arbitrate << endl; -} - void RubyMemoryControl::clearStats() const { diff --git a/src/mem/ruby/system/RubyMemoryControl.hh b/src/mem/ruby/system/RubyMemoryControl.hh index af915c807..512533f97 100644 --- a/src/mem/ruby/system/RubyMemoryControl.hh +++ b/src/mem/ruby/system/RubyMemoryControl.hh @@ -81,10 +81,6 @@ class RubyMemoryControl : public MemoryControl bool isReady(); bool areNSlotsAvailable(int n) { return true; }; // infinite queue length - //// Called from L3 cache: - //void writeBack(physical_address_t addr); - - void printConfig(std::ostream& out); void print(std::ostream& out) const; void clearStats() const; void printStats(std::ostream& out) const; diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 8733ec514..a4cdca53f 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -201,16 +201,6 @@ Sequencer::printProgress(ostream& out) const #endif } -void -Sequencer::printConfig(ostream& out) const -{ - out << "Seqeuncer config: " << m_name << endl - << " controller: " << m_controller->getName() << endl - << " version: " << m_version << endl - << " max_outstanding_requests: " << m_max_outstanding_requests << endl - << " deadlock_threshold: " << m_deadlock_threshold << endl; -} - // Insert the request on the correct request table. Return true if // the entry was already present. RequestStatus diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 2778cf380..a912347aa 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -67,8 +67,6 @@ class Sequencer : public RubyPort, public Consumer // Public Methods void wakeup(); // Used only for deadlock detection - void printConfig(std::ostream& out) const; - void printProgress(std::ostream& out) const; void writeCallback(const Address& address, DataBlock& data); diff --git a/src/mem/ruby/system/SparseMemory.hh b/src/mem/ruby/system/SparseMemory.hh index e4237dbcd..143ed5c1e 100644 --- a/src/mem/ruby/system/SparseMemory.hh +++ b/src/mem/ruby/system/SparseMemory.hh @@ -54,8 +54,6 @@ class SparseMemory SparseMemory(int number_of_levels); ~SparseMemory(); - void printConfig(std::ostream& out) { } - bool exist(const Address& address) const; void add(const Address& address, AbstractEntry*); void remove(const Address& address); diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index abce74830..b06e8b7ed 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -138,29 +138,6 @@ RubySystem::~RubySystem() delete m_mem_vec_ptr; } -void -RubySystem::printSystemConfig(ostream & out) -{ - out << "RubySystem config:" << endl - << " random_seed: " << m_random_seed << endl - << " randomization: " << m_randomization << endl - << " cycle_period: " << m_clock << endl - << " block_size_bytes: " << m_block_size_bytes << endl - << " block_size_bits: " << m_block_size_bits << endl - << " memory_size_bytes: " << m_memory_size_bytes << endl - << " memory_size_bits: " << m_memory_size_bits << endl; -} - -void -RubySystem::printConfig(ostream& out) -{ - out << "\n================ Begin RubySystem Configuration Print ================\n\n"; - printSystemConfig(out); - m_network_ptr->printConfig(out); - m_profiler_ptr->printConfig(out); - out << "\n================ End RubySystem Configuration Print ================\n\n"; -} - void RubySystem::printStats(ostream& out) { @@ -488,7 +465,5 @@ void RubyExitCallback::process() { std::ostream *os = simout.create(stats_filename); - RubySystem::printConfig(*os); - *os << endl; RubySystem::printStats(*os); } diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh index 3d86c3e02..bbb14667f 100644 --- a/src/mem/ruby/system/System.hh +++ b/src/mem/ruby/system/System.hh @@ -107,7 +107,6 @@ class RubySystem : public SimObject return m_mem_vec_ptr; } - static void printConfig(std::ostream& out); static void printStats(std::ostream& out); void clearStats() const; diff --git a/src/mem/ruby/system/TBETable.hh b/src/mem/ruby/system/TBETable.hh index 022654bce..fa4493757 100644 --- a/src/mem/ruby/system/TBETable.hh +++ b/src/mem/ruby/system/TBETable.hh @@ -46,12 +46,6 @@ class TBETable { } - void - printConfig(std::ostream& out) - { - out << "TBEs_per_TBETable: " << m_number_of_TBEs << std::endl; - } - bool isPresent(const Address& address) const; void allocate(const Address& address); void deallocate(const Address& address); diff --git a/src/mem/ruby/system/TimerTable.hh b/src/mem/ruby/system/TimerTable.hh index 41b4ea68d..e4419d4d3 100644 --- a/src/mem/ruby/system/TimerTable.hh +++ b/src/mem/ruby/system/TimerTable.hh @@ -43,8 +43,6 @@ class TimerTable public: TimerTable(); - static void printConfig(std::ostream& out) {} - void setConsumer(Consumer* consumer_ptr) { diff --git a/src/mem/ruby/system/WireBuffer.cc b/src/mem/ruby/system/WireBuffer.cc index bab935c5d..f007d6c51 100644 --- a/src/mem/ruby/system/WireBuffer.cc +++ b/src/mem/ruby/system/WireBuffer.cc @@ -143,11 +143,6 @@ WireBuffer::print(ostream& out) const { } -void -WireBuffer::printConfig(ostream& out) -{ -} - void WireBuffer::clearStats() const { diff --git a/src/mem/ruby/system/WireBuffer.hh b/src/mem/ruby/system/WireBuffer.hh index 648019aeb..bc3afa2da 100644 --- a/src/mem/ruby/system/WireBuffer.hh +++ b/src/mem/ruby/system/WireBuffer.hh @@ -82,7 +82,6 @@ class WireBuffer : public SimObject bool isReady(); bool areNSlotsAvailable(int n) { return true; }; // infinite queue length - void printConfig(std::ostream& out); void print(std::ostream& out) const; void clearStats() const; void printStats(std::ostream& out) const;