ruby: cleaning up RubyQueue and RubyNetwork dprintfs

Overall, continue to progress Ruby debug messages to more of the normal M5
debug message style
- add a name() to the Ruby Throttle & PerfectSwitch objects so that the debug output
isn't littered w/"global:" everywhere.
- clean up messages that print over multiple lines when possible
- clean up duplicate prints in the message buffer

4 files changed, 14 insertions, 9 deletions

diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 5c461c63f..9f197f4cd 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -131,8 +131,6 @@ PerfectSwitch::~PerfectSwitch()
 void
 PerfectSwitch::wakeup()
 {
-    DPRINTF(RubyNetwork, "m_switch_id: %d\n",m_switch_id);
-
     MsgPtr msg_ptr;
 
     // Give the highest numbered link priority most of the time
@@ -255,7 +253,7 @@ PerfectSwitch::wakeup()
                         int outgoing = output_links[i];
                         if (!m_out[outgoing][vnet]->areNSlotsAvailable(1))
                             enough = false;
-                        DPRINTF(RubyNetwork, "Checking if node is blocked\n"
+                        DPRINTF(RubyNetwork, "Checking if node is blocked ..."
                                 "outgoing: %d, vnet: %d, enough: %d\n",
                                 outgoing, vnet, enough);
                     }
@@ -264,8 +262,8 @@ PerfectSwitch::wakeup()
                     if (!enough) {
                         g_eventQueue_ptr->scheduleEvent(this, 1);
                         DPRINTF(RubyNetwork, "Can't deliver message since a node "
-                                "is blocked\n"
-                                "Message: %s\n", (*net_msg_ptr));
+                                "is blocked\n");
+                        DPRINTF(RubyNetwork, "Message: %s\n", (*net_msg_ptr));
                         break; // go to next incoming port
                     }
 
@@ -302,9 +300,9 @@ PerfectSwitch::wakeup()
                             output_link_destinations[i];
 
                         // Enqeue msg
-                        DPRINTF(RubyNetwork, "Switch: %d enqueuing net msg from "
+                        DPRINTF(RubyNetwork, "%d enqueuing net msg from "
                                 "inport[%d][%d] to outport [%d][%d] time: %lld.\n",
-                                m_switch_id, incoming, vnet, outgoing, vnet,
+                                incoming, vnet, outgoing, vnet,
                                 g_eventQueue_ptr->getTime());
 
                         m_out[outgoing][vnet]->enqueue(msg_ptr);
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index cd0219fd9..41125083f 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -38,6 +38,7 @@
 
 #include <iostream>
 #include <vector>
+#include <string>
 
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
@@ -59,6 +60,9 @@ class PerfectSwitch : public Consumer
     PerfectSwitch(SwitchID sid, SimpleNetwork* network_ptr);
     ~PerfectSwitch();
 
+    std::string name()
+    { return csprintf("PerfectSwitch-%i", m_switch_id); }
+
     void addInPort(const std::vector<MessageBuffer*>& in);
     void addOutPort(const std::vector<MessageBuffer*>& out,
         const NetDest& routing_table_entry);
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 55e5b4e78..28638cca9 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -250,8 +250,7 @@ Throttle::getUtilization() const
 void
 Throttle::print(ostream& out) const
 {
-    out << "[Throttle: " << m_sID << " " << m_node
-        << " bw: " << getLinkBandwidth() << "]";
+    ccprintf(out,  "[%i bw: %i]", m_node, getLinkBandwidth());
 }
 
 int
diff --git a/src/mem/ruby/network/simple/Throttle.hh b/src/mem/ruby/network/simple/Throttle.hh
index c80f24d77..b4e6c867e 100644
--- a/src/mem/ruby/network/simple/Throttle.hh
+++ b/src/mem/ruby/network/simple/Throttle.hh
@@ -40,6 +40,7 @@
 
 #include <iostream>
 #include <vector>
+#include <string>
 
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/common/Global.hh"
@@ -57,6 +58,9 @@ class Throttle : public Consumer
     Throttle(NodeID node, int link_latency, int link_bandwidth_multiplier);
     ~Throttle() {}
 
+    std::string name()
+    { return csprintf("Throttle-%i", m_sID); }
+
     void addLinks(const std::vector<MessageBuffer*>& in_vec,
         const std::vector<MessageBuffer*>& out_vec);
     void wakeup();