Hexagon HVX (target/hexagon) helper overrides infrastructure

Build the infrastructure to create overrides for HVX instructions.
We create a new empty file (gen_tcg_hvx.h) that will be populated
in subsequent patches.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Taylor Simpson <tsimpson@quicinc.com>
This commit is contained in:
Taylor Simpson 2021-05-18 12:01:09 -05:00
parent a82dd54862
commit d51bcabec1
6 changed files with 35 additions and 9 deletions

View File

@ -286,11 +286,12 @@ def main():
hex_common.read_semantics_file(sys.argv[1]) hex_common.read_semantics_file(sys.argv[1])
hex_common.read_attribs_file(sys.argv[2]) hex_common.read_attribs_file(sys.argv[2])
hex_common.read_overrides_file(sys.argv[3]) hex_common.read_overrides_file(sys.argv[3])
hex_common.read_overrides_file(sys.argv[4])
hex_common.calculate_attribs() hex_common.calculate_attribs()
tagregs = hex_common.get_tagregs() tagregs = hex_common.get_tagregs()
tagimms = hex_common.get_tagimms() tagimms = hex_common.get_tagimms()
with open(sys.argv[4], 'w') as f: with open(sys.argv[5], 'w') as f:
for tag in hex_common.tags: for tag in hex_common.tags:
## Skip the priv instructions ## Skip the priv instructions
if ( "A_PRIV" in hex_common.attribdict[tag] ) : if ( "A_PRIV" in hex_common.attribdict[tag] ) :

View File

@ -135,11 +135,12 @@ def main():
hex_common.read_semantics_file(sys.argv[1]) hex_common.read_semantics_file(sys.argv[1])
hex_common.read_attribs_file(sys.argv[2]) hex_common.read_attribs_file(sys.argv[2])
hex_common.read_overrides_file(sys.argv[3]) hex_common.read_overrides_file(sys.argv[3])
hex_common.read_overrides_file(sys.argv[4])
hex_common.calculate_attribs() hex_common.calculate_attribs()
tagregs = hex_common.get_tagregs() tagregs = hex_common.get_tagregs()
tagimms = hex_common.get_tagimms() tagimms = hex_common.get_tagimms()
with open(sys.argv[4], 'w') as f: with open(sys.argv[5], 'w') as f:
for tag in hex_common.tags: for tag in hex_common.tags:
## Skip the priv instructions ## Skip the priv instructions
if ( "A_PRIV" in hex_common.attribdict[tag] ) : if ( "A_PRIV" in hex_common.attribdict[tag] ) :

View File

@ -675,11 +675,12 @@ def main():
hex_common.read_semantics_file(sys.argv[1]) hex_common.read_semantics_file(sys.argv[1])
hex_common.read_attribs_file(sys.argv[2]) hex_common.read_attribs_file(sys.argv[2])
hex_common.read_overrides_file(sys.argv[3]) hex_common.read_overrides_file(sys.argv[3])
hex_common.read_overrides_file(sys.argv[4])
hex_common.calculate_attribs() hex_common.calculate_attribs()
tagregs = hex_common.get_tagregs() tagregs = hex_common.get_tagregs()
tagimms = hex_common.get_tagimms() tagimms = hex_common.get_tagimms()
with open(sys.argv[4], 'w') as f: with open(sys.argv[5], 'w') as f:
f.write("#ifndef HEXAGON_TCG_FUNCS_H\n") f.write("#ifndef HEXAGON_TCG_FUNCS_H\n")
f.write("#define HEXAGON_TCG_FUNCS_H\n\n") f.write("#define HEXAGON_TCG_FUNCS_H\n\n")

View File

@ -0,0 +1,21 @@
/*
* Copyright(c) 2019-2021 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/>.
*/
#ifndef HEXAGON_GEN_TCG_HVX_H
#define HEXAGON_GEN_TCG_HVX_H
#endif

View File

@ -26,6 +26,7 @@
#include "macros.h" #include "macros.h"
#undef QEMU_GENERATE #undef QEMU_GENERATE
#include "gen_tcg.h" #include "gen_tcg.h"
#include "gen_tcg_hvx.h"
static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot) static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot)
{ {

View File

@ -20,6 +20,7 @@ hexagon_ss = ss.source_set()
hex_common_py = 'hex_common.py' hex_common_py = 'hex_common.py'
attribs_def = meson.current_source_dir() / 'attribs_def.h.inc' attribs_def = meson.current_source_dir() / 'attribs_def.h.inc'
gen_tcg_h = meson.current_source_dir() / 'gen_tcg.h' gen_tcg_h = meson.current_source_dir() / 'gen_tcg.h'
gen_tcg_hvx_h = meson.current_source_dir() / 'gen_tcg_hvx.h'
# #
# Step 1 # Step 1
@ -63,8 +64,8 @@ helper_protos_generated = custom_target(
'helper_protos_generated.h.inc', 'helper_protos_generated.h.inc',
output: 'helper_protos_generated.h.inc', output: 'helper_protos_generated.h.inc',
depends: [semantics_generated], depends: [semantics_generated],
depend_files: [hex_common_py, attribs_def, gen_tcg_h], depend_files: [hex_common_py, attribs_def, gen_tcg_h, gen_tcg_hvx_h],
command: [python, files('gen_helper_protos.py'), semantics_generated, attribs_def, gen_tcg_h, '@OUTPUT@'], command: [python, files('gen_helper_protos.py'), semantics_generated, attribs_def, gen_tcg_h, gen_tcg_hvx_h, '@OUTPUT@'],
) )
hexagon_ss.add(helper_protos_generated) hexagon_ss.add(helper_protos_generated)
@ -72,8 +73,8 @@ tcg_funcs_generated = custom_target(
'tcg_funcs_generated.c.inc', 'tcg_funcs_generated.c.inc',
output: 'tcg_funcs_generated.c.inc', output: 'tcg_funcs_generated.c.inc',
depends: [semantics_generated], depends: [semantics_generated],
depend_files: [hex_common_py, attribs_def, gen_tcg_h], depend_files: [hex_common_py, attribs_def, gen_tcg_h, gen_tcg_hvx_h],
command: [python, files('gen_tcg_funcs.py'), semantics_generated, attribs_def, gen_tcg_h, '@OUTPUT@'], command: [python, files('gen_tcg_funcs.py'), semantics_generated, attribs_def, gen_tcg_h, gen_tcg_hvx_h, '@OUTPUT@'],
) )
hexagon_ss.add(tcg_funcs_generated) hexagon_ss.add(tcg_funcs_generated)
@ -90,8 +91,8 @@ helper_funcs_generated = custom_target(
'helper_funcs_generated.c.inc', 'helper_funcs_generated.c.inc',
output: 'helper_funcs_generated.c.inc', output: 'helper_funcs_generated.c.inc',
depends: [semantics_generated], depends: [semantics_generated],
depend_files: [hex_common_py, attribs_def, gen_tcg_h], depend_files: [hex_common_py, attribs_def, gen_tcg_h, gen_tcg_hvx_h],
command: [python, files('gen_helper_funcs.py'), semantics_generated, attribs_def, gen_tcg_h, '@OUTPUT@'], command: [python, files('gen_helper_funcs.py'), semantics_generated, attribs_def, gen_tcg_h, gen_tcg_hvx_h, '@OUTPUT@'],
) )
hexagon_ss.add(helper_funcs_generated) hexagon_ss.add(helper_funcs_generated)