target/arm: Implement fp16 for Neon VRINTX

Convert the Neon VRINTX insn to use gvec, and use this to implement
fp16 support for it.

Backports 23afcdd2511f2a3dc05bed650d27bd25cf9b2a3c
This commit is contained in:
Peter Maydell 2021-03-01 17:47:23 -05:00 committed by Lioncash
parent 53aba9d900
commit 681218b4ab
19 changed files with 41 additions and 43 deletions

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_aarch64
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_aarch64
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_aarch64
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_aarch64
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_aarch64
#define helper_power_down helper_power_down_aarch64
#define helper_pre_hvc helper_pre_hvc_aarch64
#define helper_pre_smc helper_pre_smc_aarch64

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_aarch64eb
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_aarch64eb
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_aarch64eb
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_aarch64eb
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_aarch64eb
#define helper_power_down helper_power_down_aarch64eb
#define helper_pre_hvc helper_pre_hvc_aarch64eb
#define helper_pre_smc helper_pre_smc_aarch64eb

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_arm
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_arm
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_arm
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_arm
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_arm
#define helper_power_down helper_power_down_arm
#define helper_pre_hvc helper_pre_hvc_arm
#define helper_pre_smc helper_pre_smc_arm

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_armeb
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_armeb
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_armeb
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_armeb
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_armeb
#define helper_power_down helper_power_down_armeb
#define helper_pre_hvc helper_pre_hvc_armeb
#define helper_pre_smc helper_pre_smc_armeb

View file

