> On Jul 24, 2020, at 1:46 PM, Lijun Pan <l...@linux.vnet.ibm.com> wrote: > > > >> On Jul 24, 2020, at 1:00 PM, Richard Henderson <richard.hender...@linaro.org >> <mailto:richard.hender...@linaro.org>> wrote: >> >> On 7/23/20 9:58 PM, Lijun Pan wrote: >>> vmsumudm (Power ISA 3.0) - Vector Multiply-Sum Unsigned Doubleword Modulo >>> VA-form. >>> vmsumcud (Power ISA 3.1) - Vector Multiply-Sum & write Carry-out Unsigned >>> Doubleword VA-form. >>> >>> Signed-off-by: Lijun Pan <l...@linux.ibm.com <mailto:l...@linux.ibm.com>> >>> --- >>> v5: update instruction flag for vmsumcud. >>> integrate into this isa3.1 patch series >>> v3: implement vmsumudm/vmsumcud through int128 functions, >>> suggested by Richard Henderson. >>> >>> disas/ppc.c | 2 ++ >>> target/ppc/helper.h | 4 ++- >>> target/ppc/int_helper.c | 49 ++++++++++++++++++++++++++++- >>> target/ppc/translate.c | 1 - >>> target/ppc/translate/vmx-impl.inc.c | 39 ++++++++++++----------- >>> target/ppc/translate/vmx-ops.inc.c | 2 ++ >>> 6 files changed, 76 insertions(+), 21 deletions(-) >>> >>> diff --git a/disas/ppc.c b/disas/ppc.c >>> index 63e97cfe1d..bd76fae4c4 100644 >>> --- a/disas/ppc.c >>> +++ b/disas/ppc.c >>> @@ -2261,7 +2261,9 @@ const struct powerpc_opcode powerpc_opcodes[] = { >>> { "vmsumshs", VXA(4, 41), VXA_MASK, PPCVEC, { VD, VA, VB, >>> VC } }, >>> { "vmsumubm", VXA(4, 36), VXA_MASK, PPCVEC, { VD, VA, VB, >>> VC } }, >>> { "vmsumuhm", VXA(4, 38), VXA_MASK, PPCVEC, { VD, VA, VB, >>> VC } }, >>> +{ "vmsumudm", VXA(4, 35), VXA_MASK, PPCVEC, { VD, VA, VB, VC } >>> }, >>> { "vmsumuhs", VXA(4, 39), VXA_MASK, PPCVEC, { VD, VA, VB, >>> VC } }, >>> +{ "vmsumcud", VXA(4, 23), VXA_MASK, PPCVEC, { VD, VA, VB, VC } >>> }, >>> { "vmulesb", VX(4, 776), VX_MASK, PPCVEC, { VD, VA, VB } >>> }, >>> { "vmulesh", VX(4, 840), VX_MASK, PPCVEC, { VD, VA, VB } >>> }, >>> { "vmuleub", VX(4, 520), VX_MASK, PPCVEC, { VD, VA, VB } >>> }, >>> diff --git a/target/ppc/helper.h b/target/ppc/helper.h >>> index 70a14029ca..00a31d64bc 100644 >>> --- a/target/ppc/helper.h >>> +++ b/target/ppc/helper.h >>> @@ -274,10 +274,12 @@ DEF_HELPER_3(vpkpx, void, avr, avr, avr) >>> DEF_HELPER_5(vmhaddshs, void, env, avr, avr, avr, avr) >>> DEF_HELPER_5(vmhraddshs, void, env, avr, avr, avr, avr) >>> DEF_HELPER_5(vmsumuhm, void, env, avr, avr, avr, avr) >>> +DEF_HELPER_5(vmsumudm, void, env, avr, avr, avr, avr) >>> DEF_HELPER_5(vmsumuhs, void, env, avr, avr, avr, avr) >>> DEF_HELPER_5(vmsumshm, void, env, avr, avr, avr, avr) >>> DEF_HELPER_5(vmsumshs, void, env, avr, avr, avr, avr) >>> -DEF_HELPER_4(vmladduhm, void, avr, avr, avr, avr) >>> +DEF_HELPER_5(vmsumcud, void, env, avr, avr, avr, avr) >>> +DEF_HELPER_5(vmladduhm, void, env, avr, avr, avr, avr) >>> DEF_HELPER_FLAGS_2(mtvscr, TCG_CALL_NO_RWG, void, env, i32) >>> DEF_HELPER_FLAGS_1(mfvscr, TCG_CALL_NO_RWG, i32, env) >>> DEF_HELPER_3(lvebx, void, env, avr, tl) >>> diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c >>> index 62b93b4568..2e919a7b8e 100644 >>> --- a/target/ppc/int_helper.c >>> +++ b/target/ppc/int_helper.c >>> @@ -913,7 +913,8 @@ void helper_vmhraddshs(CPUPPCState *env, ppc_avr_t *r, >>> ppc_avr_t *a, >>> } >>> } >>> >>> -void helper_vmladduhm(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t >>> *c) >>> +void helper_vmladduhm(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *a, >>> + ppc_avr_t *b, ppc_avr_t *c) >> >> Why? >> >>> +void helper_vmsumudm(CPUPPCState *env, ppc_avr_t *r, >>> + ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) >>> +{ >> >> ... >> >>> +void helper_vmsumcud(CPUPPCState *env, ppc_avr_t *r, >>> + ppc_avr_t *a, ppc_avr_t *b, ppc_avr_t *c) >> >> You don't actually use env in either helper, so you shouldn't pass it in. >> >> > > I just wanted to reuse GEN_VAFORM_PAIRED which has env passed in, > rather than creating a GEN_VAFORM_PAIRED_NOENV which does not have env. > I created GEN_VAFORM which includes env so that it can cover both env and > non-env case. > > I re-look at the code, and find out that GEN_**FORM** differentiate in env > and non-env. > So I can rename current GEN_VAFORM_PAIRED (env passed in) to > GEN_VAFORM_PAIRED_ENV, > create a new GEN_VAFORM_PAIRED (no env) to cater vmladduhm and vmsumudm > remove the env part code in GEN_VAFORM to have vmsumcud fit into. >
I take back what I said in the second paragraph. I think we need to keep GEN_VAFORM_PAIRED having env to cover both env and non-env cases because some pair has both non-env, some pair has both env, some pair has env and non-env. e.g. GEN_VAFORM_PAIRED(vmsumuhm, vmsumuhs, 19) vmsumuhm non-env, vmsumuhs env. It is the same for GEN_VAFORM. though for now, no instructions uses env, adding env to GEN_VAFORM saves for later changes. Lijun
