Commit 571fbe6c authored by Richard Henderson's avatar Richard Henderson Committed by David Gibson
Browse files

target/ppc: Use vector variable shifts for VSL, VSR, VSRA 



The gvec expanders take care of masking the shift amount
against the element width.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20190518191430.21686-2-richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 64d4a534

target/ppc/helper.h

+0 −12
Original line number Diff line number Diff line
@@ -180,18 +180,6 @@ DEF_HELPER_3(vmuloub, void, avr, avr, avr) 
DEF_HELPER_3(vmulouh, void, avr, avr, avr)

DEF_HELPER_3(vmulouw, void, avr, avr, avr)

DEF_HELPER_3(vmuluwm, void, avr, avr, avr)

DEF_HELPER_3(vsrab, void, avr, avr, avr)

DEF_HELPER_3(vsrah, void, avr, avr, avr)

DEF_HELPER_3(vsraw, void, avr, avr, avr)

DEF_HELPER_3(vsrad, void, avr, avr, avr)

DEF_HELPER_3(vsrb, void, avr, avr, avr)

DEF_HELPER_3(vsrh, void, avr, avr, avr)

DEF_HELPER_3(vsrw, void, avr, avr, avr)

DEF_HELPER_3(vsrd, void, avr, avr, avr)

DEF_HELPER_3(vslb, void, avr, avr, avr)

DEF_HELPER_3(vslh, void, avr, avr, avr)

DEF_HELPER_3(vslw, void, avr, avr, avr)

DEF_HELPER_3(vsld, void, avr, avr, avr)

DEF_HELPER_3(vslo, void, avr, avr, avr)

DEF_HELPER_3(vsro, void, avr, avr, avr)

DEF_HELPER_3(vsrv, void, avr, avr, avr)

target/ppc/int_helper.c

+0 −37
Original line number Diff line number Diff line
@@ -1791,23 +1791,6 @@ VSHIFT(l, 1) 
VSHIFT(r, 0)

#undef VSHIFT



#define VSL(suffix, element, mask)                                      \

    void helper_vsl##suffix(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)   \

    {                                                                   \

        int i;                                                          \

                                                                        \

        for (i = 0; i < ARRAY_SIZE(r->element); i++) {                  \

            unsigned int shift = b->element[i] & mask;                  \

                                                                        \

            r->element[i] = a->element[i] << shift;                     \

        }                                                               \

    }

VSL(b, u8, 0x7)

VSL(h, u16, 0x0F)

VSL(w, u32, 0x1F)

VSL(d, u64, 0x3F)

#undef VSL



void helper_vslv(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)

{

    int i;
@@ -1980,26 +1963,6 @@ VNEG(vnegw, s32) 
VNEG(vnegd, s64)

#undef VNEG



#define VSR(suffix, element, mask)                                      \

    void helper_vsr##suffix(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)   \

    {                                                                   \

        int i;                                                          \

                                                                        \

        for (i = 0; i < ARRAY_SIZE(r->element); i++) {                  \

            unsigned int shift = b->element[i] & mask;                  \

            r->element[i] = a->element[i] >> shift;                     \

        }                                                               \

    }

VSR(ab, s8, 0x7)

VSR(ah, s16, 0xF)

VSR(aw, s32, 0x1F)

VSR(ad, s64, 0x3F)

VSR(b, u8, 0x7)

VSR(h, u16, 0xF)

VSR(w, u32, 0x1F)

VSR(d, u64, 0x3F)

#undef VSR



void helper_vsro(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)

{

    int sh = (b->VsrB(0xf) >> 3) & 0xf;

target/ppc/translate/vmx-impl.inc.c

+12 −12
Original line number Diff line number Diff line
@@ -530,21 +530,21 @@ GEN_VXFORM(vmuleuw, 4, 10); 
GEN_VXFORM(vmulesb, 4, 12);

GEN_VXFORM(vmulesh, 4, 13);

GEN_VXFORM(vmulesw, 4, 14);

GEN_VXFORM(vslb, 2, 4);

GEN_VXFORM(vslh, 2, 5);

GEN_VXFORM(vslw, 2, 6);

GEN_VXFORM_V(vslb, MO_8, tcg_gen_gvec_shlv, 2, 4);

GEN_VXFORM_V(vslh, MO_16, tcg_gen_gvec_shlv, 2, 5);

GEN_VXFORM_V(vslw, MO_32, tcg_gen_gvec_shlv, 2, 6);

GEN_VXFORM(vrlwnm, 2, 6);

GEN_VXFORM_DUAL(vslw, PPC_ALTIVEC, PPC_NONE, \

                vrlwnm, PPC_NONE, PPC2_ISA300)

GEN_VXFORM(vsld, 2, 23);

GEN_VXFORM(vsrb, 2, 8);

GEN_VXFORM(vsrh, 2, 9);

GEN_VXFORM(vsrw, 2, 10);

GEN_VXFORM(vsrd, 2, 27);

GEN_VXFORM(vsrab, 2, 12);

GEN_VXFORM(vsrah, 2, 13);

GEN_VXFORM(vsraw, 2, 14);

GEN_VXFORM(vsrad, 2, 15);

GEN_VXFORM_V(vsld, MO_64, tcg_gen_gvec_shlv, 2, 23);

GEN_VXFORM_V(vsrb, MO_8, tcg_gen_gvec_shrv, 2, 8);

GEN_VXFORM_V(vsrh, MO_16, tcg_gen_gvec_shrv, 2, 9);

GEN_VXFORM_V(vsrw, MO_32, tcg_gen_gvec_shrv, 2, 10);

GEN_VXFORM_V(vsrd, MO_64, tcg_gen_gvec_shrv, 2, 27);

GEN_VXFORM_V(vsrab, MO_8, tcg_gen_gvec_sarv, 2, 12);

GEN_VXFORM_V(vsrah, MO_16, tcg_gen_gvec_sarv, 2, 13);

GEN_VXFORM_V(vsraw, MO_32, tcg_gen_gvec_sarv, 2, 14);

GEN_VXFORM_V(vsrad, MO_64, tcg_gen_gvec_sarv, 2, 15);

GEN_VXFORM(vsrv, 2, 28);

GEN_VXFORM(vslv, 2, 29);

GEN_VXFORM(vslo, 6, 16);