From nobody Tue Feb 10 04:55:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516800658588169.55952699614954; Wed, 24 Jan 2018 05:30:58 -0800 (PST) Received: from localhost ([::1]:48734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeL8h-00006E-PU for importer@patchew.org; Wed, 24 Jan 2018 08:30:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeKww-0007pY-9k for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeKwu-00014y-LZ for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:46 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:39317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeKwu-00014M-Br for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:44 -0500 Received: by mail-wr0-x242.google.com with SMTP id z48so3992469wrz.6 for ; Wed, 24 Jan 2018 05:18:44 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r76sm298016wmf.0.2018.01.24.05.18.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 05:18:41 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 31A9A3E0D02; Wed, 24 Jan 2018 13:13:17 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=noIMzTAFFUnKjey2gaN9ZBJZMPRMXLxXyeqFx47I8Fw=; b=VEcALpiPabxbTSAAlvRhYl5vZEJ1gXDwFMyZFTUnUYS0hq+GfXUHSwv653oZu8PBAX BZQvWH5F53lU7YKDHj6oI0Y6xyFpWOKL9TuyhN/k8+bf8CcZQtJupAEFZtzp9uNMD57Z HRVHOu5UWFZccoMCcRwKaRnIkHPbB+VRu69+o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=noIMzTAFFUnKjey2gaN9ZBJZMPRMXLxXyeqFx47I8Fw=; b=mE6DeccxpBnzydRrmCes6iA2r/mcMGiDB+ICsVAGReskTpsjuKetIiLH2xvN38ohDi yFRXDZA0Wud8z9PWGyqcSX4t4eqgrHvEHJhPww1rqSojSztOjjvvNLrtIzt5UnYJO9Lp gQ7Nu6xjqlTI7i0Xc2AWI+LJHsvKQL0Z2j80cpkXUPbiOKjy/li1tm5CrhyS0ykCffOI XFom3icZxes+G0nZTyzNWvvhq0Kwdz9rcbTtF7RAfXuEFKsI89oa5Kr44LHHO00lfv2v UGr9NVCalnlLdsQ/bpoitJIWRgHJ8AY3o8vlWx+tstu0vAz7zDxUr616AmfkW1HztcZU vNDQ== X-Gm-Message-State: AKwxytf64zW4U+WrQz9bjTpYkIwo1NhoPMnEX/8yuw02n+DIL+OceKFA lYwCeNGvN9f3mDRbNqxGmfnpwg== X-Google-Smtp-Source: AH8x224igs0cydS2vn9p+UpxwVjqZScPVz4K7C+rsTwLFOHThcd/cBJtyODhfs9+AehVofIKCaTKtA== X-Received: by 10.223.134.85 with SMTP id 21mr6029551wrw.283.1516799923192; Wed, 24 Jan 2018 05:18:43 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: richard.henderson@linaro.org, peter.maydell@linaro.org, laurent@vivier.eu, bharata@linux.vnet.ibm.com, andrew@andrewdutcher.com Date: Wed, 24 Jan 2018 13:13:13 +0000 Message-Id: <20180124131315.30567-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180124131315.30567-1-alex.bennee@linaro.org> References: <20180124131315.30567-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH v3 20/22] fpu/softfloat: re-factor minmax X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Let's do the same re-factor treatment for minmax functions. I still use the MACRO trick to expand but now all the checking code is common. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- v2 - minor indentation fix v3 - fix merge conflicts from dropping MINMAX patch - fix naming of structs --- fpu/softfloat.c | 234 ++++++++++++++++++++++++++------------------= ---- include/fpu/softfloat.h | 6 ++ 2 files changed, 133 insertions(+), 107 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 24b7de30ce..09f9d12a06 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1646,6 +1646,133 @@ float64 uint16_to_float64(uint16_t a, float_status = *status) return uint64_to_float64(a, status); } =20 +/* Float Min/Max */ +/* min() and max() functions. These can't be implemented as + * 'compare and pick one input' because that would mishandle + * NaNs and +0 vs -0. + * + * minnum() and maxnum() functions. These are similar to the min() + * and max() functions but if one of the arguments is a QNaN and + * the other is numerical then the numerical argument is returned. + * SNaNs will get quietened before being returned. + * minnum() and maxnum correspond to the IEEE 754-2008 minNum() + * and maxNum() operations. min() and max() are the typical min/max + * semantics provided by many CPUs which predate that specification. + * + * minnummag() and maxnummag() functions correspond to minNumMag() + * and minNumMag() from the IEEE-754 2008. + */ +static FloatParts minmax_decomposed(FloatParts a, FloatParts b, bool ismin, + bool ieee, bool ismag, float_status *s) +{ + if (a.cls >=3D float_class_qnan + || + b.cls >=3D float_class_qnan) + { + if (ieee) { + /* Takes two floating-point values `a' and `b', one of + * which is a NaN, and returns the appropriate NaN + * result. If either `a' or `b' is a signaling NaN, + * the invalid exception is raised. + */ + if (a.cls =3D=3D float_class_snan || b.cls =3D=3D float_class_= snan) { + return pick_nan_parts(a, b, s); + } else if (a.cls >=3D float_class_qnan + && + b.cls < float_class_qnan) { + return b; + } else if (b.cls >=3D float_class_qnan + && + a.cls < float_class_qnan) { + return a; + } + } + return pick_nan_parts(a, b, s); + } else { + int a_exp, b_exp; + bool a_sign, b_sign; + + switch (a.cls) { + case float_class_normal: + a_exp =3D a.exp; + break; + case float_class_inf: + a_exp =3D INT_MAX; + break; + case float_class_zero: + a_exp =3D INT_MIN; + break; + default: + g_assert_not_reached(); + break; + } + switch (b.cls) { + case float_class_normal: + b_exp =3D b.exp; + break; + case float_class_inf: + b_exp =3D INT_MAX; + break; + case float_class_zero: + b_exp =3D INT_MIN; + break; + default: + g_assert_not_reached(); + break; + } + + a_sign =3D a.sign; + b_sign =3D b.sign; + if (ismag) { + a_sign =3D b_sign =3D 0; + } + + if (a_sign =3D=3D b_sign) { + bool a_less =3D a_exp < b_exp; + if (a_exp =3D=3D b_exp) { + a_less =3D a.frac < b.frac; + } + return a_sign ^ a_less ^ ismin ? b : a; + } else { + return a_sign ^ ismin ? b : a; + } + } +} + +#define MINMAX(sz, name, ismin, isiee, ismag) \ +float ## sz float ## sz ## _ ## name(float ## sz a, float ## sz b, \ + float_status *s) \ +{ \ + FloatParts pa =3D float ## sz ## _unpack_canonical(a, s); \ + FloatParts pb =3D float ## sz ## _unpack_canonical(b, s); \ + FloatParts pr =3D minmax_decomposed(pa, pb, ismin, isiee, ismag, s); \ + \ + return float ## sz ## _round_pack_canonical(pr, s); \ +} + +MINMAX(16, min, true, false, false) +MINMAX(16, minnum, true, true, false) +MINMAX(16, minnummag, true, true, true) +MINMAX(16, max, false, false, false) +MINMAX(16, maxnum, false, true, false) +MINMAX(16, maxnummag, false, true, true) + +MINMAX(32, min, true, false, false) +MINMAX(32, minnum, true, true, false) +MINMAX(32, minnummag, true, true, true) +MINMAX(32, max, false, false, false) +MINMAX(32, maxnum, false, true, false) +MINMAX(32, maxnummag, false, true, true) + +MINMAX(64, min, true, false, false) +MINMAX(64, minnum, true, true, false) +MINMAX(64, minnummag, true, true, true) +MINMAX(64, max, false, false, false) +MINMAX(64, maxnum, false, true, false) +MINMAX(64, maxnummag, false, true, true) + +#undef MINMAX + /* Multiply A by 2 raised to the power N. */ static FloatParts scalbn_decomposed(FloatParts a, int n, float_status *s) @@ -6893,113 +7020,6 @@ int float128_compare_quiet(float128 a, float128 b, = float_status *status) return float128_compare_internal(a, b, 1, status); } =20 -/* min() and max() functions. These can't be implemented as - * 'compare and pick one input' because that would mishandle - * NaNs and +0 vs -0. - * - * minnum() and maxnum() functions. These are similar to the min() - * and max() functions but if one of the arguments is a QNaN and - * the other is numerical then the numerical argument is returned. - * minnum() and maxnum correspond to the IEEE 754-2008 minNum() - * and maxNum() operations. min() and max() are the typical min/max - * semantics provided by many CPUs which predate that specification. - * - * minnummag() and maxnummag() functions correspond to minNumMag() - * and minNumMag() from the IEEE-754 2008. - */ -#define MINMAX(s) \ -static inline float ## s float ## s ## _minmax(float ## s a, float ## s b,= \ - int ismin, int isieee, \ - int ismag, \ - float_status *status) \ -{ \ - flag aSign, bSign; \ - uint ## s ## _t av, bv, aav, abv; \ - a =3D float ## s ## _squash_input_denormal(a, status); \ - b =3D float ## s ## _squash_input_denormal(b, status); \ - if (float ## s ## _is_any_nan(a) || \ - float ## s ## _is_any_nan(b)) { \ - if (isieee) { \ - if (float ## s ## _is_quiet_nan(a, status) && \ - !float ## s ##_is_any_nan(b)) { \ - return b; \ - } else if (float ## s ## _is_quiet_nan(b, status) && \ - !float ## s ## _is_any_nan(a)) { \ - return a; \ - } \ - } \ - return propagateFloat ## s ## NaN(a, b, status); \ - } \ - aSign =3D extractFloat ## s ## Sign(a); \ - bSign =3D extractFloat ## s ## Sign(b); \ - av =3D float ## s ## _val(a); \ - bv =3D float ## s ## _val(b); \ - if (ismag) { \ - aav =3D float ## s ## _abs(av); \ - abv =3D float ## s ## _abs(bv); \ - if (aav !=3D abv) { \ - if (ismin) { \ - return (aav < abv) ? a : b; \ - } else { \ - return (aav < abv) ? b : a; \ - } \ - } \ - } \ - if (aSign !=3D bSign) { \ - if (ismin) { \ - return aSign ? a : b; \ - } else { \ - return aSign ? b : a; \ - } \ - } else { \ - if (ismin) { \ - return (aSign ^ (av < bv)) ? a : b; \ - } else { \ - return (aSign ^ (av < bv)) ? b : a; \ - } \ - } \ -} \ - \ -float ## s float ## s ## _min(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 1, 0, 0, status); \ -} \ - \ -float ## s float ## s ## _max(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 0, 0, 0, status); \ -} \ - \ -float ## s float ## s ## _minnum(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 1, 1, 0, status); \ -} \ - \ -float ## s float ## s ## _maxnum(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 0, 1, 0, status); \ -} \ - \ -float ## s float ## s ## _minnummag(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 1, 1, 1, status); \ -} \ - \ -float ## s float ## s ## _maxnummag(float ## s a, float ## s b, \ - float_status *status) \ -{ \ - return float ## s ## _minmax(a, b, 0, 1, 1, status); \ -} - -MINMAX(32) -MINMAX(64) - - floatx80 floatx80_scalbn(floatx80 a, int n, float_status *status) { flag aSign; diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index 52621e0b79..35df225a55 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -245,6 +245,12 @@ float16 float16_mul(float16, float16, float_status *st= atus); float16 float16_muladd(float16, float16, float16, int, float_status *statu= s); float16 float16_div(float16, float16, float_status *status); float16 float16_scalbn(float16, int, float_status *status); +float16 float16_min(float16, float16, float_status *status); +float16 float16_max(float16, float16, float_status *status); +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); =20 int float16_is_quiet_nan(float16, float_status *status); int float16_is_signaling_nan(float16, float_status *status); --=20 2.15.1