diff --git a/qemu/aarch64.h b/qemu/aarch64.h index 19b99c8f..953d9923 100644 --- a/qemu/aarch64.h +++ b/qemu/aarch64.h @@ -3356,6 +3356,9 @@ #define helper_sve_fneg_d helper_sve_fneg_d_aarch64 #define helper_sve_fneg_h helper_sve_fneg_h_aarch64 #define helper_sve_fneg_s helper_sve_fneg_s_aarch64 +#define helper_sve_ftssel_d helper_sve_ftssel_d_aarch64 +#define helper_sve_ftssel_h helper_sve_ftssel_h_aarch64 +#define helper_sve_ftssel_s helper_sve_ftssel_s_aarch64 #define helper_sve_index_b helper_sve_index_b_aarch64 #define helper_sve_index_d helper_sve_index_d_aarch64 #define helper_sve_index_h helper_sve_index_h_aarch64 diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h index b941bfae..a7db9ca2 100644 --- a/qemu/aarch64eb.h +++ b/qemu/aarch64eb.h @@ -3356,6 +3356,9 @@ #define helper_sve_fneg_d helper_sve_fneg_d_aarch64eb #define helper_sve_fneg_h helper_sve_fneg_h_aarch64eb #define helper_sve_fneg_s helper_sve_fneg_s_aarch64eb +#define helper_sve_ftssel_d helper_sve_ftssel_d_aarch64eb +#define helper_sve_ftssel_h helper_sve_ftssel_h_aarch64eb +#define helper_sve_ftssel_s helper_sve_ftssel_s_aarch64eb #define helper_sve_index_b helper_sve_index_b_aarch64eb #define helper_sve_index_d helper_sve_index_d_aarch64eb #define helper_sve_index_h helper_sve_index_h_aarch64eb diff --git a/qemu/header_gen.py b/qemu/header_gen.py index 1d77dca5..b4389114 100644 --- a/qemu/header_gen.py +++ b/qemu/header_gen.py @@ -3377,6 +3377,9 @@ aarch64_symbols = ( 'helper_sve_fneg_d', 'helper_sve_fneg_h', 'helper_sve_fneg_s', + 'helper_sve_ftssel_d', + 'helper_sve_ftssel_h', + 'helper_sve_ftssel_s', 'helper_sve_index_b', 'helper_sve_index_d', 'helper_sve_index_h', diff --git a/qemu/target/arm/helper-sve.h b/qemu/target/arm/helper-sve.h index e2925ff8..4f1bd5a6 100644 --- a/qemu/target/arm/helper-sve.h +++ b/qemu/target/arm/helper-sve.h @@ -389,6 +389,10 @@ DEF_HELPER_FLAGS_3(sve_fexpa_h, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sve_fexpa_s, TCG_CALL_NO_RWG, void, ptr, ptr, i32) DEF_HELPER_FLAGS_3(sve_fexpa_d, TCG_CALL_NO_RWG, void, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(sve_ftssel_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(sve_ftssel_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) +DEF_HELPER_FLAGS_4(sve_ftssel_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32) + DEF_HELPER_FLAGS_5(sve_and_pppp, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_5(sve_bic_pppp, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) DEF_HELPER_FLAGS_5(sve_eor_pppp, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32) diff --git a/qemu/target/arm/sve.decode b/qemu/target/arm/sve.decode index d57647aa..efeb4eda 100644 --- a/qemu/target/arm/sve.decode +++ b/qemu/target/arm/sve.decode @@ -295,6 +295,10 @@ ADR_p64 00000100 11 1 ..... 1010 .. ..... ..... @rd_rn_msz_rm # Note esz != 0 FEXPA 00000100 .. 1 00000 101110 ..... ..... @rd_rn +# SVE floating-point trig select coefficient +# Note esz != 0 +FTSSEL 00000100 .. 1 ..... 101100 ..... ..... @rd_rn_rm + ### SVE Predicate Logical Operations Group # SVE predicate logical operations diff --git a/qemu/target/arm/sve_helper.c b/qemu/target/arm/sve_helper.c index a3552d84..580a70dc 100644 --- a/qemu/target/arm/sve_helper.c +++ b/qemu/target/arm/sve_helper.c @@ -23,6 +23,7 @@ #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" +#include "fpu/softfloat.h" /* Note that vector data is stored in host-endian 64-bit chunks, so addressing units smaller than that needs a host-endian fixup. */ @@ -1191,3 +1192,45 @@ void HELPER(sve_fexpa_d)(void *vd, void *vn, uint32_t desc) d[i] = coeff[idx] | (exp << 52); } } + +void HELPER(sve_ftssel_h)(void *vd, void *vn, void *vm, uint32_t desc) +{ + intptr_t i, opr_sz = simd_oprsz(desc) / 2; + uint16_t *d = vd, *n = vn, *m = vm; + for (i = 0; i < opr_sz; i += 1) { + uint16_t nn = n[i]; + uint16_t mm = m[i]; + if (mm & 1) { + nn = float16_one; + } + d[i] = nn ^ (mm & 2) << 14; + } +} + +void HELPER(sve_ftssel_s)(void *vd, void *vn, void *vm, uint32_t desc) +{ + intptr_t i, opr_sz = simd_oprsz(desc) / 4; + uint32_t *d = vd, *n = vn, *m = vm; + for (i = 0; i < opr_sz; i += 1) { + uint32_t nn = n[i]; + uint32_t mm = m[i]; + if (mm & 1) { + nn = float32_one; + } + d[i] = nn ^ (mm & 2) << 30; + } +} + +void HELPER(sve_ftssel_d)(void *vd, void *vn, void *vm, uint32_t desc) +{ + intptr_t i, opr_sz = simd_oprsz(desc) / 8; + uint64_t *d = vd, *n = vn, *m = vm; + for (i = 0; i < opr_sz; i += 1) { + uint64_t nn = n[i]; + uint64_t mm = m[i]; + if (mm & 1) { + nn = float64_one; + } + d[i] = nn ^ (mm & 2) << 62; + } +} diff --git a/qemu/target/arm/translate-sve.c b/qemu/target/arm/translate-sve.c index 0250680e..dff04bd9 100644 --- a/qemu/target/arm/translate-sve.c +++ b/qemu/target/arm/translate-sve.c @@ -976,6 +976,27 @@ static bool trans_FEXPA(DisasContext *s, arg_rr_esz *a, uint32_t insn) return true; } +static bool trans_FTSSEL(DisasContext *s, arg_rrr_esz *a, uint32_t insn) +{ + static gen_helper_gvec_3 * const fns[4] = { + NULL, + gen_helper_sve_ftssel_h, + gen_helper_sve_ftssel_s, + gen_helper_sve_ftssel_d, + }; + if (a->esz == 0) { + return false; + } + if (sve_access_check(s)) { + TCGContext *tcg_ctx = s->uc->tcg_ctx; + unsigned vsz = vec_full_reg_size(s); + tcg_gen_gvec_3_ool(tcg_ctx, vec_full_reg_offset(s, a->rd), + vec_full_reg_offset(s, a->rn), + vec_full_reg_offset(s, a->rm), + vsz, vsz, 0, fns[a->esz]); + } + return true; +} /* *** SVE Predicate Logical Operations Group