@ -1856,6 +1856,8 @@ symbols = (
'helper_gvec_vcvt_rm_uh',
'helper_gvec_vrint_rm_h',
'helper_gvec_vrint_rm_s',
'helper_gvec_vrintx_h',
'helper_gvec_vrintx_s',
'helper_power_down',
'helper_pre_hvc',
'helper_pre_smc',

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_m68k
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_m68k
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_m68k
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_m68k
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_m68k
#define helper_power_down helper_power_down_m68k
#define helper_pre_hvc helper_pre_hvc_m68k
#define helper_pre_smc helper_pre_smc_m68k

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_mips
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_mips
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_mips
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_mips
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_mips
#define helper_power_down helper_power_down_mips
#define helper_pre_hvc helper_pre_hvc_mips
#define helper_pre_smc helper_pre_smc_mips

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_mips64
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_mips64
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_mips64
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_mips64
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_mips64
#define helper_power_down helper_power_down_mips64
#define helper_pre_hvc helper_pre_hvc_mips64
#define helper_pre_smc helper_pre_smc_mips64

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_mips64el
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_mips64el
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_mips64el
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_mips64el
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_mips64el
#define helper_power_down helper_power_down_mips64el
#define helper_pre_hvc helper_pre_hvc_mips64el
#define helper_pre_smc helper_pre_smc_mips64el

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_mipsel
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_mipsel
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_mipsel
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_mipsel
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_mipsel
#define helper_power_down helper_power_down_mipsel
#define helper_pre_hvc helper_pre_hvc_mipsel
#define helper_pre_smc helper_pre_smc_mipsel

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_powerpc
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_powerpc
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_powerpc
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_powerpc
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_powerpc
#define helper_power_down helper_power_down_powerpc
#define helper_pre_hvc helper_pre_hvc_powerpc
#define helper_pre_smc helper_pre_smc_powerpc

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_riscv32
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_riscv32
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_riscv32
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_riscv32
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_riscv32
#define helper_power_down helper_power_down_riscv32
#define helper_pre_hvc helper_pre_hvc_riscv32
#define helper_pre_smc helper_pre_smc_riscv32

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_riscv64
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_riscv64
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_riscv64
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_riscv64
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_riscv64
#define helper_power_down helper_power_down_riscv64
#define helper_pre_hvc helper_pre_hvc_riscv64
#define helper_pre_smc helper_pre_smc_riscv64

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_sparc
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_sparc
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_sparc
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_sparc
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_sparc
#define helper_power_down helper_power_down_sparc
#define helper_pre_hvc helper_pre_hvc_sparc
#define helper_pre_smc helper_pre_smc_sparc

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_sparc64
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_sparc64
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_sparc64
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_sparc64
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_sparc64
#define helper_power_down helper_power_down_sparc64
#define helper_pre_hvc helper_pre_hvc_sparc64
#define helper_pre_smc helper_pre_smc_sparc64

View file

@ -638,6 +638,9 @@ DEF_HELPER_FLAGS_4(gvec_vcvt_rm_uh, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_vrint_rm_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_vrint_rm_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_vrintx_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_vrintx_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_frecpe_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_frecpe_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(gvec_frecpe_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)

View file

@ -3729,48 +3729,6 @@ static bool trans_VQNEG(DisasContext *s, arg_2misc *a)
return do_2misc(s, a, fn[a->size]);
}
static bool do_2misc_fp(DisasContext *s, arg_2misc *a,
NeonGenOneSingleOpFn *fn)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
int pass;
TCGv_ptr fpst;
/* Handle a 2-reg-misc operation by iterating 32 bits at a time */
if (!arm_dc_feature(s, ARM_FEATURE_NEON)) {
return false;
}
/* UNDEF accesses to D16-D31 if they don't exist. */
if (!dc_isar_feature(aa32_simd_r32, s) &&
((a->vd | a->vm) & 0x10)) {
return false;
}
if (a->size != 2) {
/* TODO: FP16 will be the size == 1 case */
return false;
}
if ((a->vd | a->vm) & a->q) {
return false;
}
if (!vfp_access_check(s)) {
return true;
}
fpst = fpstatus_ptr(tcg_ctx, FPST_STD);
for (pass = 0; pass < (a->q ? 4 : 2); pass++) {
TCGv_i32 tmp = neon_load_reg(s, a->vm, pass);
fn(tcg_ctx, tmp, tmp, fpst);
neon_store_reg(s, a->vd, pass, tmp);
}
tcg_temp_free_ptr(tcg_ctx, fpst);
return true;
}
#define DO_2MISC_FP_VEC(INSN, HFUNC, SFUNC) \
static void gen_##INSN(TCGContext *s, unsigned vece, uint32_t rd_ofs, \
uint32_t rm_ofs, \
@ -3809,12 +3767,14 @@ DO_2MISC_FP_VEC(VCVT_FU, gen_helper_gvec_ustoh, gen_helper_gvec_uitos)
DO_2MISC_FP_VEC(VCVT_SF, gen_helper_gvec_tosszh, gen_helper_gvec_tosizs)
DO_2MISC_FP_VEC(VCVT_UF, gen_helper_gvec_touszh, gen_helper_gvec_touizs)
DO_2MISC_FP_VEC(VRINTX_impl, gen_helper_gvec_vrintx_h, gen_helper_gvec_vrintx_s)
static bool trans_VRINTX(DisasContext *s, arg_2misc *a)
{
if (!arm_dc_feature(s, ARM_FEATURE_V8)) {
return false;
}
return do_2misc_fp(s, a, gen_helper_rints_exact);
return trans_VRINTX_impl(s, a);
}
#define DO_VEC_RMODE(INSN, RMODE, OP) \

View file

@ -751,6 +751,9 @@ DO_2OP(gvec_frsqrte_h, helper_rsqrte_f16, float16)
DO_2OP(gvec_frsqrte_s, helper_rsqrte_f32, float32)
DO_2OP(gvec_frsqrte_d, helper_rsqrte_f64, float64)
DO_2OP(gvec_vrintx_h, float16_round_to_int, float16)
DO_2OP(gvec_vrintx_s, float32_round_to_int, float32)
DO_2OP(gvec_sitos, helper_vfp_sitos, int32_t)
DO_2OP(gvec_uitos, helper_vfp_uitos, uint32_t)
DO_2OP(gvec_tosizs, helper_vfp_tosizs, float32)

View file

@ -1850,6 +1850,8 @@
#define helper_gvec_vcvt_rm_uh helper_gvec_vcvt_rm_uh_x86_64
#define helper_gvec_vrint_rm_h helper_gvec_vrint_rm_h_x86_64
#define helper_gvec_vrint_rm_s helper_gvec_vrint_rm_s_x86_64
#define helper_gvec_vrintx_h helper_gvec_vrintx_h_x86_64
#define helper_gvec_vrintx_s helper_gvec_vrintx_s_x86_64
#define helper_power_down helper_power_down_x86_64
#define helper_pre_hvc helper_pre_hvc_x86_64
#define helper_pre_smc helper_pre_smc_x86_64