| Message ID | 20211016085428.3001501-3-frank.chang@sifive.com |
|---|---|
| State | New |
| Headers | show |
| Series | add APIs to handle alternative sNaN propagation for fmax/fmin | expand |
On Sat, Oct 16, 2021 at 4:54 PM <frank.chang@sifive.com> wrote: > From: Chih-Min Chao <chihmin.chao@sifive.com> > > The sNaN propagation behavior has been changed since > cd20cee7 in https://github.com/riscv/riscv-isa-manual. > > Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com> > Signed-off-by: Frank Chang <frank.chang@sifive.com> > --- > target/riscv/fpu_helper.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c > index 8700516a14c..d62f4709002 100644 > --- a/target/riscv/fpu_helper.c > +++ b/target/riscv/fpu_helper.c > @@ -174,14 +174,18 @@ uint64_t helper_fmin_s(CPURISCVState *env, uint64_t > rs1, uint64_t rs2) > { > float32 frs1 = check_nanbox_s(rs1); > float32 frs2 = check_nanbox_s(rs2); > - return nanbox_s(float32_minnum(frs1, frs2, &env->fp_status)); > + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? > + float32_minnum(frs1, frs2, &env->fp_status) : > + float32_minimum_number(frs1, frs2, &env->fp_status)); > } > > uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > float32 frs1 = check_nanbox_s(rs1); > float32 frs2 = check_nanbox_s(rs2); > - return nanbox_s(float32_maxnum(frs1, frs2, &env->fp_status)); > + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? > + float32_maxnum(frs1, frs2, &env->fp_status) : > + float32_maximum_number(frs1, frs2, &env->fp_status)); > } > > uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1) > @@ -283,12 +287,16 @@ uint64_t helper_fdiv_d(CPURISCVState *env, uint64_t > frs1, uint64_t frs2) > > uint64_t helper_fmin_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > { > - return float64_minnum(frs1, frs2, &env->fp_status); > + return env->priv_ver < PRIV_VERSION_1_11_0 ? > + float64_minnum(frs1, frs2, &env->fp_status) : > + float64_minimum_number(frs1, frs2, &env->fp_status); > } > > uint64_t helper_fmax_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > { > - return float64_maxnum(frs1, frs2, &env->fp_status); > + return env->priv_ver < PRIV_VERSION_1_11_0 ? > + float64_maxnum(frs1, frs2, &env->fp_status) : > + float64_maximum_number(frs1, frs2, &env->fp_status); > } > > uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t rs1) > -- > 2.25.1 > > If we have decided to tie RVF with Privilege spec version for now as discussed in: https://patchew.org/QEMU/20211015065500.3850513-1-frank.chang@sifive.com/20211015065500.3850513-3-frank.chang@sifive.com/ then I think this patch doesn't require any further changes, right? Regards, Frank Chang
On Sat, Oct 16, 2021 at 6:55 PM <frank.chang@sifive.com> wrote: > > From: Chih-Min Chao <chihmin.chao@sifive.com> > > The sNaN propagation behavior has been changed since > cd20cee7 in https://github.com/riscv/riscv-isa-manual. It would be a good idea to justify why we are using the priv spec for the version check. > > Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com> > Signed-off-by: Frank Chang <frank.chang@sifive.com> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/fpu_helper.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c > index 8700516a14c..d62f4709002 100644 > --- a/target/riscv/fpu_helper.c > +++ b/target/riscv/fpu_helper.c > @@ -174,14 +174,18 @@ uint64_t helper_fmin_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > float32 frs1 = check_nanbox_s(rs1); > float32 frs2 = check_nanbox_s(rs2); > - return nanbox_s(float32_minnum(frs1, frs2, &env->fp_status)); > + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? > + float32_minnum(frs1, frs2, &env->fp_status) : > + float32_minimum_number(frs1, frs2, &env->fp_status)); > } > > uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) > { > float32 frs1 = check_nanbox_s(rs1); > float32 frs2 = check_nanbox_s(rs2); > - return nanbox_s(float32_maxnum(frs1, frs2, &env->fp_status)); > + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? > + float32_maxnum(frs1, frs2, &env->fp_status) : > + float32_maximum_number(frs1, frs2, &env->fp_status)); > } > > uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1) > @@ -283,12 +287,16 @@ uint64_t helper_fdiv_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > > uint64_t helper_fmin_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > { > - return float64_minnum(frs1, frs2, &env->fp_status); > + return env->priv_ver < PRIV_VERSION_1_11_0 ? > + float64_minnum(frs1, frs2, &env->fp_status) : > + float64_minimum_number(frs1, frs2, &env->fp_status); > } > > uint64_t helper_fmax_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) > { > - return float64_maxnum(frs1, frs2, &env->fp_status); > + return env->priv_ver < PRIV_VERSION_1_11_0 ? > + float64_maxnum(frs1, frs2, &env->fp_status) : > + float64_maximum_number(frs1, frs2, &env->fp_status); > } > > uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t rs1) > -- > 2.25.1 > >
diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index 8700516a14c..d62f4709002 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -174,14 +174,18 @@ uint64_t helper_fmin_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) { float32 frs1 = check_nanbox_s(rs1); float32 frs2 = check_nanbox_s(rs2); - return nanbox_s(float32_minnum(frs1, frs2, &env->fp_status)); + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? + float32_minnum(frs1, frs2, &env->fp_status) : + float32_minimum_number(frs1, frs2, &env->fp_status)); } uint64_t helper_fmax_s(CPURISCVState *env, uint64_t rs1, uint64_t rs2) { float32 frs1 = check_nanbox_s(rs1); float32 frs2 = check_nanbox_s(rs2); - return nanbox_s(float32_maxnum(frs1, frs2, &env->fp_status)); + return nanbox_s(env->priv_ver < PRIV_VERSION_1_11_0 ? + float32_maxnum(frs1, frs2, &env->fp_status) : + float32_maximum_number(frs1, frs2, &env->fp_status)); } uint64_t helper_fsqrt_s(CPURISCVState *env, uint64_t rs1) @@ -283,12 +287,16 @@ uint64_t helper_fdiv_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) uint64_t helper_fmin_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) { - return float64_minnum(frs1, frs2, &env->fp_status); + return env->priv_ver < PRIV_VERSION_1_11_0 ? + float64_minnum(frs1, frs2, &env->fp_status) : + float64_minimum_number(frs1, frs2, &env->fp_status); } uint64_t helper_fmax_d(CPURISCVState *env, uint64_t frs1, uint64_t frs2) { - return float64_maxnum(frs1, frs2, &env->fp_status); + return env->priv_ver < PRIV_VERSION_1_11_0 ? + float64_maxnum(frs1, frs2, &env->fp_status) : + float64_maximum_number(frs1, frs2, &env->fp_status); } uint64_t helper_fcvt_s_d(CPURISCVState *env, uint64_t rs1)