Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49735 )
(
60 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch: Update the default "func" value in the ISA parser.
......................................................................
arch: Update the default "func" value in the ISA parser.
Now that there is a unified (get|set)RegOperand accessor for all
register based operands, that can be used as a reasonable default in the
ISA parser code.
Change-Id: Icef62aa6c16fb8b929ee0fa0d60b23553e0bf515
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49735
Reviewed-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/isa_parser/operand_types.py
1 file changed, 31 insertions(+), 17 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/isa_parser/operand_types.py
b/src/arch/isa_parser/operand_types.py
index fbf8773..27e0ac7 100755
--- a/src/arch/isa_parser/operand_types.py
+++ b/src/arch/isa_parser/operand_types.py
@@ -103,7 +103,7 @@
src_reg_constructor = '\n\tsetSrcRegIdx(_numSrcRegs++, RegId(%s, %s));'
dst_reg_constructor = '\n\tsetDestRegIdx(_numDestRegs++,
RegId(%s, %s));'
- def buildReadCode(self, predRead, func=None):
+ def buildReadCode(self, predRead, func='getRegOperand'):
subst_dict = {"name": self.base_name,
"func": func,
"reg_idx": self.reg_spec,
@@ -114,7 +114,7 @@
code = self.read_code % subst_dict
return '%s = %s;\n' % (self.base_name, code)
- def buildWriteCode(self, predWrite, func=None):
+ def buildWriteCode(self, predWrite, func='setRegOperand'):
subst_dict = {"name": self.base_name,
"func": func,
"reg_idx": self.reg_spec,
@@ -231,7 +231,7 @@
class RegValOperand(RegOperand):
def makeRead(self, predRead):
if self.read_code != None:
- return self.buildReadCode(predRead, 'getRegOperand')
+ return self.buildReadCode(predRead)
if predRead:
rindex = '_sourceIndex++'
@@ -251,7 +251,7 @@
def makeWrite(self, predWrite):
if self.write_code != None:
- return self.buildWriteCode(predWrite, 'setRegOperand')
+ return self.buildWriteCode(predWrite)
reg_val = self.base_name
@@ -352,7 +352,7 @@
c_readw = f'\t\tauto &tmp_d{rindex} = \n' \
f'\t\t *({self.parser.namespace}::VecRegContainer
*)\n' \
- f'\t\t xc->{func}(this, {rindex});\n'
+ f'\t\t xc->getWritableRegOperand(this, {rindex});\n'
if self.elemExt:
c_readw += '\t\tauto %s = tmp_d%s.as<%s>();\n' %
(self.base_name,
rindex, self.parser.operandTypeMap[self.elemExt])
@@ -380,9 +380,8 @@
return c_read
def makeRead(self, predRead):
- func = 'getRegOperand'
if self.read_code != None:
- return self.buildReadCode(predRead, func)
+ return self.buildReadCode(predRead)
if predRead:
rindex = '_sourceIndex++'
@@ -395,7 +394,7 @@
c_read = f'\t\t{self.parser.namespace}::VecRegContainer ' \
f'\t\t tmp_s{rindex};\n' \
- f'\t\txc->{func}(this, {rindex}, &tmp_s{rindex});\n'
+ f'\t\txc->getRegOperand(this, {rindex},
&tmp_s{rindex});\n'
# If the parser has detected that elements are being access, create
# the appropriate view
if self.elemExt:
@@ -411,9 +410,8 @@
return c_read
def makeWrite(self, predWrite):
- func = 'setRegOperand'
if self.write_code != None:
- return self.buildWriteCode(predWrite, func)
+ return self.buildWriteCode(predWrite)
wb = '''
if (traceData) {
@@ -438,9 +436,8 @@
return ''
def makeRead(self, predRead):
- func = 'getRegOperand'
if self.read_code != None:
- return self.buildReadCode(predRead, func)
+ return self.buildReadCode(predRead)
if predRead:
rindex = '_sourceIndex++'
@@ -449,7 +446,7 @@
c_read = f'\t\t{self.parser.namespace}::VecPredRegContainer ' \
f'\t\t tmp_s{rindex}; ' \
- f'xc->{func}(this, {rindex}, &tmp_s{rindex});\n'
+ f'xc->getRegOperand(this, {rindex}, &tmp_s{rindex});\n'
if self.ext:
c_read += f'\t\tauto {self.base_name} = ' \
f'tmp_s{rindex}.as<' \
@@ -459,7 +456,7 @@
def makeReadW(self, predWrite):
func = 'getWritableRegOperand'
if self.read_code != None:
- return self.buildReadCode(predWrite, func)
+ return self.buildReadCode(predWrite, 'getWritableRegOperand')
if predWrite:
rindex = '_destIndex++'
@@ -468,7 +465,8 @@
c_readw = f'\t\tauto &tmp_d{rindex} = \n' \
f'\t\t *({self.parser.namespace}::' \
- f'VecPredRegContainer *)xc->{func}(this, {rindex});\n'
+ f'VecPredRegContainer *)xc->getWritableRegOperand(' \
+ f'this, {rindex});\n'
if self.ext:
c_readw += '\t\tauto %s = tmp_d%s.as<%s>();\n' % (
self.base_name, rindex,
@@ -476,9 +474,8 @@
return c_readw
def makeWrite(self, predWrite):
- func = 'setRegOperand'
if self.write_code != None:
- return self.buildWriteCode(predWrite, func)
+ return self.buildWriteCode(predWrite)
wb = '''
if (traceData) {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49735
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: Icef62aa6c16fb8b929ee0fa0d60b23553e0bf515
Gerrit-Change-Number: 49735
Gerrit-PatchSet: 62
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
