diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/buffers/MessageBuffer.hh --- a/src/mem/ruby/buffers/MessageBuffer.hh Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/buffers/MessageBuffer.hh Fri Feb 18 12:14:02 2011 -0500 @@ -53,6 +53,8 @@ public: MessageBuffer(const std::string &name = ""); + std::string name() const { return m_name; } + static void printConfig(std::ostream& out) {} void setRecycleLatency(int recycle_latency) diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/buffers/MessageBuffer.cc --- a/src/mem/ruby/buffers/MessageBuffer.cc Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/buffers/MessageBuffer.cc Fri Feb 18 12:14:02 2011 -0500 @@ -55,7 +55,6 @@ m_msgs_this_cycle = 0; m_not_avail_count = 0; m_priority_rank = 0; - m_name = name; m_stall_msg_map.clear(); } @@ -123,8 +122,8 @@ const Message* MessageBuffer::peekAtHeadOfQueue() const { - DPRINTF(RubyQueue, "Peeking at head of queue %s time: %lld\n", - m_name, g_eventQueue_ptr->getTime()); + DPRINTF(RubyQueue, "Peeking at head of queue time: %lld\n", + g_eventQueue_ptr->getTime()); assert(isReady()); const Message* msg_ptr = m_prio_heap.front().m_msgptr.get(); @@ -149,9 +148,6 @@ void MessageBuffer::enqueue(MsgPtr message, Time delta) { - DPRINTF(RubyQueue, "Enqueue %s time: %lld, message: %s.\n", - m_name, g_eventQueue_ptr->getTime(), (*(message.get()))); - m_msg_counter++; m_size++; @@ -220,10 +216,9 @@ push_heap(m_prio_heap.begin(), m_prio_heap.end(), greater()); - DPRINTF(RubyQueue, "Enqueue %s with arrival_time %lld cur_time: %lld, " - "message: %s.\n", - m_name, arrival_time, g_eventQueue_ptr->getTime(), - (*(message.get()))); + DPRINTF(RubyQueue, "Enqueue with arrival_time %lld (cur_time: %lld).\n ", + arrival_time, g_eventQueue_ptr->getTime()); + DPRINTF(RubyQueue, "Enqueue Message: %s.\n", (*(message.get()))); // Schedule the wakeup if (m_consumer_ptr != NULL) { @@ -250,7 +245,7 @@ void MessageBuffer::dequeue(MsgPtr& message) { - DPRINTF(RubyQueue, "Dequeue from %s\n", m_name); + DPRINTF(RubyQueue, "Dequeueing\n"); message = m_prio_heap.front().m_msgptr; pop(); @@ -277,7 +272,7 @@ void MessageBuffer::pop() { - DPRINTF(RubyQueue, "Pop from %s\n", m_name); + DPRINTF(RubyQueue, "Popping\n"); assert(isReady()); pop_heap(m_prio_heap.begin(), m_prio_heap.end(), greater()); @@ -308,7 +303,7 @@ void MessageBuffer::recycle() { - DPRINTF(RubyQueue, "Recycling %s\n", m_name); + DPRINTF(RubyQueue, "Recycling.\n"); assert(isReady()); MessageBufferNode node = m_prio_heap.front(); pop_heap(m_prio_heap.begin(), m_prio_heap.end(), @@ -324,7 +319,7 @@ void MessageBuffer::reanalyzeMessages(const Address& addr) { - DPRINTF(RubyQueue, "ReanalyzeMessages %s\n", m_name); + DPRINTF(RubyQueue, "ReanalyzeMessages\n"); assert(m_stall_msg_map.count(addr) > 0); // @@ -350,7 +345,7 @@ void MessageBuffer::reanalyzeAllMessages() { - DPRINTF(RubyQueue, "ReanalyzeAllMessages %s\n", m_name); + DPRINTF(RubyQueue, "ReanalyzeAllMessages %s\n"); // // Put all stalled messages associated with this address back on the @@ -381,7 +376,7 @@ void MessageBuffer::stallMessage(const Address& addr) { - DPRINTF(RubyQueue, "Stalling %s\n", m_name); + DPRINTF(RubyQueue, "Stalling %s\n"); assert(isReady()); assert(addr.getOffset() == 0); MsgPtr message = m_prio_heap.front().m_msgptr; @@ -418,14 +413,14 @@ void MessageBuffer::print(ostream& out) const { - out << "[MessageBuffer: "; + ccprintf(out, "[MessageBuffer: "); if (m_consumer_ptr != NULL) { - out << " consumer-yes "; + ccprintf(out, " consumer-yes "); } vector copy(m_prio_heap); sort_heap(copy.begin(), copy.end(), greater()); - out << copy << "] " << m_name << endl; + ccprintf(out, "%s] %s", copy, m_name); } void diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/common/NetDest.hh --- a/src/mem/ruby/common/NetDest.hh Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/common/NetDest.hh Fri Feb 18 12:14:02 2011 -0500 @@ -54,9 +54,7 @@ NetDest& operator=(const Set& obj); ~NetDest() - { - DPRINTF(RubyMemory, "NetDest Destructor\n"); - } + { } void add(MachineID newElement); void addNetDest(const NetDest& netDest); diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/network/simple/PerfectSwitch.hh --- a/src/mem/ruby/network/simple/PerfectSwitch.hh Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/network/simple/PerfectSwitch.hh Fri Feb 18 12:14:02 2011 -0500 @@ -38,6 +38,7 @@ #include #include +#include #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Global.hh" @@ -59,6 +60,9 @@ PerfectSwitch(SwitchID sid, SimpleNetwork* network_ptr); ~PerfectSwitch(); + std::string name() + { return "PerfectSwitch-" + to_string(m_switch_id); } + void addInPort(const std::vector& in); void addOutPort(const std::vector& out, const NetDest& routing_table_entry); diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/network/simple/PerfectSwitch.cc --- a/src/mem/ruby/network/simple/PerfectSwitch.cc Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc Fri Feb 18 12:14:02 2011 -0500 @@ -123,8 +123,6 @@ 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 @@ -246,7 +244,7 @@ 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); } @@ -255,7 +253,7 @@ if (!enough) { g_eventQueue_ptr->scheduleEvent(this, 1); DPRINTF(RubyNetwork, "Can't deliver message since a node " - "is blocked\n" + "is blocked ..." "Message: %s\n", (*net_msg_ptr)); break; // go to next incoming port } @@ -293,9 +291,9 @@ output_link_destinations[i]; // Enqeue msg - DPRINTF(RubyNetwork, "Switch: %d enqueuing net msg from " + DPRINTF(RubyNetwork, "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 -r 47da69b1860a -r a268b23460c5 src/mem/ruby/network/simple/Throttle.hh --- a/src/mem/ruby/network/simple/Throttle.hh Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/network/simple/Throttle.hh Fri Feb 18 12:14:02 2011 -0500 @@ -46,6 +46,7 @@ #include "mem/ruby/network/Network.hh" #include "mem/ruby/system/NodeID.hh" #include "mem/ruby/system/System.hh" +#include class MessageBuffer; @@ -57,6 +58,11 @@ Throttle(NodeID node, int link_latency, int link_bandwidth_multiplier); ~Throttle() {} + std::string name() + { return "Throttle-" + to_string(m_sID); } + + + void addLinks(const std::vector& in_vec, const std::vector& out_vec); void wakeup(); diff -r 47da69b1860a -r a268b23460c5 src/mem/ruby/network/simple/Throttle.cc --- a/src/mem/ruby/network/simple/Throttle.cc Fri Feb 18 11:25:36 2011 -0500 +++ b/src/mem/ruby/network/simple/Throttle.cc Fri Feb 18 12:14:02 2011 -0500 @@ -250,8 +250,7 @@ void Throttle::print(ostream& out) const { - out << "[Throttle: " << m_sID << " " << m_node - << " bw: " << getLinkBandwidth() << "]"; + out << "[" << m_node << " bw: " << getLinkBandwidth() << "]"; } int