Re: [Qemu-devel] [PATCH 3/3] target-ppc: fix sNaN propagation
On Mon, Jan 10, 2011 at 06:14:18PM -0600, Peter Maydell wrote:
> On 2 January 2011 08:39, Aurelien Jarno wrote:
> > The current FPU code returns 0.0 if one of the operand is a
> > signaling NaN and the VXSNAN exception is disabled.
> >
> > fload_invalid_op_excp() doesn't return a qNaN in case of a VXSNAN
> > exception as the operand should be propagated instead of a new
> > qNaN to be generated. Fix that by calling fload_invalid_op_excp()
> > only for the exception generation (if enabled), and use the softfloat
> > code to correctly compute the result.
> >
> > Cc: Alexander Graf
> > Signed-off-by: Aurelien Jarno
>
> > @@ -1410,10 +1418,10 @@ uint64_t helper_frsp (uint64_t arg)
> > if (unlikely(float64_is_signaling_nan(farg.d))) {
> > /* sNaN square root */
> > farg.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
> > - } else {
> > - f32 = float64_to_float32(farg.d, &env->fp_status);
> > - farg.d = float32_to_float64(f32, &env->fp_status);
> > }
> > + f32 = float64_to_float32(farg.d, &env->fp_status);
> > + farg.d = float32_to_float64(f32, &env->fp_status);
> > +
> > return farg.ll;
> > }
>
> Most of these changes are to ignoring the result from
> fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN),
> but this one leaves it assigning a value to farg.ll -- is there
> any reason for that? (It looks like the assignment gets
> immediately overwritten by the assignment to farg.d later.)
It is actually a mistake, though the result is correct. I'll resend the
patch after fixing that, thanks for the review.
> > @@ -1460,11 +1468,11 @@ uint64_t helper_fres (uint64_t arg)
> > if (unlikely(float64_is_signaling_nan(farg.d))) {
> > /* sNaN reciprocal */
> > farg.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
> > - } else {
> > - farg.d = float64_div(float64_one, farg.d, &env->fp_status);
> > - f32 = float64_to_float32(farg.d, &env->fp_status);
> > - farg.d = float32_to_float64(f32, &env->fp_status);
> > }
> > + farg.d = float64_div(float64_one, farg.d, &env->fp_status);
> > + f32 = float64_to_float32(farg.d, &env->fp_status);
> > + farg.d = float32_to_float64(f32, &env->fp_status);
> > +
> > return farg.ll;
> > }
> >
>
> Ditto for this hunk.
>
> Looks plausible to me other than that.
>
Same here.
--
Aurelien Jarno GPG: 1024D/F1BCDB73
[email protected] http://www.aurel32.net
Re: [Qemu-devel] [PATCH 3/3] target-ppc: fix sNaN propagation
On 2 January 2011 08:39, Aurelien Jarno wrote:
> The current FPU code returns 0.0 if one of the operand is a
> signaling NaN and the VXSNAN exception is disabled.
>
> fload_invalid_op_excp() doesn't return a qNaN in case of a VXSNAN
> exception as the operand should be propagated instead of a new
> qNaN to be generated. Fix that by calling fload_invalid_op_excp()
> only for the exception generation (if enabled), and use the softfloat
> code to correctly compute the result.
>
> Cc: Alexander Graf
> Signed-off-by: Aurelien Jarno
> @@ -1410,10 +1418,10 @@ uint64_t helper_frsp (uint64_t arg)
> if (unlikely(float64_is_signaling_nan(farg.d))) {
> /* sNaN square root */
> farg.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
> - } else {
> - f32 = float64_to_float32(farg.d, &env->fp_status);
> - farg.d = float32_to_float64(f32, &env->fp_status);
> }
> + f32 = float64_to_float32(farg.d, &env->fp_status);
> + farg.d = float32_to_float64(f32, &env->fp_status);
> +
> return farg.ll;
> }
Most of these changes are to ignoring the result from
fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN),
but this one leaves it assigning a value to farg.ll -- is there
any reason for that? (It looks like the assignment gets
immediately overwritten by the assignment to farg.d later.)
> @@ -1460,11 +1468,11 @@ uint64_t helper_fres (uint64_t arg)
> if (unlikely(float64_is_signaling_nan(farg.d))) {
> /* sNaN reciprocal */
> farg.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
> - } else {
> - farg.d = float64_div(float64_one, farg.d, &env->fp_status);
> - f32 = float64_to_float32(farg.d, &env->fp_status);
> - farg.d = float32_to_float64(f32, &env->fp_status);
> }
> + farg.d = float64_div(float64_one, farg.d, &env->fp_status);
> + f32 = float64_to_float32(farg.d, &env->fp_status);
> + farg.d = float32_to_float64(f32, &env->fp_status);
> +
> return farg.ll;
> }
>
Ditto for this hunk.
Looks plausible to me other than that.
-- PMM
[Qemu-devel] [PATCH 3/3] target-ppc: fix sNaN propagation
The current FPU code returns 0.0 if one of the operand is a
signaling NaN and the VXSNAN exception is disabled.
fload_invalid_op_excp() doesn't return a qNaN in case of a VXSNAN
exception as the operand should be propagated instead of a new
qNaN to be generated. Fix that by calling fload_invalid_op_excp()
only for the exception generation (if enabled), and use the softfloat
code to correctly compute the result.
Cc: Alexander Graf
Signed-off-by: Aurelien Jarno
---
target-ppc/op_helper.c | 145 +--
1 files changed, 77 insertions(+), 68 deletions(-)
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index 279f345..ea030d0 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -975,15 +975,16 @@ uint64_t helper_fadd (uint64_t arg1, uint64_t arg2)
farg1.ll = arg1;
farg2.ll = arg2;
-if (unlikely(float64_is_signaling_nan(farg1.d) ||
- float64_is_signaling_nan(farg2.d))) {
-/* sNaN addition */
-farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
-} else if (unlikely(float64_is_infinity(farg1.d) &&
float64_is_infinity(farg2.d) &&
- float64_is_neg(farg1.d) != float64_is_neg(farg2.d))) {
+if (unlikely(float64_is_infinity(farg1.d) && float64_is_infinity(farg2.d)
&&
+ float64_is_neg(farg1.d) != float64_is_neg(farg2.d))) {
/* Magnitude subtraction of infinities */
farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXISI);
} else {
+if (unlikely(float64_is_signaling_nan(farg1.d) ||
+ float64_is_signaling_nan(farg2.d))) {
+/* sNaN addition */
+fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
+}
farg1.d = float64_add(farg1.d, farg2.d, &env->fp_status);
}
@@ -998,15 +999,16 @@ uint64_t helper_fsub (uint64_t arg1, uint64_t arg2)
farg1.ll = arg1;
farg2.ll = arg2;
-if (unlikely(float64_is_signaling_nan(farg1.d) ||
- float64_is_signaling_nan(farg2.d))) {
-/* sNaN subtraction */
-farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
-} else if (unlikely(float64_is_infinity(farg1.d) &&
float64_is_infinity(farg2.d) &&
- float64_is_neg(farg1.d) == float64_is_neg(farg2.d))) {
+if (unlikely(float64_is_infinity(farg1.d) && float64_is_infinity(farg2.d)
&&
+ float64_is_neg(farg1.d) == float64_is_neg(farg2.d))) {
/* Magnitude subtraction of infinities */
farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXISI);
} else {
+if (unlikely(float64_is_signaling_nan(farg1.d) ||
+ float64_is_signaling_nan(farg2.d))) {
+/* sNaN subtraction */
+fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
+}
farg1.d = float64_sub(farg1.d, farg2.d, &env->fp_status);
}
@@ -1021,16 +1023,17 @@ uint64_t helper_fmul (uint64_t arg1, uint64_t arg2)
farg1.ll = arg1;
farg2.ll = arg2;
-if (unlikely(float64_is_signaling_nan(farg1.d) ||
- float64_is_signaling_nan(farg2.d))) {
-/* sNaN multiplication */
-farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
-} else if (unlikely((float64_is_infinity(farg1.d) &&
float64_is_zero(farg2.d)) ||
-(float64_is_zero(farg1.d) &&
float64_is_infinity(farg2.d {
+if (unlikely((float64_is_infinity(farg1.d) && float64_is_zero(farg2.d)) ||
+ (float64_is_zero(farg1.d) && float64_is_infinity(farg2.d {
/* Multiplication of zero by infinity */
farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXIMZ);
} else {
-farg1.d = float64_mul(farg1.d, farg2.d, &env->fp_status);
+if (unlikely(float64_is_signaling_nan(farg1.d) ||
+ float64_is_signaling_nan(farg2.d))) {
+/* sNaN multiplication */
+fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
+}
+float64_mul(farg1.d, farg2.d, &env->fp_status);
}
return farg1.ll;
@@ -1044,17 +1047,18 @@ uint64_t helper_fdiv (uint64_t arg1, uint64_t arg2)
farg1.ll = arg1;
farg2.ll = arg2;
-if (unlikely(float64_is_signaling_nan(farg1.d) ||
- float64_is_signaling_nan(farg2.d))) {
-/* sNaN division */
-farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXSNAN);
-} else if (unlikely(float64_is_infinity(farg1.d) &&
float64_is_infinity(farg2.d))) {
+if (unlikely(float64_is_infinity(farg1.d) &&
float64_is_infinity(farg2.d))) {
/* Division of infinity by infinity */
farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXIDI);
} else if (unlikely(float64_is_zero(farg1.d) && float64_is_zero(farg2.d)))
{
/* Division of zero by zero */
farg1.ll = fload_invalid_op_excp(POWERPC_EXCP_FP_VXZDZ);
} else {
+if (unlikely(float64_is_signaling_nan(farg1.d) ||
+
