ppc/translate: Fix unordered f64/f128 comparisons
v3 cover ppc/translate: Fix unordered f64/f128 comparisons
Fix a couple of problems found in the emulation of f64/f128 comparisons plus some minimal self-contained commits to clean-up some code.
Giuseppe Musacchio (4):
ppc/translate: Fix unordered f64/f128 comparisons ppc/translate: Turn the helper macros into functions ppc/translate: Delay NaN checking after comparison ppc/translate: Raise exceptions after setting the cc
target/ppc/fpu_helper.c | 212 +++++++++++++++++++++++----------------- 1 file changed, 121 insertions(+), 91 deletions(-)
Signature · 1 line
2.27.0
PATCH v3 1/4 ppc/translate: Fix unordered f64/f128 comparisons
According to the PowerISA v3.1 reference, Table 68 "Actions for xscmpudp
- Part 1: Compare Unordered", whenever one of the two operands is a NaN the SO bit is set while the other three bits are cleared.
Apply the same change to xscmpuqp.
The respective ordered counterparts are unaffected.
--- target/ppc/fpu_helper.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
target/ppc/fpu_helper.c +22 -10
@@ -2479,13 +2479,11 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \if (float64_is_signaling_nan (xa->VsrD (0 ), &env->fp_status) || \float64_is_signaling_nan (xb->VsrD (0 ), &env->fp_status)) { \ vxsnan_flag = true; \ - cc =CRF_SO ; \if (fpscr_ve ==0 && ordered) { \ vxvc_flag = true; \ } \ }else if (float64_is_quiet_nan (xa->VsrD (0 ), &env->fp_status) || \float64_is_quiet_nan (xb->VsrD (0 ), &env->fp_status)) { \ - cc =CRF_SO ; \if (ordered) { \ vxvc_flag = true; \ } \
@@ -2497,12 +2495,19 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \float_invalid_op_vxvc (env,0 ,GETPC ()); \ } \ \ -if (float64_lt (xa->VsrD (0 ), xb->VsrD (0 ), &env->fp_status)) { \ +switch (float64_compare (xa->VsrD (0 ), xb->VsrD (0 ), &env->fp_status)) {\ +case float_relation_less: \ cc |=CRF_LT ; \ - }else if (!float64_le (xa->VsrD (0 ), xb->VsrD (0 ), &env->fp_status)) { \ - cc |=CRF_GT ; \ - }else { \ +break ; \ +case float_relation_equal: \ cc |=CRF_EQ ; \ +break ; \ +case float_relation_greater: \ + cc |=CRF_GT ; \ +break ; \ +case float_relation_unordered: \ + cc |=CRF_SO ; \ +break ; \ } \ \ env->fpscr &= ~FP_FPCC ; \
@@ -2545,12 +2550,19 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \float_invalid_op_vxvc (env,0 ,GETPC ()); \ } \ \ -if (float128_lt (xa->f128, xb->f128, &env->fp_status)) { \ +switch (float128_compare (xa->f128, xb->f128, &env->fp_status)) { \ +case float_relation_less: \ cc |=CRF_LT ; \ - }else if (!float128_le (xa->f128, xb->f128, &env->fp_status)) { \ - cc |=CRF_GT ; \ - }else { \ +break ; \ +case float_relation_equal: \ cc |=CRF_EQ ; \ +break ; \ +case float_relation_greater: \ + cc |=CRF_GT ; \ +break ; \ +case float_relation_unordered: \ + cc |=CRF_SO ; \ +break ; \ } \ \ env->fpscr &= ~FP_FPCC ; \
Signature · 1 line
2.27.0
PATCH v3 2/4 ppc/translate: Turn the helper macros into functions
In reply to LemonBoy--- target/ppc/fpu_helper.c | 222 ++++++++++++++++++++++------------------ 1 file changed, 120 insertions(+), 102 deletions(-)
target/ppc/fpu_helper.c +120 -102
@@ -2467,113 +2467,131 @@ void helper_xscmpexpqp(CPUPPCState *env, uint32_t opcode,do_float_check_status (env,GETPC ()); } -#define VSX_SCALAR_CMP (op, ordered) \ -void helper_##op(CPUPPCState *env, uint32_t opcode, \ - ppc_vsr_t *xa, ppc_vsr_t *xb) \ -{ \ - uint32_t cc = 0; \ - bool vxsnan_flag = false, vxvc_flag = false; \ - \ - helper_reset_fpstatus(env); \ - \ - if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || \ - float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { \ - vxsnan_flag = true; \ - if (fpscr_ve == 0 && ordered) { \ - vxvc_flag = true; \ - } \ - } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || \ - float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { \ - if (ordered) { \ - vxvc_flag = true; \ - } \ - } \ - if (vxsnan_flag) { \ - float_invalid_op_vxsnan(env, GETPC()); \ - } \ - if (vxvc_flag) { \ - float_invalid_op_vxvc(env, 0, GETPC()); \ - } \ - \ - switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) {\ - case float_relation_less: \ - cc |= CRF_LT; \ - break; \ - case float_relation_equal: \ - cc |= CRF_EQ; \ - break; \ - case float_relation_greater: \ - cc |= CRF_GT; \ - break; \ - case float_relation_unordered: \ - cc |= CRF_SO; \ - break; \ - } \ - \ - env->fpscr &= ~FP_FPCC; \ - env->fpscr |= cc << FPSCR_FPCC; \ - env->crf[BF(opcode)] = cc; \ - \ - do_float_check_status(env, GETPC()); \ +static inline void do_scalar_cmp (CPUPPCState *env,ppc_vsr_t *xa,ppc_vsr_t *xb, +int crf_idx,bool ordered) +{ +uint32_t cc; +bool vxsnan_flag = false, vxvc_flag = false; + +helper_reset_fpstatus (env); + +if (float64_is_signaling_nan (xa->VsrD (0 ), &env->fp_status) || +float64_is_signaling_nan (xb->VsrD (0 ), &env->fp_status)) { + vxsnan_flag = true; +if (fpscr_ve ==0 && ordered) { + vxvc_flag = true; + } + }else if (float64_is_quiet_nan (xa->VsrD (0 ), &env->fp_status) || +float64_is_quiet_nan (xb->VsrD (0 ), &env->fp_status)) { +if (ordered) { + vxvc_flag = true; + } + } +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } + +switch (float64_compare (xa->VsrD (0 ), xb->VsrD (0 ), &env->fp_status)) { +case float_relation_less: + cc =CRF_LT ; +break ; +case float_relation_equal: + cc =CRF_EQ ; +break ; +case float_relation_greater: + cc =CRF_GT ; +break ; +case float_relation_unordered: + cc =CRF_SO ; +break ; +default : +g_assert_not_reached (); + } + + env->fpscr &= ~FP_FPCC ; + env->fpscr |= cc <<FPSCR_FPCC ; + env->crf[crf_idx] = cc; + +do_float_check_status (env,GETPC ()); +} + +void helper_xscmpodp (CPUPPCState *env,uint32_t opcode,ppc_vsr_t *xa, +ppc_vsr_t *xb) +{ +do_scalar_cmp (env, xa, xb,BF (opcode), true); +} + +void helper_xscmpudp (CPUPPCState *env,uint32_t opcode,ppc_vsr_t *xa, +ppc_vsr_t *xb) +{ +do_scalar_cmp (env, xa, xb,BF (opcode), false); } -VSX_SCALAR_CMP(xscmpodp, 1) -VSX_SCALAR_CMP(xscmpudp, 0) +static inline void do_scalar_cmpq (CPUPPCState *env,ppc_vsr_t *xa, +ppc_vsr_t *xb,int crf_idx,bool ordered) +{ +uint32_t cc; +bool vxsnan_flag = false, vxvc_flag = false; + +helper_reset_fpstatus (env); + +if (float128_is_signaling_nan (xa->f128, &env->fp_status) || +float128_is_signaling_nan (xb->f128, &env->fp_status)) { + vxsnan_flag = true; +if (fpscr_ve ==0 && ordered) { + vxvc_flag = true; + } + }else if (float128_is_quiet_nan (xa->f128, &env->fp_status) || +float128_is_quiet_nan (xb->f128, &env->fp_status)) { +if (ordered) { + vxvc_flag = true; + } + } +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } + +switch (float128_compare (xa->f128, xb->f128, &env->fp_status)) { +case float_relation_less: + cc =CRF_LT ; +break ; +case float_relation_equal: + cc =CRF_EQ ; +break ; +case float_relation_greater: + cc =CRF_GT ; +break ; +case float_relation_unordered: + cc =CRF_SO ; +break ; +default : +g_assert_not_reached (); + } -#define VSX_SCALAR_CMPQ (op, ordered) \ -void helper_##op(CPUPPCState *env, uint32_t opcode, \ - ppc_vsr_t *xa, ppc_vsr_t *xb) \ -{ \ - uint32_t cc = 0; \ - bool vxsnan_flag = false, vxvc_flag = false; \ - \ - helper_reset_fpstatus(env); \ - \ - if (float128_is_signaling_nan(xa->f128, &env->fp_status) || \ - float128_is_signaling_nan(xb->f128, &env->fp_status)) { \ - vxsnan_flag = true; \ - cc = CRF_SO; \ - if (fpscr_ve == 0 && ordered) { \ - vxvc_flag = true; \ - } \ - } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || \ - float128_is_quiet_nan(xb->f128, &env->fp_status)) { \ - cc = CRF_SO; \ - if (ordered) { \ - vxvc_flag = true; \ - } \ - } \ - if (vxsnan_flag) { \ - float_invalid_op_vxsnan(env, GETPC()); \ - } \ - if (vxvc_flag) { \ - float_invalid_op_vxvc(env, 0, GETPC()); \ - } \ - \ - switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { \ - case float_relation_less: \ - cc |= CRF_LT; \ - break; \ - case float_relation_equal: \ - cc |= CRF_EQ; \ - break; \ - case float_relation_greater: \ - cc |= CRF_GT; \ - break; \ - case float_relation_unordered: \ - cc |= CRF_SO; \ - break; \ - } \ - \ - env->fpscr &= ~FP_FPCC; \ - env->fpscr |= cc << FPSCR_FPCC; \ - env->crf[BF(opcode)] = cc; \ - \ - do_float_check_status(env, GETPC()); \ + env->fpscr &= ~FP_FPCC ; + env->fpscr |= cc <<FPSCR_FPCC ; + env->crf[crf_idx] = cc; + +do_float_check_status (env,GETPC ()); +} + +void helper_xscmpoqp (CPUPPCState *env,uint32_t opcode,ppc_vsr_t *xa, +ppc_vsr_t *xb) +{ +do_scalar_cmpq (env, xa, xb,BF (opcode), true); } -VSX_SCALAR_CMPQ(xscmpoqp, 1) -VSX_SCALAR_CMPQ (xscmpuqp,0 ) +void helper_xscmpuqp (CPUPPCState *env,uint32_t opcode,ppc_vsr_t *xa, +ppc_vsr_t *xb) +{ +do_scalar_cmpq (env, xa, xb,BF (opcode), false); +}/* * VSX_MAX_MIN - VSX floating point maximum/minimum
Signature · 1 line
2.27.0
PATCH v3 3/4 ppc/translate: Delay NaN checking after comparison
In reply to LemonBoySince we always perform a comparison between the two operands avoid checking for NaN unless the result states they're unordered.
--- target/ppc/fpu_helper.c | 80 +++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 38 deletions(-)
target/ppc/fpu_helper.c +42 -38
@@ -2475,25 +2475,6 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb,helper_reset_fpstatus (env); -if (float64_is_signaling_nan (xa->VsrD (0 ), &env->fp_status) || -float64_is_signaling_nan (xb->VsrD (0 ), &env->fp_status)) { - vxsnan_flag = true; -if (fpscr_ve ==0 && ordered) { - vxvc_flag = true; - } - }else if (float64_is_quiet_nan (xa->VsrD (0 ), &env->fp_status) || -float64_is_quiet_nan (xb->VsrD (0 ), &env->fp_status)) { -if (ordered) { - vxvc_flag = true; - } - } -if (vxsnan_flag) { -float_invalid_op_vxsnan (env,GETPC ()); - } -if (vxvc_flag) { -float_invalid_op_vxvc (env,0 ,GETPC ()); - } -switch (float64_compare (xa->VsrD (0 ), xb->VsrD (0 ), &env->fp_status)) {case float_relation_less: cc =CRF_LT ;
@@ -2506,6 +2487,27 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb,break ;case float_relation_unordered: cc =CRF_SO ; + +if (float64_is_signaling_nan (xa->VsrD (0 ), &env->fp_status) || +float64_is_signaling_nan (xb->VsrD (0 ), &env->fp_status)) { + vxsnan_flag = true; +if (fpscr_ve ==0 && ordered) { + vxvc_flag = true; + } + }else if (float64_is_quiet_nan (xa->VsrD (0 ), &env->fp_status) || +float64_is_quiet_nan (xb->VsrD (0 ), &env->fp_status)) { +if (ordered) { + vxvc_flag = true; + } + } + +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } +break ;default :g_assert_not_reached ();
@@ -2538,25 +2540,6 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa,helper_reset_fpstatus (env); -if (float128_is_signaling_nan (xa->f128, &env->fp_status) || -float128_is_signaling_nan (xb->f128, &env->fp_status)) { - vxsnan_flag = true; -if (fpscr_ve ==0 && ordered) { - vxvc_flag = true; - } - }else if (float128_is_quiet_nan (xa->f128, &env->fp_status) || -float128_is_quiet_nan (xb->f128, &env->fp_status)) { -if (ordered) { - vxvc_flag = true; - } - } -if (vxsnan_flag) { -float_invalid_op_vxsnan (env,GETPC ()); - } -if (vxvc_flag) { -float_invalid_op_vxvc (env,0 ,GETPC ()); - } -switch (float128_compare (xa->f128, xb->f128, &env->fp_status)) {case float_relation_less: cc =CRF_LT ;
@@ -2569,6 +2552,27 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa,break ;case float_relation_unordered: cc =CRF_SO ; + +if (float128_is_signaling_nan (xa->f128, &env->fp_status) || +float128_is_signaling_nan (xb->f128, &env->fp_status)) { + vxsnan_flag = true; +if (fpscr_ve ==0 && ordered) { + vxvc_flag = true; + } + }else if (float128_is_quiet_nan (xa->f128, &env->fp_status) || +float128_is_quiet_nan (xb->f128, &env->fp_status)) { +if (ordered) { + vxvc_flag = true; + } + } + +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } +break ;default :g_assert_not_reached ();
Signature · 1 line
2.27.0
PATCH v3 4/4 ppc/translate: Raise exceptions after setting the cc
In reply to LemonBoyThe PowerISA reference states that the comparison operators update the FPCC, CR and FPSCR and, if VE=1, jump to the exception handler.
Moving the exception-triggering code after the CC update sequence solves the problem.
--- target/ppc/fpu_helper.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
target/ppc/fpu_helper.c +14 -14
@@ -2501,13 +2501,6 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, } } -if (vxsnan_flag) { -float_invalid_op_vxsnan (env,GETPC ()); - } -if (vxvc_flag) { -float_invalid_op_vxvc (env,0 ,GETPC ()); - } -break ;default :g_assert_not_reached ();
@@ -2517,6 +2510,13 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, env->fpscr |= cc <<FPSCR_FPCC ; env->crf[crf_idx] = cc; +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } +do_float_check_status (env,GETPC ()); }
@@ -2566,13 +2566,6 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, } } -if (vxsnan_flag) { -float_invalid_op_vxsnan (env,GETPC ()); - } -if (vxvc_flag) { -float_invalid_op_vxvc (env,0 ,GETPC ()); - } -break ;default :g_assert_not_reached ();
@@ -2582,6 +2575,13 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, env->fpscr |= cc <<FPSCR_FPCC ; env->crf[crf_idx] = cc; +if (vxsnan_flag) { +float_invalid_op_vxsnan (env,GETPC ()); + } +if (vxvc_flag) { +float_invalid_op_vxvc (env,0 ,GETPC ()); + } +do_float_check_status (env,GETPC ()); }
Signature · 1 line
2.27.0
David Gibson
AppliedQuoted 2 lines · LemonBoy
Fix a couple of problems found in the emulation of f64/f128 comparisons plus some minimal self-contained commits to clean-up some code.
Applied to ppc-for-6.0.
As bug fixes, these could theoretically go into qemu-5.2. However, since they're not regressions, I'm more comfortable delaying these to 6.0 given how late we are in the qemu-5.2 cycle.
Quoted 10 lines
Giuseppe Musacchio (4):
ppc/translate: Fix unordered f64/f128 comparisons ppc/translate: Turn the helper macros into functions ppc/translate: Delay NaN checking after comparison ppc/translate: Raise exceptions after setting the cctarget/ppc/fpu_helper.c | 212 +++++++++++++++++++++++----------------- 1 file changed, 121 insertions(+), 91 deletions(-)
Signature · 4 lines
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