[gem5-dev] changeset in gem5: ruby: message buffer: changes related to trac...

[Nilay Vaish]

changeset c7fe7555d587 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=c7fe7555d587
description:
        ruby: message buffer: changes related to tracking push/pop times
        The last pop operation is now tracked as a Tick instead of in Cycles.
        This helps in avoiding use of the receiver's clock during the enqueue
        operation.

diffstat:

 src/mem/ruby/buffers/MessageBuffer.cc |  10 +++++-----
 src/mem/ruby/buffers/MessageBuffer.hh |   6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r e0167dda38dc -r c7fe7555d587 src/mem/ruby/buffers/MessageBuffer.cc
--- a/src/mem/ruby/buffers/MessageBuffer.cc     Sat Mar 01 23:59:57 2014 -0600
+++ b/src/mem/ruby/buffers/MessageBuffer.cc     Sat Mar 01 23:59:58 2014 -0600
@@ -89,11 +89,11 @@
     // size immediately
     unsigned int current_size = 0;
 
-    if (m_time_last_time_pop < m_receiver->curCycle()) {
+    if (m_time_last_time_pop < m_sender->clockEdge()) {
         // no pops this cycle - heap size is correct
         current_size = m_prio_heap.size();
     } else {
-        if (m_time_last_time_enqueue < m_receiver->curCycle()) {
+        if (m_time_last_time_enqueue < m_sender->curCycle()) {
             // no enqueues this cycle - m_size_at_cycle_start is correct
             current_size = m_size_at_cycle_start;
         } else {
@@ -242,9 +242,9 @@
 
     // record previous size and time so the current buffer size isn't
     // adjusted until next cycle
-    if (m_time_last_time_pop < m_receiver->curCycle()) {
+    if (m_time_last_time_pop < m_receiver->clockEdge()) {
         m_size_at_cycle_start = m_prio_heap.size();
-        m_time_last_time_pop = m_receiver->curCycle();
+        m_time_last_time_pop = m_receiver->clockEdge();
     }
 
     pop_heap(m_prio_heap.begin(), m_prio_heap.end(),
@@ -259,7 +259,7 @@
 
     m_msg_counter = 0;
     m_time_last_time_enqueue = Cycles(0);
-    m_time_last_time_pop = Cycles(0);
+    m_time_last_time_pop = 0;
     m_size_at_cycle_start = 0;
     m_msgs_this_cycle = 0;
 }
diff -r e0167dda38dc -r c7fe7555d587 src/mem/ruby/buffers/MessageBuffer.hh
--- a/src/mem/ruby/buffers/MessageBuffer.hh     Sat Mar 01 23:59:57 2014 -0600
+++ b/src/mem/ruby/buffers/MessageBuffer.hh     Sat Mar 01 23:59:58 2014 -0600
@@ -186,7 +186,9 @@
     // variables used so enqueues appear to happen imediately, while
     // pop happen the next cycle
     Cycles m_time_last_time_enqueue;
-    Cycles m_time_last_time_pop;
+    Tick m_time_last_time_pop;
+    Tick m_last_arrival_time;
+
     unsigned int m_size_at_cycle_start;
     unsigned int m_msgs_this_cycle;
 
@@ -198,8 +200,6 @@
     bool m_ordering_set;
     bool m_randomization;
 
-    Tick m_last_arrival_time;
-
     int m_input_link_id;
     int m_vnet_id;
 };
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev