* [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs [not found] <1410325413> @ 2014-09-11 19:17 ` Pierre Mallard 2014-09-11 19:17 ` [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard ` (2 more replies) 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 " Pierre Mallard 1 sibling, 3 replies; 13+ messages in thread From: Pierre Mallard @ 2014-09-11 19:17 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: tommusta, agraf, Pierre Mallard This patch series enable floating point instruction in 440x5 CPUs which have the capabilities to have optional APU FPU in double precision mode. 1) Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 with a new insn2 flag 2) Create a new 440x5 implementing floating point instructions Pierre Mallard (2): target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 target-ppc : Add new processor type 440x5wDFPU target-ppc/cpu-models.c | 3 +++ target-ppc/cpu.h | 5 ++++- target-ppc/fpu_helper.c | 6 ------ target-ppc/helper.h | 4 +--- target-ppc/translate.c | 18 +++++++---------- target-ppc/translate_init.c | 47 ++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 59 insertions(+), 24 deletions(-) -- 1.7.10.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 2014-09-11 19:17 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Pierre Mallard @ 2014-09-11 19:17 ` Pierre Mallard 2014-09-12 14:28 ` Tom Musta 2014-09-11 19:17 ` [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard 2014-09-12 14:29 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Tom Musta 2 siblings, 1 reply; 13+ messages in thread From: Pierre Mallard @ 2014-09-11 19:17 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: tommusta, agraf, Pierre Mallard This patch remove limitation for fc[tf]id[*] on 32 bits targets and add a new insn flag for signed integer 64 conversion PPC2_FP_CVT_S64 --- target-ppc/cpu.h | 5 ++++- target-ppc/fpu_helper.c | 6 ------ target-ppc/helper.h | 4 +--- target-ppc/translate.c | 18 +++++++----------- target-ppc/translate_init.c | 9 ++++++--- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index b64c652..fa50c32 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -2008,13 +2008,16 @@ enum { PPC2_ALTIVEC_207 = 0x0000000000004000ULL, /* PowerISA 2.07 Book3s specification */ PPC2_ISA207S = 0x0000000000008000ULL, + /* Double precision floating point conversion for signed integer 64 */ + PPC2_FP_CVT_S64 = 0x0000000000010000ULL, #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ - PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP) + PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ + PPC2_FP_CVT_S64) }; /*****************************************************************************/ diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c index da93d12..7f74466 100644 --- a/target-ppc/fpu_helper.c +++ b/target-ppc/fpu_helper.c @@ -649,14 +649,10 @@ FPU_FCTI(fctiw, int32, 0x80000000U) FPU_FCTI(fctiwz, int32_round_to_zero, 0x80000000U) FPU_FCTI(fctiwu, uint32, 0x00000000U) FPU_FCTI(fctiwuz, uint32_round_to_zero, 0x00000000U) -#if defined(TARGET_PPC64) FPU_FCTI(fctid, int64, 0x8000000000000000ULL) FPU_FCTI(fctidz, int64_round_to_zero, 0x8000000000000000ULL) FPU_FCTI(fctidu, uint64, 0x0000000000000000ULL) FPU_FCTI(fctiduz, uint64_round_to_zero, 0x0000000000000000ULL) -#endif - -#if defined(TARGET_PPC64) #define FPU_FCFI(op, cvtr, is_single) \ uint64_t helper_##op(CPUPPCState *env, uint64_t arg) \ @@ -678,8 +674,6 @@ FPU_FCFI(fcfids, int64_to_float32, 1) FPU_FCFI(fcfidu, uint64_to_float64, 0) FPU_FCFI(fcfidus, uint64_to_float32, 1) -#endif - static inline uint64_t do_fri(CPUPPCState *env, uint64_t arg, int rounding_mode) { diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 509eae5..52402ef 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -67,16 +67,14 @@ DEF_HELPER_2(fctiw, i64, env, i64) DEF_HELPER_2(fctiwu, i64, env, i64) DEF_HELPER_2(fctiwz, i64, env, i64) DEF_HELPER_2(fctiwuz, i64, env, i64) -#if defined(TARGET_PPC64) DEF_HELPER_2(fcfid, i64, env, i64) DEF_HELPER_2(fcfidu, i64, env, i64) DEF_HELPER_2(fcfids, i64, env, i64) DEF_HELPER_2(fcfidus, i64, env, i64) DEF_HELPER_2(fctid, i64, env, i64) -DEF_HELPER_2(fctidu, i64, env, i64) DEF_HELPER_2(fctidz, i64, env, i64) +DEF_HELPER_2(fctidu, i64, env, i64) DEF_HELPER_2(fctiduz, i64, env, i64) -#endif DEF_HELPER_2(frsp, i64, env, i64) DEF_HELPER_2(frin, i64, env, i64) DEF_HELPER_2(friz, i64, env, i64) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index c07bb01..1fe82ce 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -2246,9 +2246,8 @@ GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT); GEN_FLOAT_B(ctiwuz, 0x0F, 0x04, 0, PPC2_FP_CVT_ISA206); /* frsp */ GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT); -#if defined(TARGET_PPC64) /* fcfid */ -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B); +GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC2_FP_CVT_S64); /* fcfids */ GEN_FLOAT_B(cfids, 0x0E, 0x1A, 0, PPC2_FP_CVT_ISA206); /* fcfidu */ @@ -2256,14 +2255,13 @@ GEN_FLOAT_B(cfidu, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); /* fcfidus */ GEN_FLOAT_B(cfidus, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); /* fctid */ -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B); +GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC2_FP_CVT_S64); +/* fctidz */ +GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC2_FP_CVT_S64); /* fctidu */ GEN_FLOAT_B(ctidu, 0x0E, 0x1D, 0, PPC2_FP_CVT_ISA206); -/* fctidz */ -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B); /* fctidu */ GEN_FLOAT_B(ctiduz, 0x0F, 0x1D, 0, PPC2_FP_CVT_ISA206); -#endif /* frin */ GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT); @@ -10050,16 +10048,14 @@ GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), GEN_HANDLER_E(fctiwuz, 0x3F, 0x0F, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT), -#if defined(TARGET_PPC64) -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B), +GEN_HANDLER_E(fcfid, 0x3F, 0x0E, 0x1A, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), GEN_HANDLER_E(fcfids, 0x3B, 0x0E, 0x1A, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_HANDLER_E(fcfidu, 0x3F, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_HANDLER_E(fcfidus, 0x3B, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B), +GEN_HANDLER_E(fctid, 0x3F, 0x0E, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), +GEN_HANDLER_E(fctidz, 0x3F, 0x0F, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), GEN_HANDLER_E(fctidu, 0x3F, 0x0E, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B), GEN_HANDLER_E(fctiduz, 0x3F, 0x0F, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -#endif GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT), GEN_FLOAT_B(riz, 0x08, 0x0D, 1, PPC_FLOAT_EXT), GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT), diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 48177ed..ac4d12a 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -5010,7 +5010,8 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) PPC_FLOAT_STFIWX | PPC_WAIT | PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; - pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206; + pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 | \ + PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_CM) | (1ull << MSR_GS) | (1ull << MSR_UCLE) | @@ -7906,6 +7907,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | PPC_64B | PPC_ALTIVEC | PPC_SEGMENT_64B | PPC_SLBI; + pcc->insns_flags2 = PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -7958,6 +7960,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | PPC_64B | PPC_SEGMENT_64B | PPC_SLBI; + pcc->insns_flags2 = PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -8100,7 +8103,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 | PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | - PPC2_FP_TST_ISA206; + PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_VSX) | @@ -8178,7 +8181,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | - PPC2_ISA205 | PPC2_ISA207S; + PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_TM) | (1ull << MSR_VR) | -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 2014-09-11 19:17 ` [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard @ 2014-09-12 14:28 ` Tom Musta 2014-09-12 14:40 ` Tom Musta 0 siblings, 1 reply; 13+ messages in thread From: Tom Musta @ 2014-09-12 14:28 UTC (permalink / raw) To: Pierre Mallard, qemu-devel, qemu-ppc; +Cc: agraf On 9/11/2014 2:17 PM, Pierre Mallard wrote: > This patch remove limitation for fc[tf]id[*] on 32 bits targets and > add a new insn flag for signed integer 64 conversion PPC2_FP_CVT_S64 > --- > target-ppc/cpu.h | 5 ++++- > target-ppc/fpu_helper.c | 6 ------ > target-ppc/helper.h | 4 +--- > target-ppc/translate.c | 18 +++++++----------- > target-ppc/translate_init.c | 9 ++++++--- > 5 files changed, 18 insertions(+), 24 deletions(-) > > diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h > index b64c652..fa50c32 100644 > --- a/target-ppc/cpu.h > +++ b/target-ppc/cpu.h > @@ -2008,13 +2008,16 @@ enum { > PPC2_ALTIVEC_207 = 0x0000000000004000ULL, > /* PowerISA 2.07 Book3s specification */ > PPC2_ISA207S = 0x0000000000008000ULL, > + /* Double precision floating point conversion for signed integer 64 */ > + PPC2_FP_CVT_S64 = 0x0000000000010000ULL, > > #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ > PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ > PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ > PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ > PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ > - PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP) > + PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ > + PPC2_FP_CVT_S64) > }; > > /*****************************************************************************/ > diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c > index da93d12..7f74466 100644 > --- a/target-ppc/fpu_helper.c > +++ b/target-ppc/fpu_helper.c > @@ -649,14 +649,10 @@ FPU_FCTI(fctiw, int32, 0x80000000U) > FPU_FCTI(fctiwz, int32_round_to_zero, 0x80000000U) > FPU_FCTI(fctiwu, uint32, 0x00000000U) > FPU_FCTI(fctiwuz, uint32_round_to_zero, 0x00000000U) > -#if defined(TARGET_PPC64) > FPU_FCTI(fctid, int64, 0x8000000000000000ULL) > FPU_FCTI(fctidz, int64_round_to_zero, 0x8000000000000000ULL) > FPU_FCTI(fctidu, uint64, 0x0000000000000000ULL) > FPU_FCTI(fctiduz, uint64_round_to_zero, 0x0000000000000000ULL) > -#endif > - > -#if defined(TARGET_PPC64) > > #define FPU_FCFI(op, cvtr, is_single) \ > uint64_t helper_##op(CPUPPCState *env, uint64_t arg) \ > @@ -678,8 +674,6 @@ FPU_FCFI(fcfids, int64_to_float32, 1) > FPU_FCFI(fcfidu, uint64_to_float64, 0) > FPU_FCFI(fcfidus, uint64_to_float32, 1) > > -#endif > - > static inline uint64_t do_fri(CPUPPCState *env, uint64_t arg, > int rounding_mode) > { > diff --git a/target-ppc/helper.h b/target-ppc/helper.h > index 509eae5..52402ef 100644 > --- a/target-ppc/helper.h > +++ b/target-ppc/helper.h > @@ -67,16 +67,14 @@ DEF_HELPER_2(fctiw, i64, env, i64) > DEF_HELPER_2(fctiwu, i64, env, i64) > DEF_HELPER_2(fctiwz, i64, env, i64) > DEF_HELPER_2(fctiwuz, i64, env, i64) > -#if defined(TARGET_PPC64) > DEF_HELPER_2(fcfid, i64, env, i64) > DEF_HELPER_2(fcfidu, i64, env, i64) > DEF_HELPER_2(fcfids, i64, env, i64) > DEF_HELPER_2(fcfidus, i64, env, i64) > DEF_HELPER_2(fctid, i64, env, i64) > -DEF_HELPER_2(fctidu, i64, env, i64) > DEF_HELPER_2(fctidz, i64, env, i64) > +DEF_HELPER_2(fctidu, i64, env, i64) NIT: I would not have re-arranged fctidu/fctidz like this since it only makes the patch larger without actually accomplishing anything (unless, of course, the point of your patch is to do clean up). You seem to have done this in other places as well. > DEF_HELPER_2(fctiduz, i64, env, i64) > -#endif > DEF_HELPER_2(frsp, i64, env, i64) > DEF_HELPER_2(frin, i64, env, i64) > DEF_HELPER_2(friz, i64, env, i64) > diff --git a/target-ppc/translate.c b/target-ppc/translate.c > index c07bb01..1fe82ce 100644 > --- a/target-ppc/translate.c > +++ b/target-ppc/translate.c > @@ -2246,9 +2246,8 @@ GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT); > GEN_FLOAT_B(ctiwuz, 0x0F, 0x04, 0, PPC2_FP_CVT_ISA206); > /* frsp */ > GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT); > -#if defined(TARGET_PPC64) > /* fcfid */ > -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B); > +GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC2_FP_CVT_S64); > /* fcfids */ > GEN_FLOAT_B(cfids, 0x0E, 0x1A, 0, PPC2_FP_CVT_ISA206); > /* fcfidu */ > @@ -2256,14 +2255,13 @@ GEN_FLOAT_B(cfidu, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); > /* fcfidus */ > GEN_FLOAT_B(cfidus, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); > /* fctid */ > -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B); > +GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC2_FP_CVT_S64); > +/* fctidz */ > +GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC2_FP_CVT_S64); > /* fctidu */ > GEN_FLOAT_B(ctidu, 0x0E, 0x1D, 0, PPC2_FP_CVT_ISA206); > -/* fctidz */ > -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B); > /* fctidu */ > GEN_FLOAT_B(ctiduz, 0x0F, 0x1D, 0, PPC2_FP_CVT_ISA206); > -#endif > > /* frin */ > GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT); > @@ -10050,16 +10048,14 @@ GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), > GEN_HANDLER_E(fctiwuz, 0x3F, 0x0F, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT), > -#if defined(TARGET_PPC64) > -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B), > +GEN_HANDLER_E(fcfid, 0x3F, 0x0E, 0x1A, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), > GEN_HANDLER_E(fcfids, 0x3B, 0x0E, 0x1A, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > GEN_HANDLER_E(fcfidu, 0x3F, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > GEN_HANDLER_E(fcfidus, 0x3B, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B), > +GEN_HANDLER_E(fctid, 0x3F, 0x0E, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), > +GEN_HANDLER_E(fctidz, 0x3F, 0x0F, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), > GEN_HANDLER_E(fctidu, 0x3F, 0x0E, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B), > GEN_HANDLER_E(fctiduz, 0x3F, 0x0F, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), > -#endif > GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT), > GEN_FLOAT_B(riz, 0x08, 0x0D, 1, PPC_FLOAT_EXT), > GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT), > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 48177ed..ac4d12a 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -5010,7 +5010,8 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) > PPC_FLOAT_STFIWX | PPC_WAIT | > PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | > PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; > - pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206; > + pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 | \ > + PPC2_FP_CVT_S64; > pcc->msr_mask = (1ull << MSR_CM) | > (1ull << MSR_GS) | > (1ull << MSR_UCLE) | > @@ -7906,6 +7907,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) > PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | > PPC_64B | PPC_ALTIVEC | > PPC_SEGMENT_64B | PPC_SLBI; > + pcc->insns_flags2 = PPC2_FP_CVT_S64; > pcc->msr_mask = (1ull << MSR_SF) | > (1ull << MSR_VR) | > (1ull << MSR_POW) | > @@ -7958,6 +7960,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) > PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | > PPC_64B | > PPC_SEGMENT_64B | PPC_SLBI; > + pcc->insns_flags2 = PPC2_FP_CVT_S64; > pcc->msr_mask = (1ull << MSR_SF) | > (1ull << MSR_VR) | > (1ull << MSR_POW) | > @@ -8100,7 +8103,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) > pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 | > PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | > PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | > - PPC2_FP_TST_ISA206; > + PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64; > pcc->msr_mask = (1ull << MSR_SF) | > (1ull << MSR_VR) | > (1ull << MSR_VSX) | > @@ -8178,7 +8181,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) > PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | > PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | > PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | > - PPC2_ISA205 | PPC2_ISA207S; > + PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64; > pcc->msr_mask = (1ull << MSR_SF) | > (1ull << MSR_TM) | > (1ull << MSR_VR) | > Other than the minor comments .... Reviewed-by: Tom Musta <tommusta@gmail.com> Tested-by: Tom Musta <tommusta@gmail.com> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 2014-09-12 14:28 ` Tom Musta @ 2014-09-12 14:40 ` Tom Musta 2014-09-12 14:56 ` Alexander Graf 0 siblings, 1 reply; 13+ messages in thread From: Tom Musta @ 2014-09-12 14:40 UTC (permalink / raw) To: Pierre Mallard, qemu-devel, qemu-ppc; +Cc: agraf On 9/12/2014 9:28 AM, Tom Musta wrote: > On 9/11/2014 2:17 PM, Pierre Mallard wrote: >> This patch remove limitation for fc[tf]id[*] on 32 bits targets and >> add a new insn flag for signed integer 64 conversion PPC2_FP_CVT_S64 >> --- >> target-ppc/cpu.h | 5 ++++- >> target-ppc/fpu_helper.c | 6 ------ >> target-ppc/helper.h | 4 +--- >> target-ppc/translate.c | 18 +++++++----------- >> target-ppc/translate_init.c | 9 ++++++--- >> 5 files changed, 18 insertions(+), 24 deletions(-) >> >> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h >> index b64c652..fa50c32 100644 >> --- a/target-ppc/cpu.h >> +++ b/target-ppc/cpu.h >> @@ -2008,13 +2008,16 @@ enum { >> PPC2_ALTIVEC_207 = 0x0000000000004000ULL, >> /* PowerISA 2.07 Book3s specification */ >> PPC2_ISA207S = 0x0000000000008000ULL, >> + /* Double precision floating point conversion for signed integer 64 */ >> + PPC2_FP_CVT_S64 = 0x0000000000010000ULL, >> >> #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ >> PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ >> PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ >> PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ >> PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ >> - PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP) >> + PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ >> + PPC2_FP_CVT_S64) >> }; >> >> /*****************************************************************************/ >> diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c >> index da93d12..7f74466 100644 >> --- a/target-ppc/fpu_helper.c >> +++ b/target-ppc/fpu_helper.c >> @@ -649,14 +649,10 @@ FPU_FCTI(fctiw, int32, 0x80000000U) >> FPU_FCTI(fctiwz, int32_round_to_zero, 0x80000000U) >> FPU_FCTI(fctiwu, uint32, 0x00000000U) >> FPU_FCTI(fctiwuz, uint32_round_to_zero, 0x00000000U) >> -#if defined(TARGET_PPC64) >> FPU_FCTI(fctid, int64, 0x8000000000000000ULL) >> FPU_FCTI(fctidz, int64_round_to_zero, 0x8000000000000000ULL) >> FPU_FCTI(fctidu, uint64, 0x0000000000000000ULL) >> FPU_FCTI(fctiduz, uint64_round_to_zero, 0x0000000000000000ULL) >> -#endif >> - >> -#if defined(TARGET_PPC64) >> >> #define FPU_FCFI(op, cvtr, is_single) \ >> uint64_t helper_##op(CPUPPCState *env, uint64_t arg) \ >> @@ -678,8 +674,6 @@ FPU_FCFI(fcfids, int64_to_float32, 1) >> FPU_FCFI(fcfidu, uint64_to_float64, 0) >> FPU_FCFI(fcfidus, uint64_to_float32, 1) >> >> -#endif >> - >> static inline uint64_t do_fri(CPUPPCState *env, uint64_t arg, >> int rounding_mode) >> { >> diff --git a/target-ppc/helper.h b/target-ppc/helper.h >> index 509eae5..52402ef 100644 >> --- a/target-ppc/helper.h >> +++ b/target-ppc/helper.h >> @@ -67,16 +67,14 @@ DEF_HELPER_2(fctiw, i64, env, i64) >> DEF_HELPER_2(fctiwu, i64, env, i64) >> DEF_HELPER_2(fctiwz, i64, env, i64) >> DEF_HELPER_2(fctiwuz, i64, env, i64) >> -#if defined(TARGET_PPC64) >> DEF_HELPER_2(fcfid, i64, env, i64) >> DEF_HELPER_2(fcfidu, i64, env, i64) >> DEF_HELPER_2(fcfids, i64, env, i64) >> DEF_HELPER_2(fcfidus, i64, env, i64) >> DEF_HELPER_2(fctid, i64, env, i64) >> -DEF_HELPER_2(fctidu, i64, env, i64) >> DEF_HELPER_2(fctidz, i64, env, i64) >> +DEF_HELPER_2(fctidu, i64, env, i64) > > NIT: I would not have re-arranged fctidu/fctidz like this since it only makes the patch larger without actually accomplishing anything (unless, of course, the point of your patch is to do clean up). You seem to have done this in other places as well. > >> DEF_HELPER_2(fctiduz, i64, env, i64) >> -#endif >> DEF_HELPER_2(frsp, i64, env, i64) >> DEF_HELPER_2(frin, i64, env, i64) >> DEF_HELPER_2(friz, i64, env, i64) >> diff --git a/target-ppc/translate.c b/target-ppc/translate.c >> index c07bb01..1fe82ce 100644 >> --- a/target-ppc/translate.c >> +++ b/target-ppc/translate.c >> @@ -2246,9 +2246,8 @@ GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT); >> GEN_FLOAT_B(ctiwuz, 0x0F, 0x04, 0, PPC2_FP_CVT_ISA206); >> /* frsp */ >> GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT); >> -#if defined(TARGET_PPC64) >> /* fcfid */ >> -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B); >> +GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC2_FP_CVT_S64); >> /* fcfids */ >> GEN_FLOAT_B(cfids, 0x0E, 0x1A, 0, PPC2_FP_CVT_ISA206); >> /* fcfidu */ >> @@ -2256,14 +2255,13 @@ GEN_FLOAT_B(cfidu, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); >> /* fcfidus */ >> GEN_FLOAT_B(cfidus, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); >> /* fctid */ >> -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B); >> +GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC2_FP_CVT_S64); >> +/* fctidz */ >> +GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC2_FP_CVT_S64); >> /* fctidu */ >> GEN_FLOAT_B(ctidu, 0x0E, 0x1D, 0, PPC2_FP_CVT_ISA206); >> -/* fctidz */ >> -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B); >> /* fctidu */ >> GEN_FLOAT_B(ctiduz, 0x0F, 0x1D, 0, PPC2_FP_CVT_ISA206); >> -#endif >> >> /* frin */ >> GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT); >> @@ -10050,16 +10048,14 @@ GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), >> GEN_HANDLER_E(fctiwuz, 0x3F, 0x0F, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT), >> -#if defined(TARGET_PPC64) >> -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B), >> +GEN_HANDLER_E(fcfid, 0x3F, 0x0E, 0x1A, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >> GEN_HANDLER_E(fcfids, 0x3B, 0x0E, 0x1A, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> GEN_HANDLER_E(fcfidu, 0x3F, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> GEN_HANDLER_E(fcfidus, 0x3B, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B), >> +GEN_HANDLER_E(fctid, 0x3F, 0x0E, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >> +GEN_HANDLER_E(fctidz, 0x3F, 0x0F, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >> GEN_HANDLER_E(fctidu, 0x3F, 0x0E, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B), >> GEN_HANDLER_E(fctiduz, 0x3F, 0x0F, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >> -#endif >> GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT), >> GEN_FLOAT_B(riz, 0x08, 0x0D, 1, PPC_FLOAT_EXT), >> GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT), >> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c >> index 48177ed..ac4d12a 100644 >> --- a/target-ppc/translate_init.c >> +++ b/target-ppc/translate_init.c >> @@ -5010,7 +5010,8 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) >> PPC_FLOAT_STFIWX | PPC_WAIT | >> PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | >> PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; >> - pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206; >> + pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 | \ >> + PPC2_FP_CVT_S64; >> pcc->msr_mask = (1ull << MSR_CM) | >> (1ull << MSR_GS) | >> (1ull << MSR_UCLE) | >> @@ -7906,6 +7907,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) >> PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | >> PPC_64B | PPC_ALTIVEC | >> PPC_SEGMENT_64B | PPC_SLBI; >> + pcc->insns_flags2 = PPC2_FP_CVT_S64; >> pcc->msr_mask = (1ull << MSR_SF) | >> (1ull << MSR_VR) | >> (1ull << MSR_POW) | >> @@ -7958,6 +7960,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) >> PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | >> PPC_64B | >> PPC_SEGMENT_64B | PPC_SLBI; >> + pcc->insns_flags2 = PPC2_FP_CVT_S64; >> pcc->msr_mask = (1ull << MSR_SF) | >> (1ull << MSR_VR) | >> (1ull << MSR_POW) | >> @@ -8100,7 +8103,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) >> pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 | >> PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | >> PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | >> - PPC2_FP_TST_ISA206; >> + PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64; >> pcc->msr_mask = (1ull << MSR_SF) | >> (1ull << MSR_VR) | >> (1ull << MSR_VSX) | >> @@ -8178,7 +8181,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) >> PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | >> PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | >> PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | >> - PPC2_ISA205 | PPC2_ISA207S; >> + PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64; >> pcc->msr_mask = (1ull << MSR_SF) | >> (1ull << MSR_TM) | >> (1ull << MSR_VR) | >> > > Other than the minor comments .... > > Reviewed-by: Tom Musta <tommusta@gmail.com> > Tested-by: Tom Musta <tommusta@gmail.com> > One more issue .... the patch is missing the signoff (Alex will need one, I believe) ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 2014-09-12 14:40 ` Tom Musta @ 2014-09-12 14:56 ` Alexander Graf 0 siblings, 0 replies; 13+ messages in thread From: Alexander Graf @ 2014-09-12 14:56 UTC (permalink / raw) To: Tom Musta, Pierre Mallard, qemu-devel, qemu-ppc On 12.09.14 16:40, Tom Musta wrote: > On 9/12/2014 9:28 AM, Tom Musta wrote: >> On 9/11/2014 2:17 PM, Pierre Mallard wrote: >>> This patch remove limitation for fc[tf]id[*] on 32 bits targets and >>> add a new insn flag for signed integer 64 conversion PPC2_FP_CVT_S64 >>> --- >>> target-ppc/cpu.h | 5 ++++- >>> target-ppc/fpu_helper.c | 6 ------ >>> target-ppc/helper.h | 4 +--- >>> target-ppc/translate.c | 18 +++++++----------- >>> target-ppc/translate_init.c | 9 ++++++--- >>> 5 files changed, 18 insertions(+), 24 deletions(-) >>> >>> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h >>> index b64c652..fa50c32 100644 >>> --- a/target-ppc/cpu.h >>> +++ b/target-ppc/cpu.h >>> @@ -2008,13 +2008,16 @@ enum { >>> PPC2_ALTIVEC_207 = 0x0000000000004000ULL, >>> /* PowerISA 2.07 Book3s specification */ >>> PPC2_ISA207S = 0x0000000000008000ULL, >>> + /* Double precision floating point conversion for signed integer 64 */ >>> + PPC2_FP_CVT_S64 = 0x0000000000010000ULL, >>> >>> #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ >>> PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ >>> PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ >>> PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ >>> PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ >>> - PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP) >>> + PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ >>> + PPC2_FP_CVT_S64) >>> }; >>> >>> /*****************************************************************************/ >>> diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c >>> index da93d12..7f74466 100644 >>> --- a/target-ppc/fpu_helper.c >>> +++ b/target-ppc/fpu_helper.c >>> @@ -649,14 +649,10 @@ FPU_FCTI(fctiw, int32, 0x80000000U) >>> FPU_FCTI(fctiwz, int32_round_to_zero, 0x80000000U) >>> FPU_FCTI(fctiwu, uint32, 0x00000000U) >>> FPU_FCTI(fctiwuz, uint32_round_to_zero, 0x00000000U) >>> -#if defined(TARGET_PPC64) >>> FPU_FCTI(fctid, int64, 0x8000000000000000ULL) >>> FPU_FCTI(fctidz, int64_round_to_zero, 0x8000000000000000ULL) >>> FPU_FCTI(fctidu, uint64, 0x0000000000000000ULL) >>> FPU_FCTI(fctiduz, uint64_round_to_zero, 0x0000000000000000ULL) >>> -#endif >>> - >>> -#if defined(TARGET_PPC64) >>> >>> #define FPU_FCFI(op, cvtr, is_single) \ >>> uint64_t helper_##op(CPUPPCState *env, uint64_t arg) \ >>> @@ -678,8 +674,6 @@ FPU_FCFI(fcfids, int64_to_float32, 1) >>> FPU_FCFI(fcfidu, uint64_to_float64, 0) >>> FPU_FCFI(fcfidus, uint64_to_float32, 1) >>> >>> -#endif >>> - >>> static inline uint64_t do_fri(CPUPPCState *env, uint64_t arg, >>> int rounding_mode) >>> { >>> diff --git a/target-ppc/helper.h b/target-ppc/helper.h >>> index 509eae5..52402ef 100644 >>> --- a/target-ppc/helper.h >>> +++ b/target-ppc/helper.h >>> @@ -67,16 +67,14 @@ DEF_HELPER_2(fctiw, i64, env, i64) >>> DEF_HELPER_2(fctiwu, i64, env, i64) >>> DEF_HELPER_2(fctiwz, i64, env, i64) >>> DEF_HELPER_2(fctiwuz, i64, env, i64) >>> -#if defined(TARGET_PPC64) >>> DEF_HELPER_2(fcfid, i64, env, i64) >>> DEF_HELPER_2(fcfidu, i64, env, i64) >>> DEF_HELPER_2(fcfids, i64, env, i64) >>> DEF_HELPER_2(fcfidus, i64, env, i64) >>> DEF_HELPER_2(fctid, i64, env, i64) >>> -DEF_HELPER_2(fctidu, i64, env, i64) >>> DEF_HELPER_2(fctidz, i64, env, i64) >>> +DEF_HELPER_2(fctidu, i64, env, i64) >> >> NIT: I would not have re-arranged fctidu/fctidz like this since it only makes the patch larger without actually accomplishing anything (unless, of course, the point of your patch is to do clean up). You seem to have done this in other places as well. >> >>> DEF_HELPER_2(fctiduz, i64, env, i64) >>> -#endif >>> DEF_HELPER_2(frsp, i64, env, i64) >>> DEF_HELPER_2(frin, i64, env, i64) >>> DEF_HELPER_2(friz, i64, env, i64) >>> diff --git a/target-ppc/translate.c b/target-ppc/translate.c >>> index c07bb01..1fe82ce 100644 >>> --- a/target-ppc/translate.c >>> +++ b/target-ppc/translate.c >>> @@ -2246,9 +2246,8 @@ GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT); >>> GEN_FLOAT_B(ctiwuz, 0x0F, 0x04, 0, PPC2_FP_CVT_ISA206); >>> /* frsp */ >>> GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT); >>> -#if defined(TARGET_PPC64) >>> /* fcfid */ >>> -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B); >>> +GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC2_FP_CVT_S64); >>> /* fcfids */ >>> GEN_FLOAT_B(cfids, 0x0E, 0x1A, 0, PPC2_FP_CVT_ISA206); >>> /* fcfidu */ >>> @@ -2256,14 +2255,13 @@ GEN_FLOAT_B(cfidu, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); >>> /* fcfidus */ >>> GEN_FLOAT_B(cfidus, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); >>> /* fctid */ >>> -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B); >>> +GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC2_FP_CVT_S64); >>> +/* fctidz */ >>> +GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC2_FP_CVT_S64); >>> /* fctidu */ >>> GEN_FLOAT_B(ctidu, 0x0E, 0x1D, 0, PPC2_FP_CVT_ISA206); >>> -/* fctidz */ >>> -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B); >>> /* fctidu */ >>> GEN_FLOAT_B(ctiduz, 0x0F, 0x1D, 0, PPC2_FP_CVT_ISA206); >>> -#endif >>> >>> /* frin */ >>> GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT); >>> @@ -10050,16 +10048,14 @@ GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), >>> GEN_HANDLER_E(fctiwuz, 0x3F, 0x0F, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT), >>> -#if defined(TARGET_PPC64) >>> -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B), >>> +GEN_HANDLER_E(fcfid, 0x3F, 0x0E, 0x1A, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >>> GEN_HANDLER_E(fcfids, 0x3B, 0x0E, 0x1A, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> GEN_HANDLER_E(fcfidu, 0x3F, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> GEN_HANDLER_E(fcfidus, 0x3B, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B), >>> +GEN_HANDLER_E(fctid, 0x3F, 0x0E, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >>> +GEN_HANDLER_E(fctidz, 0x3F, 0x0F, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), >>> GEN_HANDLER_E(fctidu, 0x3F, 0x0E, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B), >>> GEN_HANDLER_E(fctiduz, 0x3F, 0x0F, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), >>> -#endif >>> GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT), >>> GEN_FLOAT_B(riz, 0x08, 0x0D, 1, PPC_FLOAT_EXT), >>> GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT), >>> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c >>> index 48177ed..ac4d12a 100644 >>> --- a/target-ppc/translate_init.c >>> +++ b/target-ppc/translate_init.c >>> @@ -5010,7 +5010,8 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) >>> PPC_FLOAT_STFIWX | PPC_WAIT | >>> PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | >>> PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; >>> - pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206; >>> + pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 | \ >>> + PPC2_FP_CVT_S64; >>> pcc->msr_mask = (1ull << MSR_CM) | >>> (1ull << MSR_GS) | >>> (1ull << MSR_UCLE) | >>> @@ -7906,6 +7907,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) >>> PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | >>> PPC_64B | PPC_ALTIVEC | >>> PPC_SEGMENT_64B | PPC_SLBI; >>> + pcc->insns_flags2 = PPC2_FP_CVT_S64; >>> pcc->msr_mask = (1ull << MSR_SF) | >>> (1ull << MSR_VR) | >>> (1ull << MSR_POW) | >>> @@ -7958,6 +7960,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) >>> PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | >>> PPC_64B | >>> PPC_SEGMENT_64B | PPC_SLBI; >>> + pcc->insns_flags2 = PPC2_FP_CVT_S64; >>> pcc->msr_mask = (1ull << MSR_SF) | >>> (1ull << MSR_VR) | >>> (1ull << MSR_POW) | >>> @@ -8100,7 +8103,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) >>> pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 | >>> PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | >>> PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | >>> - PPC2_FP_TST_ISA206; >>> + PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64; >>> pcc->msr_mask = (1ull << MSR_SF) | >>> (1ull << MSR_VR) | >>> (1ull << MSR_VSX) | >>> @@ -8178,7 +8181,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) >>> PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | >>> PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | >>> PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | >>> - PPC2_ISA205 | PPC2_ISA207S; >>> + PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64; >>> pcc->msr_mask = (1ull << MSR_SF) | >>> (1ull << MSR_TM) | >>> (1ull << MSR_VR) | >>> >> >> Other than the minor comments .... >> >> Reviewed-by: Tom Musta <tommusta@gmail.com> >> Tested-by: Tom Musta <tommusta@gmail.com> >> > > One more issue .... the patch is missing the signoff (Alex will need one, I believe) Yes, I can't apply patches without SoB line. Pierre, please check out http://wiki.qemu.org/Contribute/SubmitAPatch with some hints on how to do great patch submissions :). Alex ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU 2014-09-11 19:17 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Pierre Mallard 2014-09-11 19:17 ` [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard @ 2014-09-11 19:17 ` Pierre Mallard 2014-09-12 14:41 ` Tom Musta 2014-09-12 14:29 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Tom Musta 2 siblings, 1 reply; 13+ messages in thread From: Pierre Mallard @ 2014-09-11 19:17 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: tommusta, agraf, Pierre Mallard This patch add a new processor type 440x5wDFPU for Virtex 5 PPC440 with an external APU FPU in double precision mode --- target-ppc/cpu-models.c | 3 +++ target-ppc/translate_init.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index 52ac6ec..91e9fac 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -309,6 +309,9 @@ #endif POWERPC_DEF("440-Xilinx", CPU_POWERPC_440_XILINX, 440x5, "PowerPC 440 Xilinx 5") + + POWERPC_DEF("440-Xilinx-w-dfpu", CPU_POWERPC_440_XILINX, 440x5wDFPU, + "PowerPC 440 Xilinx 5 With a Double Prec. FPU") #if defined(TODO) POWERPC_DEF("440A5", CPU_POWERPC_440A5, 440x5, "PowerPC 440 A5") diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index ac4d12a..7d7dce7 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -3923,6 +3923,44 @@ POWERPC_FAMILY(440x5)(ObjectClass *oc, void *data) POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; } +POWERPC_FAMILY(440x5wDFPU)(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); + + dc->desc = "PowerPC 440x5 with double precision FPU"; + pcc->init_proc = init_proc_440x5; + pcc->check_pow = check_pow_nocheck; + pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | + PPC_FLOAT | PPC_FLOAT_FSQRT | + PPC_FLOAT_STFIWX | + PPC_DCR | PPC_WRTEE | PPC_RFMCI | + PPC_CACHE | PPC_CACHE_ICBI | + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | + PPC_MEM_TLBSYNC | PPC_MFTB | + PPC_BOOKE | PPC_4xx_COMMON | PPC_405_MAC | + PPC_440_SPEC; + pcc->insns_flags2 = PPC2_FP_CVT_S64; + pcc->msr_mask = (1ull << MSR_POW) | + (1ull << MSR_CE) | + (1ull << MSR_EE) | + (1ull << MSR_PR) | + (1ull << MSR_FP) | + (1ull << MSR_ME) | + (1ull << MSR_FE0) | + (1ull << MSR_DWE) | + (1ull << MSR_DE) | + (1ull << MSR_FE1) | + (1ull << MSR_IR) | + (1ull << MSR_DR); + pcc->mmu_model = POWERPC_MMU_BOOKE; + pcc->excp_model = POWERPC_EXCP_BOOKE; + pcc->bus_model = PPC_FLAGS_INPUT_BookE; + pcc->bfd_mach = bfd_mach_ppc_403; + pcc->flags = POWERPC_FLAG_CE | POWERPC_FLAG_DWE | + POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; +} + static void init_proc_460 (CPUPPCState *env) { /* Time base */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU 2014-09-11 19:17 ` [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard @ 2014-09-12 14:41 ` Tom Musta 0 siblings, 0 replies; 13+ messages in thread From: Tom Musta @ 2014-09-12 14:41 UTC (permalink / raw) To: Pierre Mallard, qemu-devel, qemu-ppc; +Cc: agraf On 9/11/2014 2:17 PM, Pierre Mallard wrote: > This patch add a new processor type 440x5wDFPU for Virtex 5 PPC440 > with an external APU FPU in double precision mode > --- > target-ppc/cpu-models.c | 3 +++ > target-ppc/translate_init.c | 38 ++++++++++++++++++++++++++++++++++++++ > 2 files changed, 41 insertions(+) > > diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c > index 52ac6ec..91e9fac 100644 > --- a/target-ppc/cpu-models.c > +++ b/target-ppc/cpu-models.c > @@ -309,6 +309,9 @@ > #endif > POWERPC_DEF("440-Xilinx", CPU_POWERPC_440_XILINX, 440x5, > "PowerPC 440 Xilinx 5") > + > + POWERPC_DEF("440-Xilinx-w-dfpu", CPU_POWERPC_440_XILINX, 440x5wDFPU, > + "PowerPC 440 Xilinx 5 With a Double Prec. FPU") > #if defined(TODO) > POWERPC_DEF("440A5", CPU_POWERPC_440A5, 440x5, > "PowerPC 440 A5") > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index ac4d12a..7d7dce7 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -3923,6 +3923,44 @@ POWERPC_FAMILY(440x5)(ObjectClass *oc, void *data) > POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; > } > > +POWERPC_FAMILY(440x5wDFPU)(ObjectClass *oc, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(oc); > + PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); > + > + dc->desc = "PowerPC 440x5 with double precision FPU"; > + pcc->init_proc = init_proc_440x5; > + pcc->check_pow = check_pow_nocheck; > + pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | > + PPC_FLOAT | PPC_FLOAT_FSQRT | > + PPC_FLOAT_STFIWX | > + PPC_DCR | PPC_WRTEE | PPC_RFMCI | > + PPC_CACHE | PPC_CACHE_ICBI | > + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | > + PPC_MEM_TLBSYNC | PPC_MFTB | > + PPC_BOOKE | PPC_4xx_COMMON | PPC_405_MAC | > + PPC_440_SPEC; > + pcc->insns_flags2 = PPC2_FP_CVT_S64; > + pcc->msr_mask = (1ull << MSR_POW) | > + (1ull << MSR_CE) | > + (1ull << MSR_EE) | > + (1ull << MSR_PR) | > + (1ull << MSR_FP) | > + (1ull << MSR_ME) | > + (1ull << MSR_FE0) | > + (1ull << MSR_DWE) | > + (1ull << MSR_DE) | > + (1ull << MSR_FE1) | > + (1ull << MSR_IR) | > + (1ull << MSR_DR); > + pcc->mmu_model = POWERPC_MMU_BOOKE; > + pcc->excp_model = POWERPC_EXCP_BOOKE; > + pcc->bus_model = PPC_FLAGS_INPUT_BookE; > + pcc->bfd_mach = bfd_mach_ppc_403; > + pcc->flags = POWERPC_FLAG_CE | POWERPC_FLAG_DWE | > + POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; > +} > + > static void init_proc_460 (CPUPPCState *env) > { > /* Time base */ > I don't see any significant issues with this patch, but it does not pass the patch checker: > ./scripts/checkpatch.pl ../patches/pierre.mallard.fctid.v2/0002.patch WARNING: line over 80 characters #19: FILE: target-ppc/cpu-models.c:313: + POWERPC_DEF("440-Xilinx-w-dfpu", CPU_POWERPC_440_XILINX, 440x5wDFPU, ERROR: trailing whitespace #41: FILE: target-ppc/translate_init.c:3935: + PPC_FLOAT | PPC_FLOAT_FSQRT | $ ERROR: Missing Signed-off-by: line(s) total: 2 errors, 1 warnings, 53 lines checked ../patches/pierre.mallard.fctid.v2/0002.patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs 2014-09-11 19:17 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Pierre Mallard 2014-09-11 19:17 ` [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard 2014-09-11 19:17 ` [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard @ 2014-09-12 14:29 ` Tom Musta 2014-09-12 19:27 ` Pierre Mallard 2 siblings, 1 reply; 13+ messages in thread From: Tom Musta @ 2014-09-12 14:29 UTC (permalink / raw) To: Pierre Mallard, qemu-devel, qemu-ppc; +Cc: agraf On 9/11/2014 2:17 PM, Pierre Mallard wrote: > This patch series enable floating point instruction in 440x5 CPUs > which have the capabilities to have optional APU FPU in double precision mode. > > 1) Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 with a new insn2 flag > 2) Create a new 440x5 implementing floating point instructions > > Pierre Mallard (2): > target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 > target-ppc : Add new processor type 440x5wDFPU > > target-ppc/cpu-models.c | 3 +++ > target-ppc/cpu.h | 5 ++++- > target-ppc/fpu_helper.c | 6 ------ > target-ppc/helper.h | 4 +--- > target-ppc/translate.c | 18 +++++++---------- > target-ppc/translate_init.c | 47 ++++++++++++++++++++++++++++++++++++++++--- > 6 files changed, 59 insertions(+), 24 deletions(-) > NIT: It is customary to version your patches so that we can all keep them straight. So "[V2 PATCH 0/2] ...". You can use the --subject-prefix option to git format-patch. I will defer to Alex on whether he wants you to resubmit. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs 2014-09-12 14:29 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Tom Musta @ 2014-09-12 19:27 ` Pierre Mallard 0 siblings, 0 replies; 13+ messages in thread From: Pierre Mallard @ 2014-09-12 19:27 UTC (permalink / raw) To: Tom Musta; +Cc: qemu-ppc, qemu-devel, Alexander Graf [-- Attachment #1: Type: text/plain, Size: 1326 bytes --] No problem I repost, I triple check, hope this time everythng will be correct, sorry for the extra work time ... Pierre On Fri, Sep 12, 2014 at 4:29 PM, Tom Musta <tommusta@gmail.com> wrote: > On 9/11/2014 2:17 PM, Pierre Mallard wrote: > > This patch series enable floating point instruction in 440x5 CPUs > > which have the capabilities to have optional APU FPU in double precision > mode. > > > > 1) Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 with a new insn2 flag > > 2) Create a new 440x5 implementing floating point instructions > > > > Pierre Mallard (2): > > target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 > > target-ppc : Add new processor type 440x5wDFPU > > > > target-ppc/cpu-models.c | 3 +++ > > target-ppc/cpu.h | 5 ++++- > > target-ppc/fpu_helper.c | 6 ------ > > target-ppc/helper.h | 4 +--- > > target-ppc/translate.c | 18 +++++++---------- > > target-ppc/translate_init.c | 47 > ++++++++++++++++++++++++++++++++++++++++--- > > 6 files changed, 59 insertions(+), 24 deletions(-) > > > > NIT: It is customary to version your patches so that we can all keep them > straight. So "[V2 PATCH 0/2] ...". You can use the --subject-prefix > option to git format-patch. I will defer to Alex on whether he wants you > to resubmit. > [-- Attachment #2: Type: text/html, Size: 1840 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v2 0/2] Enabling floating point instruction to 440x5 CPUs [not found] <1410325413> 2014-09-11 19:17 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Pierre Mallard @ 2014-09-12 19:31 ` Pierre Mallard 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard ` (2 more replies) 1 sibling, 3 replies; 13+ messages in thread From: Pierre Mallard @ 2014-09-12 19:31 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: agraf, tommusta, Pierre Mallard This patch series enable floating point instruction in 440x5 CPUs which have the capabilities to have optional APU FPU in double precision mode. 1) Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 with a new insn2 flag 2) Create a new 440x5 implementing floating point instructions Pierre Mallard (2): target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 target-ppc : Add new processor type 440x5wDFPU target-ppc/cpu-models.c | 3 +++ target-ppc/cpu.h | 5 ++++- target-ppc/fpu_helper.c | 6 ------ target-ppc/helper.h | 2 -- target-ppc/translate.c | 16 ++++++--------- target-ppc/translate_init.c | 47 ++++++++++++++++++++++++++++++++++++++++--- 6 files changed, 57 insertions(+), 22 deletions(-) -- 1.7.10.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 " Pierre Mallard @ 2014-09-12 19:31 ` Pierre Mallard 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard 2014-09-12 19:46 ` [Qemu-devel] [Qemu-ppc] [PATCH v2 0/2] Enabling floating point instruction to 440x5 CPUs Alexander Graf 2 siblings, 0 replies; 13+ messages in thread From: Pierre Mallard @ 2014-09-12 19:31 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: agraf, tommusta, Pierre Mallard This patch remove limitation for fc[tf]id[*] on 32 bits targets and add a new insn flag for signed integer 64 conversion PPC2_FP_CVT_S64 Signed-off-by: Pierre Mallard <mallard.pierre@gmail.com> --- target-ppc/cpu.h | 5 ++++- target-ppc/fpu_helper.c | 6 ------ target-ppc/helper.h | 2 -- target-ppc/translate.c | 16 ++++++---------- target-ppc/translate_init.c | 9 ++++++--- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index b64c652..fa50c32 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -2008,13 +2008,16 @@ enum { PPC2_ALTIVEC_207 = 0x0000000000004000ULL, /* PowerISA 2.07 Book3s specification */ PPC2_ISA207S = 0x0000000000008000ULL, + /* Double precision floating point conversion for signed integer 64 */ + PPC2_FP_CVT_S64 = 0x0000000000010000ULL, #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | \ PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | \ PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | \ - PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP) + PPC2_ALTIVEC_207 | PPC2_ISA207S | PPC2_DFP | \ + PPC2_FP_CVT_S64) }; /*****************************************************************************/ diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c index da93d12..7f74466 100644 --- a/target-ppc/fpu_helper.c +++ b/target-ppc/fpu_helper.c @@ -649,14 +649,10 @@ FPU_FCTI(fctiw, int32, 0x80000000U) FPU_FCTI(fctiwz, int32_round_to_zero, 0x80000000U) FPU_FCTI(fctiwu, uint32, 0x00000000U) FPU_FCTI(fctiwuz, uint32_round_to_zero, 0x00000000U) -#if defined(TARGET_PPC64) FPU_FCTI(fctid, int64, 0x8000000000000000ULL) FPU_FCTI(fctidz, int64_round_to_zero, 0x8000000000000000ULL) FPU_FCTI(fctidu, uint64, 0x0000000000000000ULL) FPU_FCTI(fctiduz, uint64_round_to_zero, 0x0000000000000000ULL) -#endif - -#if defined(TARGET_PPC64) #define FPU_FCFI(op, cvtr, is_single) \ uint64_t helper_##op(CPUPPCState *env, uint64_t arg) \ @@ -678,8 +674,6 @@ FPU_FCFI(fcfids, int64_to_float32, 1) FPU_FCFI(fcfidu, uint64_to_float64, 0) FPU_FCFI(fcfidus, uint64_to_float32, 1) -#endif - static inline uint64_t do_fri(CPUPPCState *env, uint64_t arg, int rounding_mode) { diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 509eae5..9a3902e 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -67,7 +67,6 @@ DEF_HELPER_2(fctiw, i64, env, i64) DEF_HELPER_2(fctiwu, i64, env, i64) DEF_HELPER_2(fctiwz, i64, env, i64) DEF_HELPER_2(fctiwuz, i64, env, i64) -#if defined(TARGET_PPC64) DEF_HELPER_2(fcfid, i64, env, i64) DEF_HELPER_2(fcfidu, i64, env, i64) DEF_HELPER_2(fcfids, i64, env, i64) @@ -76,7 +75,6 @@ DEF_HELPER_2(fctid, i64, env, i64) DEF_HELPER_2(fctidu, i64, env, i64) DEF_HELPER_2(fctidz, i64, env, i64) DEF_HELPER_2(fctiduz, i64, env, i64) -#endif DEF_HELPER_2(frsp, i64, env, i64) DEF_HELPER_2(frin, i64, env, i64) DEF_HELPER_2(friz, i64, env, i64) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index c07bb01..a8aa5b4 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -2246,9 +2246,8 @@ GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT); GEN_FLOAT_B(ctiwuz, 0x0F, 0x04, 0, PPC2_FP_CVT_ISA206); /* frsp */ GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT); -#if defined(TARGET_PPC64) /* fcfid */ -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B); +GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC2_FP_CVT_S64); /* fcfids */ GEN_FLOAT_B(cfids, 0x0E, 0x1A, 0, PPC2_FP_CVT_ISA206); /* fcfidu */ @@ -2256,14 +2255,13 @@ GEN_FLOAT_B(cfidu, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); /* fcfidus */ GEN_FLOAT_B(cfidus, 0x0E, 0x1E, 0, PPC2_FP_CVT_ISA206); /* fctid */ -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B); +GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC2_FP_CVT_S64); /* fctidu */ GEN_FLOAT_B(ctidu, 0x0E, 0x1D, 0, PPC2_FP_CVT_ISA206); /* fctidz */ -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B); +GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC2_FP_CVT_S64); /* fctidu */ GEN_FLOAT_B(ctiduz, 0x0F, 0x1D, 0, PPC2_FP_CVT_ISA206); -#endif /* frin */ GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT); @@ -10050,16 +10048,14 @@ GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), GEN_HANDLER_E(fctiwuz, 0x3F, 0x0F, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_FLOAT_B(rsp, 0x0C, 0x00, 1, PPC_FLOAT), -#if defined(TARGET_PPC64) -GEN_FLOAT_B(cfid, 0x0E, 0x1A, 1, PPC_64B), +GEN_HANDLER_E(fcfid, 0x3F, 0x0E, 0x1A, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), GEN_HANDLER_E(fcfids, 0x3B, 0x0E, 0x1A, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_HANDLER_E(fcfidu, 0x3F, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_HANDLER_E(fcfidus, 0x3B, 0x0E, 0x1E, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -GEN_FLOAT_B(ctid, 0x0E, 0x19, 0, PPC_64B), +GEN_HANDLER_E(fctid, 0x3F, 0x0E, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), GEN_HANDLER_E(fctidu, 0x3F, 0x0E, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -GEN_FLOAT_B(ctidz, 0x0F, 0x19, 0, PPC_64B), +GEN_HANDLER_E(fctidz, 0x3F, 0x0F, 0x19, 0x001F0000, PPC_NONE, PPC2_FP_CVT_S64), GEN_HANDLER_E(fctiduz, 0x3F, 0x0F, 0x1D, 0, PPC_NONE, PPC2_FP_CVT_ISA206), -#endif GEN_FLOAT_B(rin, 0x08, 0x0C, 1, PPC_FLOAT_EXT), GEN_FLOAT_B(riz, 0x08, 0x0D, 1, PPC_FLOAT_EXT), GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT), diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 48177ed..ac4d12a 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -5010,7 +5010,8 @@ POWERPC_FAMILY(e5500)(ObjectClass *oc, void *data) PPC_FLOAT_STFIWX | PPC_WAIT | PPC_MEM_TLBSYNC | PPC_TLBIVAX | PPC_MEM_SYNC | PPC_64B | PPC_POPCNTB | PPC_POPCNTWD; - pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206; + pcc->insns_flags2 = PPC2_BOOKE206 | PPC2_PRCNTL | PPC2_PERM_ISA206 | \ + PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_CM) | (1ull << MSR_GS) | (1ull << MSR_UCLE) | @@ -7906,6 +7907,7 @@ POWERPC_FAMILY(970)(ObjectClass *oc, void *data) PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | PPC_64B | PPC_ALTIVEC | PPC_SEGMENT_64B | PPC_SLBI; + pcc->insns_flags2 = PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -7958,6 +7960,7 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) PPC_MEM_TLBIE | PPC_MEM_TLBSYNC | PPC_64B | PPC_SEGMENT_64B | PPC_SLBI; + pcc->insns_flags2 = PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_POW) | @@ -8100,7 +8103,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->insns_flags2 = PPC2_VSX | PPC2_DFP | PPC2_DBRX | PPC2_ISA205 | PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | - PPC2_FP_TST_ISA206; + PPC2_FP_TST_ISA206 | PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_VR) | (1ull << MSR_VSX) | @@ -8178,7 +8181,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | - PPC2_ISA205 | PPC2_ISA207S; + PPC2_ISA205 | PPC2_ISA207S | PPC2_FP_CVT_S64; pcc->msr_mask = (1ull << MSR_SF) | (1ull << MSR_TM) | (1ull << MSR_VR) | -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] target-ppc : Add new processor type 440x5wDFPU 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 " Pierre Mallard 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard @ 2014-09-12 19:31 ` Pierre Mallard 2014-09-12 19:46 ` [Qemu-devel] [Qemu-ppc] [PATCH v2 0/2] Enabling floating point instruction to 440x5 CPUs Alexander Graf 2 siblings, 0 replies; 13+ messages in thread From: Pierre Mallard @ 2014-09-12 19:31 UTC (permalink / raw) To: qemu-devel, qemu-ppc; +Cc: agraf, tommusta, Pierre Mallard This patch add a new processor type 440x5wDFPU for Virtex 5 PPC440 with an external APU FPU in double precision mode Signed-off-by: Pierre Mallard <mallard.pierre@gmail.com> --- target-ppc/cpu-models.c | 3 +++ target-ppc/translate_init.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index 52ac6ec..3f18996 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -309,6 +309,9 @@ #endif POWERPC_DEF("440-Xilinx", CPU_POWERPC_440_XILINX, 440x5, "PowerPC 440 Xilinx 5") + + POWERPC_DEF("440-Xilinx-w-dfpu", CPU_POWERPC_440_XILINX, 440x5wDFPU, + "PowerPC 440 Xilinx 5 With a Double Prec. FPU") #if defined(TODO) POWERPC_DEF("440A5", CPU_POWERPC_440A5, 440x5, "PowerPC 440 A5") diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index ac4d12a..4baf1f3 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -3923,6 +3923,44 @@ POWERPC_FAMILY(440x5)(ObjectClass *oc, void *data) POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; } +POWERPC_FAMILY(440x5wDFPU)(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); + + dc->desc = "PowerPC 440x5 with double precision FPU"; + pcc->init_proc = init_proc_440x5; + pcc->check_pow = check_pow_nocheck; + pcc->insns_flags = PPC_INSNS_BASE | PPC_STRING | + PPC_FLOAT | PPC_FLOAT_FSQRT | + PPC_FLOAT_STFIWX | + PPC_DCR | PPC_WRTEE | PPC_RFMCI | + PPC_CACHE | PPC_CACHE_ICBI | + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | + PPC_MEM_TLBSYNC | PPC_MFTB | + PPC_BOOKE | PPC_4xx_COMMON | PPC_405_MAC | + PPC_440_SPEC; + pcc->insns_flags2 = PPC2_FP_CVT_S64; + pcc->msr_mask = (1ull << MSR_POW) | + (1ull << MSR_CE) | + (1ull << MSR_EE) | + (1ull << MSR_PR) | + (1ull << MSR_FP) | + (1ull << MSR_ME) | + (1ull << MSR_FE0) | + (1ull << MSR_DWE) | + (1ull << MSR_DE) | + (1ull << MSR_FE1) | + (1ull << MSR_IR) | + (1ull << MSR_DR); + pcc->mmu_model = POWERPC_MMU_BOOKE; + pcc->excp_model = POWERPC_EXCP_BOOKE; + pcc->bus_model = PPC_FLAGS_INPUT_BookE; + pcc->bfd_mach = bfd_mach_ppc_403; + pcc->flags = POWERPC_FLAG_CE | POWERPC_FLAG_DWE | + POWERPC_FLAG_DE | POWERPC_FLAG_BUS_CLK; +} + static void init_proc_460 (CPUPPCState *env) { /* Time base */ -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v2 0/2] Enabling floating point instruction to 440x5 CPUs 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 " Pierre Mallard 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard 2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard @ 2014-09-12 19:46 ` Alexander Graf 2 siblings, 0 replies; 13+ messages in thread From: Alexander Graf @ 2014-09-12 19:46 UTC (permalink / raw) To: Pierre Mallard, qemu-devel, qemu-ppc; +Cc: agraf, tommusta On 12.09.14 21:31, Pierre Mallard wrote: > This patch series enable floating point instruction in 440x5 CPUs > which have the capabilities to have optional APU FPU in double precision mode. > > 1) Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 with a new insn2 flag > 2) Create a new 440x5 implementing floating point instructions Thanks, applied to ppc-next. Alex ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-09-12 19:46 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1410325413>
2014-09-11 19:17 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Pierre Mallard
2014-09-11 19:17 ` [Qemu-devel] [PATCH 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard
2014-09-12 14:28 ` Tom Musta
2014-09-12 14:40 ` Tom Musta
2014-09-12 14:56 ` Alexander Graf
2014-09-11 19:17 ` [Qemu-devel] [PATCH 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard
2014-09-12 14:41 ` Tom Musta
2014-09-12 14:29 ` [Qemu-devel] [PATCH 0/2] Enabling floating point instruction to 440x5 CPUs Tom Musta
2014-09-12 19:27 ` Pierre Mallard
2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 " Pierre Mallard
2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 1/2] target-ppc : Allow fc[tf]id[*] mnemonics for non TARGET_PPC64 Pierre Mallard
2014-09-12 19:31 ` [Qemu-devel] [PATCH v2 2/2] target-ppc : Add new processor type 440x5wDFPU Pierre Mallard
2014-09-12 19:46 ` [Qemu-devel] [Qemu-ppc] [PATCH v2 0/2] Enabling floating point instruction to 440x5 CPUs Alexander Graf
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.