| Message ID | 20200508151055.5832-9-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg vector rotate operations | expand |
On Fri, May 08, 2020 at 08:10:53AM -0700, Richard Henderson wrote: > Cc: David Gibson <david@gibson.dropbear.id.au> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/helper.h | 4 ---- > target/ppc/int_helper.c | 17 ----------------- > target/ppc/translate/vmx-impl.inc.c | 8 ++++---- > 3 files changed, 4 insertions(+), 25 deletions(-) > > diff --git a/target/ppc/helper.h b/target/ppc/helper.h > index a95c010391..b0114fc915 100644 > --- a/target/ppc/helper.h > +++ b/target/ppc/helper.h > @@ -213,10 +213,6 @@ DEF_HELPER_3(vsubuqm, void, avr, avr, avr) > DEF_HELPER_4(vsubecuq, void, avr, avr, avr, avr) > DEF_HELPER_4(vsubeuqm, void, avr, avr, avr, avr) > DEF_HELPER_3(vsubcuq, void, avr, avr, avr) > -DEF_HELPER_3(vrlb, void, avr, avr, avr) > -DEF_HELPER_3(vrlh, void, avr, avr, avr) > -DEF_HELPER_3(vrlw, void, avr, avr, avr) > -DEF_HELPER_3(vrld, void, avr, avr, avr) > DEF_HELPER_4(vsldoi, void, avr, avr, avr, i32) > DEF_HELPER_3(vextractub, void, avr, avr, i32) > DEF_HELPER_3(vextractuh, void, avr, avr, i32) > diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c > index 6d238b989d..ee308da2ca 100644 > --- a/target/ppc/int_helper.c > +++ b/target/ppc/int_helper.c > @@ -1347,23 +1347,6 @@ VRFI(p, float_round_up) > VRFI(z, float_round_to_zero) > #undef VRFI > > -#define VROTATE(suffix, element, mask) \ > - void helper_vrl##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) | \ > - (a->element[i] >> (sizeof(a->element[0]) * 8 - shift)); \ > - } \ > - } > -VROTATE(b, u8, 0x7) > -VROTATE(h, u16, 0xF) > -VROTATE(w, u32, 0x1F) > -VROTATE(d, u64, 0x3F) > -#undef VROTATE > - > void helper_vrsqrtefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b) > { > int i; > diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.inc.c > index 403ed3a01c..de2fd136ff 100644 > --- a/target/ppc/translate/vmx-impl.inc.c > +++ b/target/ppc/translate/vmx-impl.inc.c > @@ -900,13 +900,13 @@ GEN_VXFORM3(vsubeuqm, 31, 0); > GEN_VXFORM3(vsubecuq, 31, 0); > GEN_VXFORM_DUAL(vsubeuqm, PPC_NONE, PPC2_ALTIVEC_207, \ > vsubecuq, PPC_NONE, PPC2_ALTIVEC_207) > -GEN_VXFORM(vrlb, 2, 0); > -GEN_VXFORM(vrlh, 2, 1); > -GEN_VXFORM(vrlw, 2, 2); > +GEN_VXFORM_V(vrlb, MO_8, tcg_gen_gvec_rotlv, 2, 0); > +GEN_VXFORM_V(vrlh, MO_16, tcg_gen_gvec_rotlv, 2, 1); > +GEN_VXFORM_V(vrlw, MO_32, tcg_gen_gvec_rotlv, 2, 2); > GEN_VXFORM(vrlwmi, 2, 2); > GEN_VXFORM_DUAL(vrlw, PPC_ALTIVEC, PPC_NONE, \ > vrlwmi, PPC_NONE, PPC2_ISA300) > -GEN_VXFORM(vrld, 2, 3); > +GEN_VXFORM_V(vrld, MO_64, tcg_gen_gvec_rotlv, 2, 3); > GEN_VXFORM(vrldmi, 2, 3); > GEN_VXFORM_DUAL(vrld, PPC_NONE, PPC2_ALTIVEC_207, \ > vrldmi, PPC_NONE, PPC2_ISA300) -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
diff --git a/target/ppc/helper.h b/target/ppc/helper.h index a95c010391..b0114fc915 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -213,10 +213,6 @@ DEF_HELPER_3(vsubuqm, void, avr, avr, avr) DEF_HELPER_4(vsubecuq, void, avr, avr, avr, avr) DEF_HELPER_4(vsubeuqm, void, avr, avr, avr, avr) DEF_HELPER_3(vsubcuq, void, avr, avr, avr) -DEF_HELPER_3(vrlb, void, avr, avr, avr) -DEF_HELPER_3(vrlh, void, avr, avr, avr) -DEF_HELPER_3(vrlw, void, avr, avr, avr) -DEF_HELPER_3(vrld, void, avr, avr, avr) DEF_HELPER_4(vsldoi, void, avr, avr, avr, i32) DEF_HELPER_3(vextractub, void, avr, avr, i32) DEF_HELPER_3(vextractuh, void, avr, avr, i32) diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c index 6d238b989d..ee308da2ca 100644 --- a/target/ppc/int_helper.c +++ b/target/ppc/int_helper.c @@ -1347,23 +1347,6 @@ VRFI(p, float_round_up) VRFI(z, float_round_to_zero) #undef VRFI -#define VROTATE(suffix, element, mask) \ - void helper_vrl##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) | \ - (a->element[i] >> (sizeof(a->element[0]) * 8 - shift)); \ - } \ - } -VROTATE(b, u8, 0x7) -VROTATE(h, u16, 0xF) -VROTATE(w, u32, 0x1F) -VROTATE(d, u64, 0x3F) -#undef VROTATE - void helper_vrsqrtefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b) { int i; diff --git a/target/ppc/translate/vmx-impl.inc.c b/target/ppc/translate/vmx-impl.inc.c index 403ed3a01c..de2fd136ff 100644 --- a/target/ppc/translate/vmx-impl.inc.c +++ b/target/ppc/translate/vmx-impl.inc.c @@ -900,13 +900,13 @@ GEN_VXFORM3(vsubeuqm, 31, 0); GEN_VXFORM3(vsubecuq, 31, 0); GEN_VXFORM_DUAL(vsubeuqm, PPC_NONE, PPC2_ALTIVEC_207, \ vsubecuq, PPC_NONE, PPC2_ALTIVEC_207) -GEN_VXFORM(vrlb, 2, 0); -GEN_VXFORM(vrlh, 2, 1); -GEN_VXFORM(vrlw, 2, 2); +GEN_VXFORM_V(vrlb, MO_8, tcg_gen_gvec_rotlv, 2, 0); +GEN_VXFORM_V(vrlh, MO_16, tcg_gen_gvec_rotlv, 2, 1); +GEN_VXFORM_V(vrlw, MO_32, tcg_gen_gvec_rotlv, 2, 2); GEN_VXFORM(vrlwmi, 2, 2); GEN_VXFORM_DUAL(vrlw, PPC_ALTIVEC, PPC_NONE, \ vrlwmi, PPC_NONE, PPC2_ISA300) -GEN_VXFORM(vrld, 2, 3); +GEN_VXFORM_V(vrld, MO_64, tcg_gen_gvec_rotlv, 2, 3); GEN_VXFORM(vrldmi, 2, 3); GEN_VXFORM_DUAL(vrld, PPC_NONE, PPC2_ALTIVEC_207, \ vrldmi, PPC_NONE, PPC2_ISA300)
Cc: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/ppc/helper.h | 4 ---- target/ppc/int_helper.c | 17 ----------------- target/ppc/translate/vmx-impl.inc.c | 8 ++++---- 3 files changed, 4 insertions(+), 25 deletions(-) -- 2.20.1