changeset f3d1493787d4 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=f3d1493787d4
description:
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.
diffstat:
src/mem/protocol/MOESI_CMP_token-L1cache.sm | 3 +-
src/mem/protocol/MOESI_hammer-cache.sm | 3 +-
src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py | 43 --------------------
src/mem/slicc/parser.py | 5 --
src/mem/slicc/symbols/StateMachine.py | 40 +++++++++--------
5 files changed, 25 insertions(+), 69 deletions(-)
diffs (160 lines):
diff -r e641f702653a -r f3d1493787d4 src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Mar 18 11:47:15
2011 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Mar 18 14:12:01
2011 -0500
@@ -176,6 +176,7 @@
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 @@
}
action(ka_wakeUpAllDependents, "ka", desc="wake-up all dependents") {
- wake_up_all_dependents();
+ wakeUpAllBuffers();
}
//*****************************************************
diff -r e641f702653a -r f3d1493787d4 src/mem/protocol/MOESI_hammer-cache.sm
--- a/src/mem/protocol/MOESI_hammer-cache.sm Fri Mar 18 11:47:15 2011 -0700
+++ b/src/mem/protocol/MOESI_hammer-cache.sm Fri Mar 18 14:12:01 2011 -0500
@@ -158,6 +158,7 @@
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 @@
}
action(ka_wakeUpAllDependents, "ka", desc="wake-up all dependents") {
- wake_up_all_dependents();
+ wakeUpAllBuffers();
}
//*****************************************************
diff -r e641f702653a -r f3d1493787d4
src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py
--- a/src/mem/slicc/ast/WakeUpAllDependentsStatementAST.py Fri Mar 18
11:47:15 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r e641f702653a -r f3d1493787d4 src/mem/slicc/parser.py
--- a/src/mem/slicc/parser.py Fri Mar 18 11:47:15 2011 -0700
+++ b/src/mem/slicc/parser.py Fri Mar 18 14:12:01 2011 -0500
@@ -160,7 +160,6 @@
'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 @@
"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 -r e641f702653a -r f3d1493787d4 src/mem/slicc/symbols/StateMachine.py
--- a/src/mem/slicc/symbols/StateMachine.py Fri Mar 18 11:47:15 2011 -0700
+++ b/src/mem/slicc/symbols/StateMachine.py Fri Mar 18 14:12:01 2011 -0500
@@ -745,26 +745,28 @@
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);
+ 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();
}
-
- for (std::vector<MsgVecType*>::iterator wb_iter = wokeUpMsgVecs.begin();
- wb_iter != wokeUpMsgVecs.end();
- ++wb_iter) {
- delete (*wb_iter);
- }
-
- m_waiting_buffers.clear();
}
void
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
