Tiago Mück has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/31265 )
Change subject: mem-ruby: able to define resource stalls handlers
......................................................................
mem-ruby: able to define resource stalls handlers
Input ports can specify a custom handler that is called
on resource stalls. The handler should return 'true' to
indicate the stall was handled and new messages from that
queue can be processed on that cycle. When it returns
'false' or no handler is defined, a resource stall is
generated.
Change-Id: I3481d130d5eb411e6760a54d098d3da5de511c86
Signed-off-by: Tiago Mück <tiago.m...@arm.com>
---
M src/mem/slicc/ast/FuncCallExprAST.py
M src/mem/slicc/ast/InPortDeclAST.py
2 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/src/mem/slicc/ast/FuncCallExprAST.py
b/src/mem/slicc/ast/FuncCallExprAST.py
index b3cc9f1..b5ef38c 100644
--- a/src/mem/slicc/ast/FuncCallExprAST.py
+++ b/src/mem/slicc/ast/FuncCallExprAST.py
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# All rights reserved.
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
# Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
# Copyright (c) 2009 The Hewlett-Packard Development Company
# Copyright (c) 2013 Advanced Micro Devices, Inc.
@@ -148,18 +160,53 @@
TransitionResult result = doTransition(${{cvec[0]}}, ${{cvec[1]}});
''')
+ curr_in_port = machine.curr_in_port_code_gen
+ assert(curr_in_port != None)
+
code('''
if (result == TransitionResult_Valid) {
counter++;
continue; // Check the first port again
- }
-
- if (result == TransitionResult_ResourceStall ||
- result == TransitionResult_ProtocolStall) {
+ } else if (result == TransitionResult_ResourceStall) {
+''')
+ if 'rsc_stall_handler' in curr_in_port.pairs:
+ stall_func_name = curr_in_port.pairs['rsc_stall_handler']
+ code('''
+ if (${{stall_func_name}}()) {
+ counter++;
+ continue; // Check the first port again
+ } else {
+ scheduleEvent(Cycles(1));
+ // Cannot do anything with this transition, go check next
doable transition (mostly likely of next port)
+ }
+''')
+ else:
+ code('''
scheduleEvent(Cycles(1));
-
// Cannot do anything with this transition, go check next doable
transition (mostly likely of next port)
+''')
+ code('''
+ } else if (result == TransitionResult_ProtocolStall) {
+''')
+ if 'prot_stall_handler' in curr_in_port.pairs:
+ stall_func_name = curr_in_port.pairs['prot_stall_handler']
+ code('''
+ if (${{stall_func_name}}()) {
+ counter++;
+ continue; // Check the first port again
+ } else {
+ scheduleEvent(Cycles(1));
+ // Cannot do anything with this transition, go check next
doable transition (mostly likely of next port)
+ }
+''')
+ else:
+ code('''
+ scheduleEvent(Cycles(1));
+ // Cannot do anything with this transition, go check next doable
transition (mostly likely of next port)
+''')
+ code('''
}
+
}
''')
elif self.proc_name == "error":
diff --git a/src/mem/slicc/ast/InPortDeclAST.py
b/src/mem/slicc/ast/InPortDeclAST.py
index e0aa252..a3fdd5e 100644
--- a/src/mem/slicc/ast/InPortDeclAST.py
+++ b/src/mem/slicc/ast/InPortDeclAST.py
@@ -1,3 +1,15 @@
+# Copyright (c) 2020 ARM Limited
+# All rights reserved.
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
# Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
# Copyright (c) 2009 The Hewlett-Packard Development Company
# All rights reserved.
@@ -118,7 +130,9 @@
rcode = self.slicc.codeFormatter()
rcode.indent()
rcode.indent()
+ machine.curr_in_port_code_gen = in_port
self.statements.generate(rcode, None)
+ machine.curr_in_port_code_gen = None
in_port["c_code_in_port"] = str(rcode)
symtab.popFrame()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31265
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I3481d130d5eb411e6760a54d098d3da5de511c86
Gerrit-Change-Number: 31265
Gerrit-PatchSet: 1
Gerrit-Owner: Tiago Mück <tiago.m...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
