Message ID | 20240307032327.4799-9-ltaylorsimpson@gmail.com |
---|---|
State | New |
Headers | show |
Series | Clean up .new decode and scripts | expand |
On 7/3/24 04:23, Taylor Simpson wrote: > This data structure is not used > > Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com> > --- > target/hexagon/opcodes.c | 7 ---- > target/hexagon/README | 1 - > target/hexagon/gen_shortcode.py | 63 --------------------------------- > target/hexagon/meson.build | 10 ------ > 4 files changed, 81 deletions(-) > delete mode 100755 target/hexagon/gen_shortcode.py Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> -----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 8/9] Hexagon (target/hexagon) Remove gen_shortcode.py > > WARNING: This email originated from outside of Qualcomm. Please be wary > of any links or attachments, and do not enable macros. > > This data structure is not used > > Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com> > --- Reviewed-by: Brian Cain <bcain@quicinc.com> > target/hexagon/opcodes.c | 7 ---- > target/hexagon/README | 1 - > target/hexagon/gen_shortcode.py | 63 --------------------------------- > target/hexagon/meson.build | 10 ------ > 4 files changed, 81 deletions(-) > delete mode 100755 target/hexagon/gen_shortcode.py > > diff --git a/target/hexagon/opcodes.c b/target/hexagon/opcodes.c > index 02ae9cf787..c8bde2f9e9 100644 > --- a/target/hexagon/opcodes.c > +++ b/target/hexagon/opcodes.c > @@ -37,13 +37,6 @@ const char * const opcode_names[] = { > }; > > > -const char * const opcode_short_semantics[] = { > -#define DEF_SHORTCODE(TAG, SHORTCODE) [TAG] = #SHORTCODE, > -#include "shortcode_generated.h.inc" > -#undef DEF_SHORTCODE > - NULL > -}; > - > DECLARE_BITMAP(opcode_attribs[XX_LAST_OPCODE], A_ZZ_LASTATTRIB); > > static void init_attribs(int tag, ...) > diff --git a/target/hexagon/README b/target/hexagon/README > index 065c05154d..65b4fcc0fa 100644 > --- a/target/hexagon/README > +++ b/target/hexagon/README > @@ -46,7 +46,6 @@ header files in <BUILD_DIR>/target/hexagon > 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 > - gen_shortcode.py -> shortcode_generated.h.inc > gen_tcg_funcs.py -> tcg_funcs_generated.c.inc > gen_tcg_func_table.py -> tcg_func_table_generated.c.inc > gen_helper_funcs.py -> helper_funcs_generated.c.inc > diff --git a/target/hexagon/gen_shortcode.py > b/target/hexagon/gen_shortcode.py > deleted file mode 100755 > index deb94446c4..0000000000 > --- a/target/hexagon/gen_shortcode.py > +++ /dev/null > @@ -1,63 +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 > - > - > -def gen_shortcode(f, tag): > - f.write(f"DEF_SHORTCODE({tag}, {hex_common.semdict[tag]})\n") > - > - > -def main(): > - hex_common.read_semantics_file(sys.argv[1]) > - hex_common.read_attribs_file(sys.argv[2]) > - hex_common.calculate_attribs() > - tagregs = hex_common.get_tagregs() > - tagimms = hex_common.get_tagimms() > - > - with open(sys.argv[3], "w") as f: > - f.write("#ifndef DEF_SHORTCODE\n") > - f.write("#define DEF_SHORTCODE(TAG,SHORTCODE) /* Nothing */\n") > - f.write("#endif\n") > - > - for tag in hex_common.tags: > - ## Skip the priv instructions > - if "A_PRIV" in hex_common.attribdict[tag]: > - continue > - ## Skip the guest instructions > - if "A_GUEST" in hex_common.attribdict[tag]: > - continue > - ## Skip the diag instructions > - if tag == "Y6_diag": > - continue > - if tag == "Y6_diag0": > - continue > - if tag == "Y6_diag1": > - continue > - > - gen_shortcode(f, tag) > - > - f.write("#undef DEF_SHORTCODE\n") > - > - > -if __name__ == "__main__": > - main() > diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build > index b3a0944d3b..988e7489ba 100644 > --- a/target/hexagon/meson.build > +++ b/target/hexagon/meson.build > @@ -42,21 +42,11 @@ hexagon_ss.add(semantics_generated) > # > # Step 2 > # We use Python scripts to generate the following files > -# shortcode_generated.h.inc > # tcg_func_table_generated.c.inc > # printinsn_generated.h.inc > # op_attribs_generated.h.inc > # opcodes_def_generated.h.inc > # > -shortcode_generated = custom_target( > - 'shortcode_generated.h.inc', > - output: 'shortcode_generated.h.inc', > - depends: [semantics_generated], > - depend_files: [hex_common_py, attribs_def], > - command: [python, files('gen_shortcode.py'), semantics_generated, > attribs_def, '@OUTPUT@'], > -) > -hexagon_ss.add(shortcode_generated) > - > tcg_func_table_generated = custom_target( > 'tcg_func_table_generated.c.inc', > output: 'tcg_func_table_generated.c.inc', > -- > 2.34.1
diff --git a/target/hexagon/opcodes.c b/target/hexagon/opcodes.c index 02ae9cf787..c8bde2f9e9 100644 --- a/target/hexagon/opcodes.c +++ b/target/hexagon/opcodes.c @@ -37,13 +37,6 @@ const char * const opcode_names[] = { }; -const char * const opcode_short_semantics[] = { -#define DEF_SHORTCODE(TAG, SHORTCODE) [TAG] = #SHORTCODE, -#include "shortcode_generated.h.inc" -#undef DEF_SHORTCODE - NULL -}; - DECLARE_BITMAP(opcode_attribs[XX_LAST_OPCODE], A_ZZ_LASTATTRIB); static void init_attribs(int tag, ...) diff --git a/target/hexagon/README b/target/hexagon/README index 065c05154d..65b4fcc0fa 100644 --- a/target/hexagon/README +++ b/target/hexagon/README @@ -46,7 +46,6 @@ header files in <BUILD_DIR>/target/hexagon 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 - gen_shortcode.py -> shortcode_generated.h.inc gen_tcg_funcs.py -> tcg_funcs_generated.c.inc gen_tcg_func_table.py -> tcg_func_table_generated.c.inc gen_helper_funcs.py -> helper_funcs_generated.c.inc diff --git a/target/hexagon/gen_shortcode.py b/target/hexagon/gen_shortcode.py deleted file mode 100755 index deb94446c4..0000000000 --- a/target/hexagon/gen_shortcode.py +++ /dev/null @@ -1,63 +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 - - -def gen_shortcode(f, tag): - f.write(f"DEF_SHORTCODE({tag}, {hex_common.semdict[tag]})\n") - - -def main(): - hex_common.read_semantics_file(sys.argv[1]) - hex_common.read_attribs_file(sys.argv[2]) - hex_common.calculate_attribs() - tagregs = hex_common.get_tagregs() - tagimms = hex_common.get_tagimms() - - with open(sys.argv[3], "w") as f: - f.write("#ifndef DEF_SHORTCODE\n") - f.write("#define DEF_SHORTCODE(TAG,SHORTCODE) /* Nothing */\n") - f.write("#endif\n") - - for tag in hex_common.tags: - ## Skip the priv instructions - if "A_PRIV" in hex_common.attribdict[tag]: - continue - ## Skip the guest instructions - if "A_GUEST" in hex_common.attribdict[tag]: - continue - ## Skip the diag instructions - if tag == "Y6_diag": - continue - if tag == "Y6_diag0": - continue - if tag == "Y6_diag1": - continue - - gen_shortcode(f, tag) - - f.write("#undef DEF_SHORTCODE\n") - - -if __name__ == "__main__": - main() diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build index b3a0944d3b..988e7489ba 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -42,21 +42,11 @@ hexagon_ss.add(semantics_generated) # # Step 2 # We use Python scripts to generate the following files -# shortcode_generated.h.inc # tcg_func_table_generated.c.inc # printinsn_generated.h.inc # op_attribs_generated.h.inc # opcodes_def_generated.h.inc # -shortcode_generated = custom_target( - 'shortcode_generated.h.inc', - output: 'shortcode_generated.h.inc', - depends: [semantics_generated], - depend_files: [hex_common_py, attribs_def], - command: [python, files('gen_shortcode.py'), semantics_generated, attribs_def, '@OUTPUT@'], -) -hexagon_ss.add(shortcode_generated) - tcg_func_table_generated = custom_target( 'tcg_func_table_generated.c.inc', output: 'tcg_func_table_generated.c.inc',
This data structure is not used Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com> --- target/hexagon/opcodes.c | 7 ---- target/hexagon/README | 1 - target/hexagon/gen_shortcode.py | 63 --------------------------------- target/hexagon/meson.build | 10 ------ 4 files changed, 81 deletions(-) delete mode 100755 target/hexagon/gen_shortcode.py