Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test faili

qemu-devel

[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test faili

From:	Richard Henderson
Subject:	Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing
Date:	Tue, 19 Jul 2022 12:42:49 +0530
User-agent:	Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1

On 7/16/22 14:24, Song Gao wrote:

We should result zero when exception is invalid and operation is nan

Signed-off-by: Song Gao <gaosong@loongson.cn>
---
  target/loongarch/fpu_helper.c | 143 +++++++++++++++++++---------------
  1 file changed, 80 insertions(+), 63 deletions(-)

diff --git a/target/loongarch/fpu_helper.c b/target/loongarch/fpu_helper.c
index 3d0cb8dd0d..bd76529219 100644
--- a/target/loongarch/fpu_helper.c
+++ b/target/loongarch/fpu_helper.c
@@ -13,9 +13,6 @@
  #include "fpu/softfloat.h"
  #include "internals.h"

-#define FLOAT_TO_INT32_OVERFLOW 0x7fffffff

-#define FLOAT_TO_INT64_OVERFLOW 0x7fffffffffffffffULL
-
  static inline uint64_t nanbox_s(float32 fp)
  {
      return fp | MAKE_64BIT_MASK(32, 32);
@@ -544,9 +541,10 @@ uint64_t helper_ftintrm_l_d(CPULoongArchState *env, 
uint64_t fj)
      fd = float64_to_int64(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }


The check for invalid is sufficient, the check for nan should be redundant with 
that.


r~

      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -561,9 +559,10 @@ uint64_t helper_ftintrm_l_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int64((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -578,9 +577,10 @@ uint64_t helper_ftintrm_w_d(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float64_to_int32(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -595,9 +595,10 @@ uint64_t helper_ftintrm_w_s(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float32_to_int32((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -612,9 +613,10 @@ uint64_t helper_ftintrp_l_d(CPULoongArchState *env, 
uint64_t fj)
      fd = float64_to_int64(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -629,9 +631,10 @@ uint64_t helper_ftintrp_l_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int64((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -646,9 +649,10 @@ uint64_t helper_ftintrp_w_d(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float64_to_int32(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -663,9 +667,10 @@ uint64_t helper_ftintrp_w_s(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float32_to_int32((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -679,9 +684,10 @@ uint64_t helper_ftintrz_l_d(CPULoongArchState *env, 
uint64_t fj)
      fd = float64_to_int64_round_to_zero(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -695,9 +701,10 @@ uint64_t helper_ftintrz_l_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int64_round_to_zero((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -711,9 +718,10 @@ uint64_t helper_ftintrz_w_d(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float64_to_int32_round_to_zero(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -727,9 +735,10 @@ uint64_t helper_ftintrz_w_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int32_round_to_zero((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return (uint64_t)fd;
@@ -744,9 +753,10 @@ uint64_t helper_ftintrne_l_d(CPULoongArchState *env, 
uint64_t fj)
      fd = float64_to_int64(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -761,9 +771,10 @@ uint64_t helper_ftintrne_l_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int64((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -778,9 +789,10 @@ uint64_t helper_ftintrne_w_d(CPULoongArchState *env, 
uint64_t fj)
      fd = (uint64_t)float64_to_int32(fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -795,9 +807,10 @@ uint64_t helper_ftintrne_w_s(CPULoongArchState *env, 
uint64_t fj)
      fd = float32_to_int32((uint32_t)fj, &env->fp_status);
      set_float_rounding_mode(old_mode, &env->fp_status);

- if (get_float_exception_flags(&env->fp_status) &

-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return (uint64_t)fd;
@@ -808,9 +821,10 @@ uint64_t helper_ftint_l_d(CPULoongArchState *env, uint64_t 
fj)
      uint64_t fd;

fd = float64_to_int64(fj, &env->fp_status);

-    if (get_float_exception_flags(&env->fp_status) &
-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -821,9 +835,10 @@ uint64_t helper_ftint_l_s(CPULoongArchState *env, uint64_t 
fj)
      uint64_t fd;

fd = float32_to_int64((uint32_t)fj, &env->fp_status);

-    if (get_float_exception_flags(&env->fp_status) &
-        (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT64_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -834,9 +849,10 @@ uint64_t helper_ftint_w_s(CPULoongArchState *env, uint64_t 
fj)
      uint64_t fd;

fd = (uint64_t)float32_to_int32((uint32_t)fj, &env->fp_status);

-    if (get_float_exception_flags(&env->fp_status)
-        & (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float32_is_any_nan((uint32_t)fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;
@@ -847,9 +863,10 @@ uint64_t helper_ftint_w_d(CPULoongArchState *env, uint64_t 
fj)
      uint64_t fd;

fd = (uint64_t)float64_to_int32(fj, &env->fp_status);

-    if (get_float_exception_flags(&env->fp_status)
-        & (float_flag_invalid | float_flag_overflow)) {
-        fd = FLOAT_TO_INT32_OVERFLOW;
+    if (get_float_exception_flags(&env->fp_status) & (float_flag_invalid)) {
+        if (float64_is_any_nan(fj)) {
+            fd = 0;
+        }
      }
      update_fcsr0(env, GETPC());
      return fd;

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH 0/8] tests/tcg/loongarch64: Add some tests., Song Gao, 2022/07/16
- [PATCH 5/8] tests/tcg/loongarch64: Add div and mod related instructions test, Song Gao, 2022/07/16
- [PATCH 4/8] tests/tcg/loongarch64: Add clo related instructions test, Song Gao, 2022/07/16
- [PATCH 1/8] tests/tcg/loongarch64: Add float reference files, Song Gao, 2022/07/16
- [PATCH 6/8] tests/tcg/loongarch64: Add fclass test, Song Gao, 2022/07/16
- [PATCH 2/8] fpu/softfloat: Add LoongArch specialization for pickNaNMulAdd, Song Gao, 2022/07/16
  - Re: [PATCH 2/8] fpu/softfloat: Add LoongArch specialization for pickNaNMulAdd, Richard Henderson, 2022/07/19
- [PATCH 8/8] tests/tcg/loongarch64: Add pcadd related instructions test, Song Gao, 2022/07/16
- [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing, Song Gao, 2022/07/16
  - Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing, Richard Henderson <=
    - Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing, Richard Henderson, 2022/07/19
- [PATCH 7/8] tests/tcg/loongarch64: Add som comparison instructions test, Song Gao, 2022/07/16
- Re: [PATCH 0/8] tests/tcg/loongarch64: Add some tests., Richard Henderson, 2022/07/19

Prev by Date: Re: [PATCH 2/8] fpu/softfloat: Add LoongArch specialization for pickNaNMulAdd
Next by Date: Re: [PATCH v2 04/15] error-report: introduce overridable error_is_detailed()
Previous by thread: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing
Next by thread: Re: [PATCH 3/8] target/loongarch: Fix float_convd/float_convs test failing
Index(es):
- Date
- Thread