changeset 49116b947194 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=49116b947194
description:
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.
diffstat:
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 -
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 34 -------
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc | 10 --
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 8 -
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc | 10 --
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh | 1 -
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc | 14 --
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | 1 -
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 34 -------
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh | 1 -
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc | 8 -
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh | 1 -
src/mem/ruby/network/garnet/flexible-pipeline/Router.cc | 19 ---
src/mem/ruby/network/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 -
src/mem/ruby/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, 0 insertions(+), 442 deletions(-)
diffs (truncated from 991 to 300 lines):
diff -r 9171e26543fa -r 49116b947194 src/mem/ruby/buffers/MessageBuffer.hh
--- a/src/mem/ruby/buffers/MessageBuffer.hh Thu Jul 12 08:39:18 2012 -0500
+++ b/src/mem/ruby/buffers/MessageBuffer.hh Thu Jul 12 08:39:19 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 9171e26543fa -r 49116b947194 src/mem/ruby/filters/GenericBloomFilter.hh
--- a/src/mem/ruby/filters/GenericBloomFilter.hh Thu Jul 12 08:39:18
2012 -0500
+++ b/src/mem/ruby/filters/GenericBloomFilter.hh Thu Jul 12 08:39:19
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 9171e26543fa -r 49116b947194 src/mem/ruby/network/Network.hh
--- a/src/mem/ruby/network/Network.hh Thu Jul 12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/Network.hh Thu Jul 12 08:39:19 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 9171e26543fa -r 49116b947194 src/mem/ruby/network/Topology.cc
--- a/src/mem/ruby/network/Topology.cc Thu Jul 12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/Topology.cc Thu Jul 12 08:39:19 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 9171e26543fa -r 49116b947194 src/mem/ruby/network/Topology.hh
--- a/src/mem/ruby/network/Topology.hh Thu Jul 12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/Topology.hh Thu Jul 12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Thu Jul
12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh Thu Jul
12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Thu Jul 12
08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc Thu Jul 12
08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh Thu Jul 12
08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh Thu Jul 12
08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Thu Jul
12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Thu Jul
12 08:39:19 2012 -0500
@@ -60,7 +60,6 @@
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 -r 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc Thu Jul
12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh Thu Jul
12 08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Thu Jul 12
08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc Thu Jul 12
08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Thu Jul 12
08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh Thu Jul 12
08:39:19 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 9171e26543fa -r 49116b947194
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Thu Jul
12 08:39:18 2012 -0500
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Thu Jul
12 08:39:19 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]) {
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
