ruby: message buffer, timer table: significant changes

This patch changes MessageBuffer and TimerTable, two structures used for
buffering messages by components in ruby.  These structures would no longer
maintain pointers to clock objects.  Functions in these structures have been
changed to take as input current time in Tick.  Similarly, these structures
will not operate on Cycle valued latencies for different operations.  The
corresponding functions would need to be provided with these latencies by
components invoking the relevant functions.  These latencies should also be
in Ticks.

I felt the need for these changes while trying to speed up ruby.  The ultimate
aim is to eliminate Consumer class and replace it with an EventManager object in
the MessageBuffer and TimerTable classes.  This object would be used for
scheduling events.  The event itself would contain information on the object and
function to be invoked.

In hindsight, it seems I should have done this while I was moving away from use
of a single global clock in the memory system.  That change led to introduction
of clock objects that replaced the global clock object.  It never crossed my
mind that having clock object pointers is not a good design.  And now I really
don't like the fact that we have separate consumer, receiver and sender
pointers in message buffers.

5 files changed, 8 insertions, 22 deletions

diff --git a/src/mem/slicc/ast/EnqueueStatementAST.py b/src/mem/slicc/ast/EnqueueStatementAST.py
index 930540494..556643e4e 100644
--- a/src/mem/slicc/ast/EnqueueStatementAST.py
+++ b/src/mem/slicc/ast/EnqueueStatementAST.py
@@ -65,9 +65,10 @@ class EnqueueStatementAST(StatementAST):
         if self.latexpr != None:
             ret_type, rcode = self.latexpr.inline(True)
             code("(${{self.queue_name.var.code}}).enqueue(" \
-                 "out_msg, Cycles($rcode));")
+                 "out_msg, clockEdge(), cyclesToTicks(Cycles($rcode)));")
         else:
-            code("(${{self.queue_name.var.code}}).enqueue(out_msg);")
+            code("(${{self.queue_name.var.code}}).enqueue(out_msg, "\
+                 "clockEdge(), cyclesToTicks(Cycles(1)));")
 
         # End scope
         self.symtab.popFrame()
diff --git a/src/mem/slicc/ast/ObjDeclAST.py b/src/mem/slicc/ast/ObjDeclAST.py
index 7cea70b32..efc7ef928 100644
--- a/src/mem/slicc/ast/ObjDeclAST.py
+++ b/src/mem/slicc/ast/ObjDeclAST.py
@@ -55,6 +55,8 @@ class ObjDeclAST(DeclAST):
             c_code = "m_machineID"
         elif self.ident == "clusterID":
             c_code = "m_clusterID"
+        elif self.ident == "recycle_latency":
+            c_code = "m_recycle_latency"
         else:
             c_code = "(*m_%s_ptr)" % (self.ident)
 
diff --git a/src/mem/slicc/ast/PeekStatementAST.py b/src/mem/slicc/ast/PeekStatementAST.py
index f5ef91daf..00d26e908 100644
--- a/src/mem/slicc/ast/PeekStatementAST.py
+++ b/src/mem/slicc/ast/PeekStatementAST.py
@@ -77,7 +77,7 @@ class PeekStatementAST(StatementAST):
     if (m_is_blocking &&
         (m_block_map.count(in_msg_ptr->m_$address_field) == 1) &&
         (m_block_map[in_msg_ptr->m_$address_field] != &$qcode)) {
-            $qcode.delayHead();
+            $qcode.delayHead(clockEdge(), cyclesToTicks(Cycles(1)));
             continue;
     }
             ''')
diff --git a/src/mem/slicc/ast/StallAndWaitStatementAST.py b/src/mem/slicc/ast/StallAndWaitStatementAST.py
index b2f622871..6ab2888b7 100644
--- a/src/mem/slicc/ast/StallAndWaitStatementAST.py
+++ b/src/mem/slicc/ast/StallAndWaitStatementAST.py
@@ -45,5 +45,5 @@ class StallAndWaitStatementAST(StatementAST):
         address_code = self.address.var.code
         code('''
         stallBuffer(&($in_port_code), $address_code);
-        $in_port_code.stallMessage($address_code);
+        $in_port_code.stallMessage($address_code, clockEdge());
         ''')
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 42a81c096..015d902b4 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -580,24 +580,10 @@ $c_ident::initNetQueues()
 m_net_ptr->set${network}NetQueue(m_version + base, $vid->getOrdered(), $vnet,
                                  "$vnet_type", $vid);
 ''')
-                # Set the end
-                if network == "To":
-                    code('$vid->setSender(this);')
-                else:
-                    code('$vid->setReceiver(this);')
-
                 # Set Priority
                 if "rank" in var:
                     code('$vid->setPriority(${{var["rank"]}})')
 
-            else:
-                if var.type_ast.type.c_ident == "MessageBuffer":
-                    code('$vid->setReceiver(this);')
-                if var.ident.find("triggerQueue") >= 0:
-                    code('$vid->setSender(this);')
-                elif var.ident.find("optionalQueue") >= 0:
-                    code('$vid->setSender(this);')
-
         code.dedent()
         code('''
 }
@@ -637,9 +623,6 @@ $c_ident::init()
                         comment = "Type %s default" % vtype.ident
                         code('*$vid = ${{vtype["default"]}}; // $comment')
 
-                    if vtype.c_ident == "TimerTable":
-                        code('$vid->setClockObj(this);')
-
         # Set the prefetchers
         code()
         for prefetcher in self.prefetchers:
@@ -1293,7 +1276,7 @@ ${ident}_Controller::doTransitionWorker(${ident}_Event event,
             res = trans.resources
             for key,val in res.iteritems():
                 val = '''
-if (!%s.areNSlotsAvailable(%s))
+if (!%s.areNSlotsAvailable(%s, clockEdge()))
     return TransitionResult_ResourceStall;
 ''' % (key.code, val)
                 case_sorter.append(val)