Performance results for fp-bench run under aarch64-linux-user
on an Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz host:
- before:
div-single: 29.77 MFlops
div-double: 29.85 MFlops
- after:
div-single: 85.90 MFlops
div-double: 86.10 MFlops
Signed-off-by: Emilio G. Cota <c...@braap.org>
---
include/fpu/hostfloat.h | 2 ++
include/fpu/softfloat.h | 4 ++--
fpu/hostfloat.c | 28 ++++++++++++++++++++++++++++
fpu/softfloat.c | 4 ++--
4 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/include/fpu/hostfloat.h b/include/fpu/hostfloat.h
index 7049f7e..61a8525 100644
--- a/include/fpu/hostfloat.h
+++ b/include/fpu/hostfloat.h
@@ -14,9 +14,11 @@
float32 float32_add(float32 a, float32 b, float_status *status);
float32 float32_sub(float32 a, float32 b, float_status *status);
float32 float32_mul(float32 a, float32 b, float_status *status);
+float32 float32_div(float32 a, float32 b, float_status *status);
float64 float64_add(float64 a, float64 b, float_status *status);
float64 float64_sub(float64 a, float64 b, float_status *status);
float64 float64_mul(float64 a, float64 b, float_status *status);
+float64 float64_div(float64 a, float64 b, float_status *status);
#endif /* HOSTFLOAT_H */
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index 2b07ae8..a690a57 100644
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -345,7 +345,7 @@ float32 float32_round_to_int(float32, float_status *status);
float32 soft_float32_add(float32, float32, float_status *status);
float32 soft_float32_sub(float32, float32, float_status *status);
float32 soft_float32_mul(float32, float32, float_status *status);
-float32 float32_div(float32, float32, float_status *status);
+float32 soft_float32_div(float32, float32, float_status *status);
float32 float32_rem(float32, float32, float_status *status);
float32 float32_muladd(float32, float32, float32, int, float_status *status);
float32 float32_sqrt(float32, float_status *status);
@@ -485,7 +485,7 @@ float64 float64_trunc_to_int(float64, float_status *status);
float64 soft_float64_add(float64, float64, float_status *status);
float64 soft_float64_sub(float64, float64, float_status *status);
float64 soft_float64_mul(float64, float64, float_status *status);
-float64 float64_div(float64, float64, float_status *status);
+float64 soft_float64_div(float64, float64, float_status *status);
float64 float64_rem(float64, float64, float_status *status);
float64 float64_muladd(float64, float64, float64, int, float_status *status);
float64 float64_sqrt(float64, float_status *status);
diff --git a/fpu/hostfloat.c b/fpu/hostfloat.c
index 985d6f1..ff980ac 100644
--- a/fpu/hostfloat.c
+++ b/fpu/hostfloat.c
@@ -178,3 +178,31 @@ GEN_FPU_ADDSUB(float64_add, float64_sub, float64, double,
fabs, DBL_MIN)
GEN_FPU_MUL(float32_mul, float32, float, fabsf, FLT_MIN)
GEN_FPU_MUL(float64_mul, float64, double, fabs, DBL_MIN)
#undef GEN_FPU_MUL
+
+#define GEN_FPU_DIV(name, soft_t, host_t, host_abs_func, min_normal) \
+ soft_t name(soft_t a, soft_t b, float_status *s) \
+ { \
+ soft_t ## _input_flush2(&a, &b, s); \
+ if (likely(soft_t ## _is_normal(a) && \
+ soft_t ## _is_normal(b) && \
+ s->float_exception_flags & float_flag_inexact && \
+ s->float_rounding_mode == float_round_nearest_even)) { \
+ host_t ha = soft_t ## _to_ ## host_t(a); \
+ host_t hb = soft_t ## _to_ ## host_t(b); \
+ host_t hr = ha / hb; \
+ soft_t r = host_t ## _to_ ## soft_t(hr); \
+ \
+ if (unlikely(soft_t ## _is_infinity(r))) { \
+ s->float_exception_flags |= float_flag_overflow; \
+ } else if (unlikely(host_abs_func(hr) <= min_normal)) { \
+ goto soft; \
+ } \
+ return r; \
+ } \
+ soft: \
+ return soft_ ## soft_t ## _div(a, b, s); \
+ }
+
+GEN_FPU_DIV(float32_div, float32, float, fabsf, FLT_MIN)
+GEN_FPU_DIV(float64_div, float64, double, fabs, DBL_MIN)
+#undef GEN_FPU_DIV
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index e3f2918..ebc59be 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -1176,7 +1176,7 @@ float16 float16_div(float16 a, float16 b, float_status
*status)
return float16_round_pack_canonical(pr, status);
}
-float32 float32_div(float32 a, float32 b, float_status *status)
+float32 soft_float32_div(float32 a, float32 b, float_status *status)
{
FloatParts pa = float32_unpack_canonical(a, status);
FloatParts pb = float32_unpack_canonical(b, status);
@@ -1185,7 +1185,7 @@ float32 float32_div(float32 a, float32 b, float_status
*status)
return float32_round_pack_canonical(pr, status);
}
-float64 float64_div(float64 a, float64 b, float_status *status)
+float64 soft_float64_div(float64 a, float64 b, float_status *status)
{
FloatParts pa = float64_unpack_canonical(a, status);
FloatParts pb = float64_unpack_canonical(b, status);
--
2.7.4
