From patchwork Wed Jan 24 13:13:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 125657 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp417982ljf; Wed, 24 Jan 2018 05:32:25 -0800 (PST) X-Google-Smtp-Source: AH8x226xs1MjwQN5tqo7vHb3mqaObH1FZIsRXfbI9glZhguh1+0KAzCrBGXMUlqrb1LzG6llRiZb X-Received: by 10.129.61.7 with SMTP id k7mr5098462ywa.457.1516800745544; Wed, 24 Jan 2018 05:32:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516800745; cv=none; d=google.com; s=arc-20160816; b=pk2lDyrkuotho9s0YcgfCEVIRN5cj4GJ6c7FVqTaVYPdEVrFbc2hyk0K8dmevR0Ott 3R2qRrAkEThtJWpTdfCB7DEMGkJe4gN3OlwSutb1QUOqMQOWUnGQ17/s16Fy632XkyHT PRnPQ3BkiSr2751Xo5fHKMvJIPixO0mEf9iuuWCaixztSeCxui1f8qKC/S7ukwmGYUvX Q9eHQZ1B4nW0FOrequW5l/bgtjOG27r9F90YONNhgn3NBP3tyKqlAMY1V7VqRMKNjKUV X3p34puQ496lFy/W9xfGaiuyEh3Hv9YGIOREyVMbPrqclJim1Bejh8Rl7sAayG49iDhC V+aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=RmErC+XDQ7bCK/VT+crpr0PUnd4HhadcWAz8gLsw1ck=; b=U3ToVmnixuXmOJK9BJNgM/Z8B4CpW48St7lZ4x9DNmN1iminSMqkSibOczqPa3r/lk lzDhzBiXuIX8bUFn7rp9ASN+JDIUUbCjbkSCcwGrcmExTlzUiRmQgfJ6jTbrKotnnDrO iA6CtRfPDBRZlvarXow+V7kfU4kfTuMkC+set/kKzx9mNb2oSz7jJqrkY5b0W57LTw7i pjSwIAH3h4SyIxNpT0cnkjbhKJccdcl1b42kbl8fp8N8IIfqrsAdv8SQVPxNgxX1T2MG tvLT3UMkQo/a4jEEm570HhdnoARhSPLpw9gTrQiD9kzVgnBwEdrWo9sWoAhcyez4C9/I 9cQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oc4fJ3VJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 83si2825148ybp.624.2018.01.24.05.32.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 Jan 2018 05:32:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Oc4fJ3VJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeLA8-0001GI-UE for patch@linaro.org; Wed, 24 Jan 2018 08:32:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeKwy-0007rQ-EJ for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeKwv-00015c-E5 for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:48 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:33673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeKwv-00014r-4i for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:18:45 -0500 Received: by mail-wr0-x243.google.com with SMTP id s5so2665709wra.0 for ; Wed, 24 Jan 2018 05:18:45 -0800 (PST) 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=RmErC+XDQ7bCK/VT+crpr0PUnd4HhadcWAz8gLsw1ck=; b=Oc4fJ3VJmQJiVO38mR0Koj/BgMH8t4v6nMI3UhxN8Lyt7hyBabGpYBjGmg2/AyyDyW f8oxOpMlgvk13rkZLpC34U0B8Uu6zFNqYlSI58lyBEhuRaR3shmF3Sqkq9w/ew+KBGDW mnabY3tuQrSjxgZWDeAoknYhmubALaFf6fN5A= 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=RmErC+XDQ7bCK/VT+crpr0PUnd4HhadcWAz8gLsw1ck=; b=YIEV8KbrjyyG2iMY2ApEUmESpaAuhwg2kNwZLZ4CbOQRnDTH3Hzf8104PeKZA6mTDs zGAAHsdLJ7YP1qvXdyyffqmiw87fR1NwkMUcowVPQ5JPR853lDzu1GrSjrdndO61xmIA LC2CLIEtV0BxwWmFUW70+ji0gmNut8vt0ld//8ircomJ2/B/RobKQER5ImtX1EcBrQYb 5Wk+XV6nG/8ubkhvNNlNvWEMsEpFcP0J1+Vn+Rw7BTJWHipdbk9sc42wP0YT4D6k3D/n 0p9gtpW7vZyC6Gmp8nocTYw9fExfIEwLl/eF+DZIbS/9uOdT9dcg/pUkzYvp9IwKVse/ pNnQ== X-Gm-Message-State: AKwxytev5ylDMRWU2E3Edr4hxYLQYtzyyT+5AQ8/ZFeGQ/7cZH49T5AE lYphN1+hUW3/72dyEd1cLsKAQw== X-Received: by 10.223.176.79 with SMTP id g15mr5950072wra.34.1516799924074; 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 o22sm2127117wra.51.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 44C7D3E0D12; Wed, 24 Jan 2018 13:13:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=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:14 +0000 Message-Id: <20180124131315.30567-22-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH v3 21/22] fpu/softfloat: re-factor compare 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The compare function was already expanded from a macro. I keep the macro expansion but move most of the logic into a compare_decomposed. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - minor re-factor for better inf handling v3 - fix renaming of structs/functions --- fpu/softfloat.c | 136 +++++++++++++++++++++++++++++------------------- include/fpu/softfloat.h | 2 + 2 files changed, 84 insertions(+), 54 deletions(-) -- 2.15.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 09f9d12a06..8ee110abba 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1773,6 +1773,88 @@ MINMAX(64, maxnummag, false, true, true) #undef MINMAX +/* Floating point compare */ +static int compare_floats(FloatParts a, FloatParts 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) { + if (b.cls == float_class_zero) { + return float_relation_equal; + } + return b.sign ? float_relation_greater : float_relation_less; + } else if (b.cls == float_class_zero) { + return a.sign ? float_relation_less : float_relation_greater; + } + + /* The only really important thing about infinity is its sign. If + * both are infinities the sign marks the smallest of the two. + */ + if (a.cls == float_class_inf) { + if ((b.cls == float_class_inf) && (a.sign == b.sign)) { + return float_relation_equal; + } + return a.sign ? float_relation_less : float_relation_greater; + } else if (b.cls == float_class_inf) { + return b.sign ? float_relation_greater : float_relation_less; + } + + 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) \ +{ \ + FloatParts pa = float ## sz ## _unpack_canonical(a, s); \ + FloatParts pb = float ## sz ## _unpack_canonical(b, s); \ + return compare_floats(pa, pb, false, s); \ +} \ +int float ## sz ## _compare_quiet(float ## sz a, float ## sz b, \ + float_status *s) \ +{ \ + FloatParts pa = float ## sz ## _unpack_canonical(a, s); \ + FloatParts pb = float ## sz ## _unpack_canonical(b, s); \ + return compare_floats(pa, pb, true, s); \ +} + +COMPARE(16) +COMPARE(32) +COMPARE(64) + +#undef COMPARE + /* Multiply A by 2 raised to the power N. */ static FloatParts scalbn_decomposed(FloatParts a, int n, float_status *s) @@ -6872,60 +6954,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 35df225a55..cebe37b716 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -251,6 +251,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);