Commit 727ff1d6 authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Convert Neon 3-reg-same compare insns to decodetree 



Convert the Neon integer 3-reg-same compare insns VCGE, VCGT,
VCEQ, VACGE and VACGT to decodetree.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20200512163904.10918-15-peter.maydell@linaro.org
parent 8aa71ead

target/arm/neon-dp.decode

+5 −0
Original line number Diff line number Diff line
@@ -183,5 +183,10 @@ VABD_fp_3s 1111 001 1 0 . 1 . .... .... 1101 ... 0 .... @3same_fp 
VMLA_fp_3s       1111 001 0 0 . 0 . .... .... 1101 ... 1 .... @3same_fp

VMLS_fp_3s       1111 001 0 0 . 1 . .... .... 1101 ... 1 .... @3same_fp

VMUL_fp_3s       1111 001 1 0 . 0 . .... .... 1101 ... 1 .... @3same_fp

VCEQ_fp_3s       1111 001 0 0 . 0 . .... .... 1110 ... 0 .... @3same_fp

VCGE_fp_3s       1111 001 1 0 . 0 . .... .... 1110 ... 0 .... @3same_fp

VACGE_fp_3s      1111 001 1 0 . 0 . .... .... 1110 ... 1 .... @3same_fp

VCGT_fp_3s       1111 001 1 0 . 1 . .... .... 1110 ... 0 .... @3same_fp

VACGT_fp_3s      1111 001 1 0 . 1 . .... .... 1110 ... 1 .... @3same_fp

VPMAX_fp_3s      1111 001 1 0 . 0 . .... .... 1111 ... 0 .... @3same_fp_q0

VPMIN_fp_3s      1111 001 1 0 . 1 . .... .... 1111 ... 0 .... @3same_fp_q0

target/arm/translate-neon.inc.c

+6 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,12 @@ DO_3S_FP_GVEC(VMUL, gen_helper_gvec_fmul_s) 
        return do_3same_fp(s, a, FUNC, READS_VD);                   \

    }



DO_3S_FP(VCEQ, gen_helper_neon_ceq_f32, false)

DO_3S_FP(VCGE, gen_helper_neon_cge_f32, false)

DO_3S_FP(VCGT, gen_helper_neon_cgt_f32, false)

DO_3S_FP(VACGE, gen_helper_neon_acge_f32, false)

DO_3S_FP(VACGT, gen_helper_neon_acgt_f32, false)



static void gen_VMLA_fp_3s(TCGv_i32 vd, TCGv_i32 vn, TCGv_i32 vm,

                            TCGv_ptr fpstatus)

{

target/arm/translate.c

+2 −37
Original line number Diff line number Diff line
@@ -5434,6 +5434,8 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
        case NEON_3R_VQDMULH_VQRDMULH:

        case NEON_3R_FLOAT_ARITH:

        case NEON_3R_FLOAT_MULTIPLY:

        case NEON_3R_FLOAT_CMP:

        case NEON_3R_FLOAT_ACMP:

            /* Already handled by decodetree */

            return 1;

        }
@@ -5448,17 +5450,6 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                return 1; /* VPMIN/VPMAX handled by decodetree */

            }

            break;

        case NEON_3R_FLOAT_CMP:

            if (!u && size) {

                /* no encoding for U=0 C=1x */

                return 1;

            }

            break;

        case NEON_3R_FLOAT_ACMP:

            if (!u) {

                return 1;

            }

            break;

        case NEON_3R_FLOAT_MISC:

            /* VMAXNM/VMINNM in ARMv8 */

            if (u && !arm_dc_feature(s, ARM_FEATURE_V8)) {
@@ -5480,32 +5471,6 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
        tmp = neon_load_reg(rn, pass);

        tmp2 = neon_load_reg(rm, pass);

        switch (op) {

        case NEON_3R_FLOAT_CMP:

        {

            TCGv_ptr fpstatus = get_fpstatus_ptr(1);

            if (!u) {

                gen_helper_neon_ceq_f32(tmp, tmp, tmp2, fpstatus);

            } else {

                if (size == 0) {

                    gen_helper_neon_cge_f32(tmp, tmp, tmp2, fpstatus);

                } else {

                    gen_helper_neon_cgt_f32(tmp, tmp, tmp2, fpstatus);

                }

            }

            tcg_temp_free_ptr(fpstatus);

            break;

        }

        case NEON_3R_FLOAT_ACMP:

        {

            TCGv_ptr fpstatus = get_fpstatus_ptr(1);

            if (size == 0) {

                gen_helper_neon_acge_f32(tmp, tmp, tmp2, fpstatus);

            } else {

                gen_helper_neon_acgt_f32(tmp, tmp, tmp2, fpstatus);

            }

            tcg_temp_free_ptr(fpstatus);

            break;

        }

        case NEON_3R_FLOAT_MINMAX:

        {

            TCGv_ptr fpstatus = get_fpstatus_ptr(1);