SLICC: Remove the keyword wake_up_all_dependents

In order to add stall and wait facility for protocols, a keyword
wake_up_all_dependents was introduced. This patch removes the keyword,
instead this functionality is now implemented as function call.

diff --git a/src/mem/protocol/MOESI_CMP_token-L1cache.sm b/src/mem/protocol/MOESI_CMP_token-L1cache.sm
index 160208aaccb2b9b53b55c14dcf3836529885c516..5735fe203d1420e13b73d226b12938540143f649 100644 (file)
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm
@@ -176,6 +176,7 @@ machine(L1Cache, "Token protocol")
   void unset_cache_entry();
   void set_tbe(TBE b);
   void unset_tbe();
+  void wakeUpAllBuffers();
 
   TBETable L1_TBEs, template_hack="<L1Cache_TBE>";
 
@@ -1525,7 +1526,7 @@ machine(L1Cache, "Token protocol")
   }
 
   action(ka_wakeUpAllDependents, "ka", desc="wake-up all dependents") {
-    wake_up_all_dependents();
+    wakeUpAllBuffers();
   }
 
   //*****************************************************

diff --git a/src/mem/protocol/MOESI_hammer-cache.sm b/src/mem/protocol/MOESI_hammer-cache.sm
index 05d74038b579421df9eed6100d4bff0344c1235e..94fd25f56817fb20a97611b27aa98d8e9387536f 100644 (file)
--- a/src/mem/protocol/MOESI_hammer-cache.sm
+++ b/src/mem/protocol/MOESI_hammer-cache.sm
@@ -158,6 +158,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
   void unset_cache_entry();
   void set_tbe(TBE b);
   void unset_tbe();
+  void wakeUpAllBuffers();
 
   Entry getCacheEntry(Address address), return_by_pointer="yes" {
     Entry L2cache_entry := static_cast(Entry, "pointer", L2cacheMemory.lookup(address));
@@ -1016,7 +1017,7 @@ machine(L1Cache, "AMD Hammer-like protocol")
   }
 
   action(ka_wakeUpAllDependents, "ka", desc="wake-up all dependents") {
-    wake_up_all_dependents();
+    wakeUpAllBuffers();
   }
 
   //*****************************************************

diff --git a/src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py b/src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py
deleted file mode 100644 (file)
index cd453bd..0000000
--- a/src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
-# Copyright (c) 2009 The Hewlett-Packard Development Company
-# Copyright (c) 2010 Advanced Micro Devices, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from slicc.ast.StatementAST import StatementAST
-
-class WakeUpAllDependentsStatementAST(StatementAST):
-    def __init__(self, slicc):
-        super(StatementAST, self).__init__(slicc)
-        
-    def __repr__(self):
-        return "[WakeUpAllDependentsStatementAst: %r]" % self.variable
-
-    def generate(self, code, return_type):
-        code('''
-        if (m_waiting_buffers.size() > 0) {
-            wakeUpAllBuffers();
-        }
-        ''')

diff --git a/src/mem/slicc/parser.py b/src/mem/slicc/parser.py
index 448954e6309424295aa81756d8d330a8df1d457c..fcf3c71ace5b6a1c59d5f43dd5889c214f5c44c8 100644 (file)
--- a/src/mem/slicc/parser.py
+++ b/src/mem/slicc/parser.py
@@ -160,7 +160,6 @@ class SLICC(Grammar):
         'peek' : 'PEEK',
         'stall_and_wait' : 'STALL_AND_WAIT',
         'wake_up_dependents' : 'WAKE_UP_DEPENDENTS',
-        'wake_up_all_dependents' : 'WAKE_UP_ALL_DEPENDENTS',
         'enqueue' : 'ENQUEUE',
         'copy_head' : 'COPY_HEAD',
         'check_allocate' : 'CHECK_ALLOCATE',
@@ -582,10 +581,6 @@ class SLICC(Grammar):
         "statement : WAKE_UP_DEPENDENTS '(' var ')' SEMI"
         p[0] = ast.WakeUpDependentsStatementAST(self, p[3])
 
-    def p_statement__wake_up_all_dependents(self, p):
-        "statement : WAKE_UP_ALL_DEPENDENTS '(' ')' SEMI"
-        p[0] = ast.WakeUpAllDependentsStatementAST(self)
-
     def p_statement__peek(self, p):
         "statement : PEEK '(' var ',' type pairs ')' statements"
         p[0] = ast.PeekStatementAST(self, p[3], p[5], p[6], p[8], "peek")

diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 3c5f860ea7c15ae43fa09000c11cb92f757226d9..301e34ea56ce7b681ae130578a644a16935f243b 100644 (file)
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -745,26 +745,28 @@ $c_ident::wakeUpAllBuffers()
 
     std::vector<MsgVecType*> wokeUpMsgVecs;
     
-    for (WaitingBufType::iterator buf_iter = m_waiting_buffers.begin();
-         buf_iter != m_waiting_buffers.end();
-         ++buf_iter) {
-         for (MsgVecType::iterator vec_iter = buf_iter->second->begin();
-              vec_iter != buf_iter->second->end();
-              ++vec_iter) {
-              if (*vec_iter != NULL) {
-                  (*vec_iter)->reanalyzeAllMessages();
-              }
-         }
-         wokeUpMsgVecs.push_back(buf_iter->second);
-    }
-    
-    for (std::vector<MsgVecType*>::iterator wb_iter = wokeUpMsgVecs.begin();
-         wb_iter != wokeUpMsgVecs.end();
-         ++wb_iter) {
-         delete (*wb_iter);
+    if(m_waiting_buffers.size() > 0) {
+        for (WaitingBufType::iterator buf_iter = m_waiting_buffers.begin();
+             buf_iter != m_waiting_buffers.end();
+             ++buf_iter) {
+             for (MsgVecType::iterator vec_iter = buf_iter->second->begin();
+                  vec_iter != buf_iter->second->end();
+                  ++vec_iter) {
+                  if (*vec_iter != NULL) {
+                      (*vec_iter)->reanalyzeAllMessages();
+                  }
+             }
+             wokeUpMsgVecs.push_back(buf_iter->second);
+        }
+
+        for (std::vector<MsgVecType*>::iterator wb_iter = wokeUpMsgVecs.begin();
+             wb_iter != wokeUpMsgVecs.end();
+             ++wb_iter) {
+             delete (*wb_iter);
+        }
+
+        m_waiting_buffers.clear();
     }
-    
-    m_waiting_buffers.clear();
 }
 
 void