diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/buffers/MessageBuffer.hh --- a/src/mem/ruby/buffers/MessageBuffer.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/buffers/MessageBuffer.hh Fri Jun 15 02:53:24 2012 -0500 @@ -55,7 +55,6 @@ std::string name() const { return m_name; } - static void printConfig(std::ostream& out) {} void setRecycleLatency(int recycle_latency) { diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/filters/GenericBloomFilter.hh --- a/src/mem/ruby/filters/GenericBloomFilter.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/filters/GenericBloomFilter.hh Fri Jun 15 02:53:24 2012 -0500 @@ -65,11 +65,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/Network.hh --- a/src/mem/ruby/network/Network.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/Network.hh Fri Jun 15 02:53:24 2012 -0500 @@ -92,7 +92,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/Topology.hh --- a/src/mem/ruby/network/Topology.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/Topology.hh Fri Jun 15 02:53:24 2012 -0500 @@ -79,7 +79,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/Topology.cc --- a/src/mem/ruby/network/Topology.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/Topology.cc Fri Jun 15 02:53:24 2012 -0500 @@ -283,54 +283,6 @@ } } -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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Fri Jun 15 02:53:24 2012 -0500 @@ -65,7 +65,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Fri Jun 15 02:53:24 2012 -0500 @@ -336,40 +336,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh Fri Jun 15 02:53:24 2012 -0500 @@ -50,7 +50,6 @@ ~InputUnit_d(); void wakeup(); - void printConfig(std::ostream& out); flitBuffer_d* getCreditQueue() { return creditQueue; } void print(std::ostream& out) const {}; diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Fri Jun 15 02:53:24 2012 -0500 @@ -94,13 +94,3 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Fri Jun 15 02:53:24 2012 -0500 @@ -60,7 +60,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Fri Jun 15 02:53:24 2012 -0500 @@ -356,14 +356,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh Fri Jun 15 02:53:24 2012 -0500 @@ -52,7 +52,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc Fri Jun 15 02:53:24 2012 -0500 @@ -107,13 +107,3 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Fri Jun 15 02:53:24 2012 -0500 @@ -86,7 +86,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc --- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Fri Jun 15 02:53:24 2012 -0500 @@ -176,20 +176,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh Fri Jun 15 02:53:24 2012 -0500 @@ -65,7 +65,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Fri Jun 15 02:53:24 2012 -0500 @@ -244,40 +244,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh Fri Jun 15 02:53:24 2012 -0500 @@ -70,7 +70,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc Fri Jun 15 02:53:24 2012 -0500 @@ -338,14 +338,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/Router.hh --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh Fri Jun 15 02:53:24 2012 -0500 @@ -67,7 +67,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/garnet/flexible-pipeline/Router.cc --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc Fri Jun 15 02:53:24 2012 -0500 @@ -418,25 +418,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/PerfectSwitch.hh --- a/src/mem/ruby/network/simple/PerfectSwitch.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/PerfectSwitch.hh Fri Jun 15 02:53:24 2012 -0500 @@ -76,8 +76,6 @@ void printStats(std::ostream& out) const; void clearStats(); - void printConfig(std::ostream& out) const; - void print(std::ostream& out) const; private: diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/PerfectSwitch.cc --- a/src/mem/ruby/network/simple/PerfectSwitch.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc Fri Jun 15 02:53:24 2012 -0500 @@ -334,11 +334,6 @@ } void -PerfectSwitch::printConfig(std::ostream& out) const -{ -} - -void PerfectSwitch::print(std::ostream& out) const { out << "[PerfectSwitch " << m_switch_id << "]"; diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/SimpleNetwork.hh --- a/src/mem/ruby/network/simple/SimpleNetwork.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/SimpleNetwork.hh Fri Jun 15 02:53:24 2012 -0500 @@ -58,8 +58,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/SimpleNetwork.cc --- a/src/mem/ruby/network/simple/SimpleNetwork.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Fri Jun 15 02:53:24 2012 -0500 @@ -314,44 +314,11 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/Switch.hh --- a/src/mem/ruby/network/simple/Switch.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/Switch.hh Fri Jun 15 02:53:24 2012 -0500 @@ -68,8 +68,6 @@ void printStats(std::ostream& out) const; void clearStats(); - void printConfig(std::ostream& out) const; - void print(std::ostream& out) const; private: diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/Switch.cc --- a/src/mem/ruby/network/simple/Switch.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/Switch.cc Fri Jun 15 02:53:24 2012 -0500 @@ -209,16 +209,6 @@ } 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/Throttle.hh --- a/src/mem/ruby/network/simple/Throttle.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/Throttle.hh Fri Jun 15 02:53:24 2012 -0500 @@ -67,7 +67,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/network/simple/Throttle.cc --- a/src/mem/ruby/network/simple/Throttle.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/network/simple/Throttle.cc Fri Jun 15 02:53:24 2012 -0500 @@ -238,11 +238,6 @@ } } -void -Throttle::printConfig(ostream& out) const -{ -} - double Throttle::getUtilization() const { diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/profiler/Profiler.hh --- a/src/mem/ruby/profiler/Profiler.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/profiler/Profiler.hh Fri Jun 15 02:53:24 2012 -0500 @@ -86,7 +86,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/profiler/Profiler.cc --- a/src/mem/ruby/profiler/Profiler.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/profiler/Profiler.cc Fri Jun 15 02:53:24 2012 -0500 @@ -165,15 +165,6 @@ } 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 { out << "[Profiler]"; diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/slicc_interface/AbstractController.hh --- a/src/mem/ruby/slicc_interface/AbstractController.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/slicc_interface/AbstractController.hh Fri Jun 15 02:53:24 2012 -0500 @@ -63,7 +63,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/AbstractMemOrCache.hh --- a/src/mem/ruby/system/AbstractMemOrCache.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/AbstractMemOrCache.hh Fri Jun 15 02:53:24 2012 -0500 @@ -51,7 +51,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/CacheMemory.hh --- a/src/mem/ruby/system/CacheMemory.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/CacheMemory.hh Fri Jun 15 02:53:24 2012 -0500 @@ -56,8 +56,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/CacheMemory.cc --- a/src/mem/ruby/system/CacheMemory.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/CacheMemory.cc Fri Jun 15 02:53:24 2012 -0500 @@ -100,31 +100,6 @@ } } -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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/DMASequencer.hh --- a/src/mem/ruby/system/DMASequencer.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/DMASequencer.hh Fri Jun 15 02:53:24 2012 -0500 @@ -63,8 +63,6 @@ void dataCallback(const DataBlock & dblk); void ackCallback(); - void printConfig(std::ostream & out); - private: void issueNext(); diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/DMASequencer.cc --- a/src/mem/ruby/system/DMASequencer.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/DMASequencer.cc Fri Jun 15 02:53:24 2012 -0500 @@ -163,11 +163,6 @@ issueNext(); } -void -DMASequencer::printConfig(std::ostream & out) -{ -} - DMASequencer * DMASequencerParams::create() { diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/DirectoryMemory.hh --- a/src/mem/ruby/system/DirectoryMemory.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/DirectoryMemory.hh Fri Jun 15 02:53:24 2012 -0500 @@ -54,8 +54,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/DirectoryMemory.cc --- a/src/mem/ruby/system/DirectoryMemory.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/DirectoryMemory.cc Fri Jun 15 02:53:24 2012 -0500 @@ -91,34 +91,6 @@ } } -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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/MemoryControl.hh --- a/src/mem/ruby/system/MemoryControl.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/MemoryControl.hh Fri Jun 15 02:53:24 2012 -0500 @@ -79,10 +79,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/MemoryControl.cc --- a/src/mem/ruby/system/MemoryControl.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/MemoryControl.cc Fri Jun 15 02:53:24 2012 -0500 @@ -315,37 +315,6 @@ } void -MemoryControl::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 MemoryControl::clearStats() const { m_profiler_ptr->clearStats(); diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/PerfectCacheMemory.hh --- a/src/mem/ruby/system/PerfectCacheMemory.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/PerfectCacheMemory.hh Fri Jun 15 02:53:24 2012 -0500 @@ -54,8 +54,6 @@ 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 @@ { } -template -inline void -PerfectCacheMemory::printConfig(std::ostream& out) -{ -} - // tests to see if an address is present in the cache template inline bool diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/PersistentTable.hh --- a/src/mem/ruby/system/PersistentTable.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/PersistentTable.hh Fri Jun 15 02:53:24 2012 -0500 @@ -69,8 +69,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/Sequencer.hh --- a/src/mem/ruby/system/Sequencer.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/Sequencer.hh Fri Jun 15 02:53:24 2012 -0500 @@ -66,8 +66,6 @@ // 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/Sequencer.cc --- a/src/mem/ruby/system/Sequencer.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/Sequencer.cc Fri Jun 15 02:53:24 2012 -0500 @@ -200,16 +200,6 @@ #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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/SparseMemory.hh --- a/src/mem/ruby/system/SparseMemory.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/SparseMemory.hh Fri Jun 15 02:53:24 2012 -0500 @@ -54,8 +54,6 @@ 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/System.hh --- a/src/mem/ruby/system/System.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/System.hh Fri Jun 15 02:53:24 2012 -0500 @@ -106,7 +106,6 @@ return m_mem_vec_ptr; } - static void printConfig(std::ostream& out); static void printStats(std::ostream& out); void clearStats() const; diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/System.cc --- a/src/mem/ruby/system/System.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/System.cc Fri Jun 15 02:53:24 2012 -0500 @@ -134,29 +134,6 @@ } 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) { const time_t T = time(NULL); @@ -480,7 +457,5 @@ RubyExitCallback::process() { std::ostream *os = simout.create(stats_filename); - RubySystem::printConfig(*os); - *os << endl; RubySystem::printStats(*os); } diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/TBETable.hh --- a/src/mem/ruby/system/TBETable.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/TBETable.hh Fri Jun 15 02:53:24 2012 -0500 @@ -46,12 +46,6 @@ { } - 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 -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/TimerTable.hh --- a/src/mem/ruby/system/TimerTable.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/TimerTable.hh Fri Jun 15 02:53:24 2012 -0500 @@ -43,8 +43,6 @@ public: TimerTable(); - static void printConfig(std::ostream& out) {} - void setConsumer(Consumer* consumer_ptr) { diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/WireBuffer.hh --- a/src/mem/ruby/system/WireBuffer.hh Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/WireBuffer.hh Fri Jun 15 02:53:24 2012 -0500 @@ -82,7 +82,6 @@ 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; diff -r a7cd5e027d74 -r 2316c982b654 src/mem/ruby/system/WireBuffer.cc --- a/src/mem/ruby/system/WireBuffer.cc Fri Jun 15 02:49:28 2012 -0500 +++ b/src/mem/ruby/system/WireBuffer.cc Fri Jun 15 02:53:24 2012 -0500 @@ -144,11 +144,6 @@ } void -WireBuffer::printConfig(ostream& out) -{ -} - -void WireBuffer::clearStats() const { }