From: "Alex Bennée" <alex.bennee@linaro.org>
To: richard.henderson@linaro.org, peter.maydell@linaro.org,
laurent@vivier.eu, bharata@linux.vnet.ibm.com,
andrew@andrewdutcher.com, aleksandar.markovic@imgtec.com
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [Qemu-devel] [PATCH v1 19/19] fpu/softfloat: re-factor compare
Date: Mon, 11 Dec 2017 12:57:05 +0000 [thread overview]
Message-ID: <20171211125705.16120-20-alex.bennee@linaro.org> (raw)
In-Reply-To: <20171211125705.16120-1-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
fpu/softfloat.c | 135 +++++++++++++++++++++++++++++-------------------
include/fpu/softfloat.h | 2 +
2 files changed, 83 insertions(+), 54 deletions(-)
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 5eba996932..31b437e000 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -1793,6 +1793,87 @@ MINMAX(64, maxnummag, false, true, true)
#undef MINMAX
+/* Floating point compare */
+static int compare_decomposed(decomposed_parts a, decomposed_parts b,
+ bool is_quiet, float_status *s)
+{
+ if (a.cls >= float_class_qnan
+ ||
+ b.cls >= float_class_qnan) {
+ if (!is_quiet ||
+ a.cls == float_class_snan ||
+ b.cls == float_class_snan) {
+ s->float_exception_flags |= float_flag_invalid;
+ }
+ return float_relation_unordered;
+ }
+
+ if (a.cls == float_class_zero || b.cls == float_class_zero) {
+ if (a.cls == float_class_normal) {
+ return a.sign ? float_relation_less : float_relation_greater;
+ } else if (b.cls == float_class_normal) {
+ return b.sign ? float_relation_greater : float_relation_less;
+ } else if (a.cls == b.cls) {
+ return float_relation_equal;
+ }
+ }
+
+ /* The only infinity we need to explicitly worry about is
+ * comparing two together, otherwise the max_exp/sign details are
+ * enough to compare to normal numbers
+ */
+ if (a.cls == float_class_inf && b.cls == float_class_inf) {
+ if (a.sign != b.sign) {
+ return a.sign ? float_relation_less : float_relation_greater;
+ } else {
+ return float_relation_equal;
+ }
+ }
+
+ if (a.sign != b.sign) {
+ return a.sign ? float_relation_less : float_relation_greater;
+ }
+
+ if (a.exp == b.exp) {
+ if (a.frac == b.frac) {
+ return float_relation_equal;
+ }
+ if (a.sign) {
+ return a.frac > b.frac ?
+ float_relation_less : float_relation_greater;
+ } else {
+ return a.frac > b.frac ?
+ float_relation_greater : float_relation_less;
+ }
+ } else {
+ if (a.sign) {
+ return a.exp > b.exp ? float_relation_less : float_relation_greater;
+ } else {
+ return a.exp > b.exp ? float_relation_greater : float_relation_less;
+ }
+ }
+}
+
+#define COMPARE(sz) \
+int float ## sz ## _compare(float ## sz a, float ## sz b, float_status *s) \
+{ \
+ decomposed_parts pa = float ## sz ## _unpack_canonical(a, s); \
+ decomposed_parts pb = float ## sz ## _unpack_canonical(b, s); \
+ return compare_decomposed(pa, pb, false, s); \
+} \
+int float ## sz ## _compare_quiet(float ## sz a, float ## sz b, float_status *s) \
+{ \
+ decomposed_parts pa = float ## sz ## _unpack_canonical(a, s); \
+ decomposed_parts pb = float ## sz ## _unpack_canonical(b, s); \
+ return compare_decomposed(pa, pb, true, s); \
+}
+
+COMPARE(16)
+COMPARE(32)
+COMPARE(64)
+
+#undef COMPARE
+
/* Multiply A by 2 raised to the power N. */
static decomposed_parts scalbn_decomposed(decomposed_parts a, int n,
float_status *s)
@@ -6894,60 +6975,6 @@ int float128_unordered_quiet(float128 a, float128 b, float_status *status)
return 0;
}
-#define COMPARE(s, nan_exp) \
-static inline int float ## s ## _compare_internal(float ## s a, float ## s b,\
- int is_quiet, float_status *status) \
-{ \
- flag aSign, bSign; \
- uint ## s ## _t av, bv; \
- a = float ## s ## _squash_input_denormal(a, status); \
- b = float ## s ## _squash_input_denormal(b, status); \
- \
- if (( ( extractFloat ## s ## Exp( a ) == nan_exp ) && \
- extractFloat ## s ## Frac( a ) ) || \
- ( ( extractFloat ## s ## Exp( b ) == nan_exp ) && \
- extractFloat ## s ## Frac( b ) )) { \
- if (!is_quiet || \
- float ## s ## _is_signaling_nan(a, status) || \
- float ## s ## _is_signaling_nan(b, status)) { \
- float_raise(float_flag_invalid, status); \
- } \
- return float_relation_unordered; \
- } \
- aSign = extractFloat ## s ## Sign( a ); \
- bSign = extractFloat ## s ## Sign( b ); \
- av = float ## s ## _val(a); \
- bv = float ## s ## _val(b); \
- if ( aSign != bSign ) { \
- if ( (uint ## s ## _t) ( ( av | bv )<<1 ) == 0 ) { \
- /* zero case */ \
- return float_relation_equal; \
- } else { \
- return 1 - (2 * aSign); \
- } \
- } else { \
- if (av == bv) { \
- return float_relation_equal; \
- } else { \
- return 1 - 2 * (aSign ^ ( av < bv )); \
- } \
- } \
-} \
- \
-int float ## s ## _compare(float ## s a, float ## s b, float_status *status) \
-{ \
- return float ## s ## _compare_internal(a, b, 0, status); \
-} \
- \
-int float ## s ## _compare_quiet(float ## s a, float ## s b, \
- float_status *status) \
-{ \
- return float ## s ## _compare_internal(a, b, 1, status); \
-}
-
-COMPARE(32, 0xff)
-COMPARE(64, 0x7ff)
-
static inline int floatx80_compare_internal(floatx80 a, floatx80 b,
int is_quiet, float_status *status)
{
diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
index ba248ffa39..a5232bcc87 100644
--- a/include/fpu/softfloat.h
+++ b/include/fpu/softfloat.h
@@ -360,6 +360,8 @@ float16 float16_minnum(float16, float16, float_status *status);
float16 float16_maxnum(float16, float16, float_status *status);
float16 float16_minnummag(float16, float16, float_status *status);
float16 float16_maxnummag(float16, float16, float_status *status);
+int float16_compare(float16, float16, float_status *status);
+int float16_compare_quiet(float16, float16, float_status *status);
int float16_is_quiet_nan(float16, float_status *status);
int float16_is_signaling_nan(float16, float_status *status);
--
2.15.1
next prev parent reply other threads:[~2017-12-11 12:57 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-11 12:56 [Qemu-devel] [PATCH v1 00/19] re-factor softfloat and add fp16 functions Alex Bennée
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 01/19] fpu/softfloat: implement float16_squash_input_denormal Alex Bennée
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 02/19] include/fpu/softfloat: implement float16_abs helper Alex Bennée
2017-12-15 11:35 ` Philippe Mathieu-Daudé
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 03/19] include/fpu/softfloat: implement float16_chs helper Alex Bennée
2017-12-18 21:41 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 04/19] include/fpu/softfloat: implement float16_set_sign helper Alex Bennée
2017-12-18 21:44 ` Richard Henderson
2017-12-19 7:31 ` Alex Bennée
2018-01-08 12:58 ` Alex Bennée
2018-01-08 20:25 ` Richard Henderson
2018-01-05 16:15 ` Philippe Mathieu-Daudé
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 05/19] include/fpu/softfloat: add some float16 contants Alex Bennée
2017-12-15 12:24 ` Alex Bennée
2017-12-15 13:37 ` Philippe Mathieu-Daudé
2017-12-18 21:50 ` Richard Henderson
2018-01-04 14:09 ` Alex Bennée
2018-01-04 15:05 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 06/19] fpu/softfloat: propagate signalling NaNs in MINMAX Alex Bennée
2017-12-18 21:53 ` Richard Henderson
2018-01-05 13:05 ` Alex Bennée
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 07/19] fpu/softfloat: improve comments on ARM NaN propagation Alex Bennée
2017-12-18 21:54 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 08/19] fpu/softfloat: move the extract functions to the top of the file Alex Bennée
2017-12-18 21:57 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 09/19] fpu/softfloat: define decompose structures Alex Bennée
2017-12-18 21:59 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 10/19] fpu/softfloat: re-factor add/sub Alex Bennée
2017-12-18 22:18 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 11/19] fpu/softfloat: re-factor mul Alex Bennée
2017-12-18 22:22 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 12/19] fpu/softfloat: re-factor div Alex Bennée
2017-12-18 22:26 ` Richard Henderson
2017-12-11 12:56 ` [Qemu-devel] [PATCH v1 13/19] fpu/softfloat: re-factor muladd Alex Bennée
2017-12-18 22:36 ` Richard Henderson
2017-12-11 12:57 ` [Qemu-devel] [PATCH v1 14/19] fpu/softfloat: re-factor round_to_int Alex Bennée
2017-12-18 22:41 ` Richard Henderson
2017-12-11 12:57 ` [Qemu-devel] [PATCH v1 15/19] fpu/softfloat: re-factor float to int/uint Alex Bennée
2017-12-18 22:54 ` Richard Henderson
2017-12-11 12:57 ` [Qemu-devel] [PATCH v1 16/19] fpu/softfloat: re-factor int/uint to float Alex Bennée
2017-12-12 17:21 ` Alex Bennée
2017-12-18 22:59 ` Richard Henderson
2018-01-05 15:51 ` Alex Bennée
2017-12-11 12:57 ` [Qemu-devel] [PATCH v1 17/19] fpu/softfloat: re-factor scalbn Alex Bennée
2017-12-18 23:00 ` Richard Henderson
2017-12-11 12:57 ` [Qemu-devel] [PATCH v1 18/19] fpu/softfloat: re-factor minmax Alex Bennée
2017-12-18 23:19 ` Richard Henderson
2017-12-11 12:57 ` Alex Bennée [this message]
2017-12-18 23:26 ` [Qemu-devel] [PATCH v1 19/19] fpu/softfloat: re-factor compare Richard Henderson
2017-12-11 13:42 ` [Qemu-devel] [PATCH v1 00/19] re-factor softfloat and add fp16 functions no-reply
2017-12-11 15:40 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171211125705.16120-20-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aleksandar.markovic@imgtec.com \
--cc=andrew@andrewdutcher.com \
--cc=aurelien@aurel32.net \
--cc=bharata@linux.vnet.ibm.com \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).