| Message ID | 20240307032327.4799-8-ltaylorsimpson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Clean up .new decode and scripts | expand |
> -----Original Message----- > From: Taylor Simpson <ltaylorsimpson@gmail.com> > Sent: Wednesday, March 6, 2024 9:23 PM > To: qemu-devel@nongnu.org > Cc: Brian Cain <bcain@quicinc.com>; Matheus Bernardino (QUIC) > <quic_mathbern@quicinc.com>; Sid Manning <sidneym@quicinc.com>; > Marco Liebel (QUIC) <quic_mliebel@quicinc.com>; > richard.henderson@linaro.org; philmd@linaro.org; ale@rev.ng; anjo@rev.ng; > ltaylorsimpson@gmail.com > Subject: [PATCH v2 7/9] Hexagon (target/hexagon) Remove gen_op_regs.py > > WARNING: This email originated from outside of Qualcomm. Please be wary > of any links or attachments, and do not enable macros. > > Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com> > --- Reviewed-by: Brian Cain <bcain@quicinc.com> > target/hexagon/README | 1 - > target/hexagon/gen_op_regs.py | 125 ---------------------------------- > target/hexagon/meson.build | 14 +--- > 3 files changed, 2 insertions(+), 138 deletions(-) > delete mode 100755 target/hexagon/gen_op_regs.py > > diff --git a/target/hexagon/README b/target/hexagon/README > index 746ebec378..065c05154d 100644 > --- a/target/hexagon/README > +++ b/target/hexagon/README > @@ -43,7 +43,6 @@ target/hexagon/gen_semantics.c. This step produces > That file is consumed by the following python scripts to produce the indicated > header files in <BUILD_DIR>/target/hexagon > gen_opcodes_def.py -> opcodes_def_generated.h.inc > - gen_op_regs.py -> op_regs_generated.h.inc > gen_printinsn.py -> printinsn_generated.h.inc > gen_op_attribs.py -> op_attribs_generated.h.inc > gen_helper_protos.py -> helper_protos_generated.h.inc > diff --git a/target/hexagon/gen_op_regs.py b/target/hexagon/gen_op_regs.py > deleted file mode 100755 > index 7b7b33895a..0000000000 > --- a/target/hexagon/gen_op_regs.py > +++ /dev/null > @@ -1,125 +0,0 @@ > -#!/usr/bin/env python3 > - > -## > -## Copyright(c) 2019-2023 Qualcomm Innovation Center, Inc. All Rights > Reserved. > -## > -## This program is free software; you can redistribute it and/or modify > -## it under the terms of the GNU General Public License as published by > -## the Free Software Foundation; either version 2 of the License, or > -## (at your option) any later version. > -## > -## This program is distributed in the hope that it will be useful, > -## but WITHOUT ANY WARRANTY; without even the implied warranty of > -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > -## GNU General Public License for more details. > -## > -## You should have received a copy of the GNU General Public License > -## along with this program; if not, see <http://www.gnu.org/licenses/>. > -## > - > -import sys > -import re > -import string > -import hex_common > - > - > -## > -## Generate the register and immediate operands for each instruction > -## > -def calculate_regid_reg(tag): > - def letter_inc(x): > - return chr(ord(x) + 1) > - > - ordered_implregs = ["SP", "FP", "LR"] > - srcdst_lett = "X" > - src_lett = "S" > - dst_lett = "D" > - retstr = "" > - mapdict = {} > - for reg in ordered_implregs: > - reg_rd = 0 > - reg_wr = 0 > - if ("A_IMPLICIT_WRITES_" + reg) in hex_common.attribdict[tag]: > - reg_wr = 1 > - if reg_rd and reg_wr: > - retstr += srcdst_lett > - mapdict[srcdst_lett] = reg > - srcdst_lett = letter_inc(srcdst_lett) > - elif reg_rd: > - retstr += src_lett > - mapdict[src_lett] = reg > - src_lett = letter_inc(src_lett) > - elif reg_wr: > - retstr += dst_lett > - mapdict[dst_lett] = reg > - dst_lett = letter_inc(dst_lett) > - return retstr, mapdict > - > - > -def calculate_regid_letters(tag): > - retstr, mapdict = calculate_regid_reg(tag) > - return retstr > - > - > -def strip_reg_prefix(x): > - y = x.replace("UREG.", "") > - y = y.replace("MREG.", "") > - return y.replace("GREG.", "") > - > - > -def main(): > - hex_common.read_semantics_file(sys.argv[1]) > - hex_common.read_attribs_file(sys.argv[2]) > - hex_common.init_registers() > - tagregs = hex_common.get_tagregs(full=True) > - tagimms = hex_common.get_tagimms() > - > - with open(sys.argv[3], "w") as f: > - for tag in hex_common.tags: > - regs = tagregs[tag] > - rregs = [] > - wregs = [] > - regids = "" > - for regtype, regid, _, numregs in regs: > - reg = hex_common.get_register(tag, regtype, regid) > - if reg.is_read(): > - if regid[0] not in regids: > - regids += regid[0] > - rregs.append(regtype + regid + numregs) > - if reg.is_written(): > - wregs.append(regtype + regid + numregs) > - if regid[0] not in regids: > - regids += regid[0] > - for attrib in hex_common.attribdict[tag]: > - if hex_common.attribinfo[attrib]["rreg"]: > - rregs.append(strip_reg_prefix(attribinfo[attrib]["rreg"])) > - if hex_common.attribinfo[attrib]["wreg"]: > - wregs.append(strip_reg_prefix(attribinfo[attrib]["wreg"])) > - regids += calculate_regid_letters(tag) > - f.write( > - f'REGINFO({tag},"{regids}",\t/*RD:*/\t"{",".join(rregs)}",' > - f'\t/*WR:*/\t"{",".join(wregs)}")\n' > - ) > - > - for tag in hex_common.tags: > - imms = tagimms[tag] > - f.write(f"IMMINFO({tag}") > - if not imms: > - f.write(""",'u',0,0,'U',0,0""") > - for sign, size, shamt in imms: > - if sign == "r": > - sign = "s" > - if not shamt: > - shamt = "0" > - f.write(f""",'{sign}',{size},{shamt}""") > - if len(imms) == 1: > - if sign.isupper(): > - myu = "u" > - else: > - myu = "U" > - f.write(f""",'{myu}',0,0""") > - f.write(")\n") > - > - > -if __name__ == "__main__": > - main() > diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build > index fb480afc03..b3a0944d3b 100644 > --- a/target/hexagon/meson.build > +++ b/target/hexagon/meson.build > @@ -1,5 +1,5 @@ > ## > -## Copyright(c) 2020-2023 Qualcomm Innovation Center, Inc. All Rights > Reserved. > +## Copyright(c) 2020-2024 Qualcomm Innovation Center, Inc. All Rights > Reserved. > ## > ## This program is free software; you can redistribute it and/or modify > ## it under the terms of the GNU General Public License as published by > @@ -45,7 +45,6 @@ hexagon_ss.add(semantics_generated) > # shortcode_generated.h.inc > # tcg_func_table_generated.c.inc > # printinsn_generated.h.inc > -# op_regs_generated.h.inc > # op_attribs_generated.h.inc > # opcodes_def_generated.h.inc > # > @@ -76,15 +75,6 @@ printinsn_generated = custom_target( > ) > hexagon_ss.add(printinsn_generated) > > -op_regs_generated = custom_target( > - 'op_regs_generated.h.inc', > - output: 'op_regs_generated.h.inc', > - depends: [semantics_generated], > - depend_files: [hex_common_py, attribs_def], > - command: [python, files('gen_op_regs.py'), semantics_generated, > attribs_def, '@OUTPUT@'], > -) > -hexagon_ss.add(op_regs_generated) > - > op_attribs_generated = custom_target( > 'op_attribs_generated.h.inc', > output: 'op_attribs_generated.h.inc', > @@ -110,7 +100,7 @@ hexagon_ss.add(opcodes_def_generated) > # > gen_dectree_import = executable( > 'gen_dectree_import', > - 'gen_dectree_import.c', opcodes_def_generated, op_regs_generated, > + 'gen_dectree_import.c', opcodes_def_generated, > native: true, build_by_default: false) > > iset_py = custom_target( > -- > 2.34.1
diff --git a/target/hexagon/README b/target/hexagon/README index 746ebec378..065c05154d 100644 --- a/target/hexagon/README +++ b/target/hexagon/README @@ -43,7 +43,6 @@ target/hexagon/gen_semantics.c. This step produces That file is consumed by the following python scripts to produce the indicated header files in <BUILD_DIR>/target/hexagon gen_opcodes_def.py -> opcodes_def_generated.h.inc - gen_op_regs.py -> op_regs_generated.h.inc gen_printinsn.py -> printinsn_generated.h.inc gen_op_attribs.py -> op_attribs_generated.h.inc gen_helper_protos.py -> helper_protos_generated.h.inc diff --git a/target/hexagon/gen_op_regs.py b/target/hexagon/gen_op_regs.py deleted file mode 100755 index 7b7b33895a..0000000000 --- a/target/hexagon/gen_op_regs.py +++ /dev/null @@ -1,125 +0,0 @@ -#!/usr/bin/env python3 - -## -## Copyright(c) 2019-2023 Qualcomm Innovation Center, Inc. All Rights Reserved. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, see <http://www.gnu.org/licenses/>. -## - -import sys -import re -import string -import hex_common - - -## -## Generate the register and immediate operands for each instruction -## -def calculate_regid_reg(tag): - def letter_inc(x): - return chr(ord(x) + 1) - - ordered_implregs = ["SP", "FP", "LR"] - srcdst_lett = "X" - src_lett = "S" - dst_lett = "D" - retstr = "" - mapdict = {} - for reg in ordered_implregs: - reg_rd = 0 - reg_wr = 0 - if ("A_IMPLICIT_WRITES_" + reg) in hex_common.attribdict[tag]: - reg_wr = 1 - if reg_rd and reg_wr: - retstr += srcdst_lett - mapdict[srcdst_lett] = reg - srcdst_lett = letter_inc(srcdst_lett) - elif reg_rd: - retstr += src_lett - mapdict[src_lett] = reg - src_lett = letter_inc(src_lett) - elif reg_wr: - retstr += dst_lett - mapdict[dst_lett] = reg - dst_lett = letter_inc(dst_lett) - return retstr, mapdict - - -def calculate_regid_letters(tag): - retstr, mapdict = calculate_regid_reg(tag) - return retstr - - -def strip_reg_prefix(x): - y = x.replace("UREG.", "") - y = y.replace("MREG.", "") - return y.replace("GREG.", "") - - -def main(): - hex_common.read_semantics_file(sys.argv[1]) - hex_common.read_attribs_file(sys.argv[2]) - hex_common.init_registers() - tagregs = hex_common.get_tagregs(full=True) - tagimms = hex_common.get_tagimms() - - with open(sys.argv[3], "w") as f: - for tag in hex_common.tags: - regs = tagregs[tag] - rregs = [] - wregs = [] - regids = "" - for regtype, regid, _, numregs in regs: - reg = hex_common.get_register(tag, regtype, regid) - if reg.is_read(): - if regid[0] not in regids: - regids += regid[0] - rregs.append(regtype + regid + numregs) - if reg.is_written(): - wregs.append(regtype + regid + numregs) - if regid[0] not in regids: - regids += regid[0] - for attrib in hex_common.attribdict[tag]: - if hex_common.attribinfo[attrib]["rreg"]: - rregs.append(strip_reg_prefix(attribinfo[attrib]["rreg"])) - if hex_common.attribinfo[attrib]["wreg"]: - wregs.append(strip_reg_prefix(attribinfo[attrib]["wreg"])) - regids += calculate_regid_letters(tag) - f.write( - f'REGINFO({tag},"{regids}",\t/*RD:*/\t"{",".join(rregs)}",' - f'\t/*WR:*/\t"{",".join(wregs)}")\n' - ) - - for tag in hex_common.tags: - imms = tagimms[tag] - f.write(f"IMMINFO({tag}") - if not imms: - f.write(""",'u',0,0,'U',0,0""") - for sign, size, shamt in imms: - if sign == "r": - sign = "s" - if not shamt: - shamt = "0" - f.write(f""",'{sign}',{size},{shamt}""") - if len(imms) == 1: - if sign.isupper(): - myu = "u" - else: - myu = "U" - f.write(f""",'{myu}',0,0""") - f.write(")\n") - - -if __name__ == "__main__": - main() diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index fb480afc03..b3a0944d3b 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -1,5 +1,5 @@ ## -## Copyright(c) 2020-2023 Qualcomm Innovation Center, Inc. All Rights Reserved. +## Copyright(c) 2020-2024 Qualcomm Innovation Center, Inc. All Rights Reserved. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -45,7 +45,6 @@ hexagon_ss.add(semantics_generated) # shortcode_generated.h.inc # tcg_func_table_generated.c.inc # printinsn_generated.h.inc -# op_regs_generated.h.inc # op_attribs_generated.h.inc # opcodes_def_generated.h.inc # @@ -76,15 +75,6 @@ printinsn_generated = custom_target( ) hexagon_ss.add(printinsn_generated) -op_regs_generated = custom_target( - 'op_regs_generated.h.inc', - output: 'op_regs_generated.h.inc', - depends: [semantics_generated], - depend_files: [hex_common_py, attribs_def], - command: [python, files('gen_op_regs.py'), semantics_generated, attribs_def, '@OUTPUT@'], -) -hexagon_ss.add(op_regs_generated) - op_attribs_generated = custom_target( 'op_attribs_generated.h.inc', output: 'op_attribs_generated.h.inc', @@ -110,7 +100,7 @@ hexagon_ss.add(opcodes_def_generated) # gen_dectree_import = executable( 'gen_dectree_import', - 'gen_dectree_import.c', opcodes_def_generated, op_regs_generated, + 'gen_dectree_import.c', opcodes_def_generated, native: true, build_by_default: false) iset_py = custom_target(
Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com> --- target/hexagon/README | 1 - target/hexagon/gen_op_regs.py | 125 ---------------------------------- target/hexagon/meson.build | 14 +--- 3 files changed, 2 insertions(+), 138 deletions(-) delete mode 100755 target/hexagon/gen_op_regs.py