From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F0B2C433F5 for ; Thu, 28 Oct 2021 05:04:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFEE7610CA for ; Thu, 28 Oct 2021 05:04:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DFEE7610CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=opensource.wdc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfxan-0008J3-SV for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 01:04:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfxHt-0000sG-Sr for qemu-devel@nongnu.org; Thu, 28 Oct 2021 00:45:14 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:42396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfxHr-0005CM-3A for qemu-devel@nongnu.org; Thu, 28 Oct 2021 00:45:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1635396309; x=1666932309; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WwHJ/ZVkBIipvA0SPzaWNs4FzpkkzsKcMKbxAl2+87k=; b=CsdXYpLZMWcoMaQoPN+0Np6uIRagTOwrUv0jmd/9PD/bnhDSfucfS5b4 OqcK1UrFnLCSdFMT4yzDBerC938u/homfcVsw7ANBIV7aPYvfiQJPTFak zcEd3repcpULZSNSoJuZOvkrbEHiJ9ZKBLx7BgmkGsr/h4FUxzVxfA4KM IokSp1aIfFluBkkEQqr73ozCAjdxVworytrphLiWtpO+IZOfBSas2TNAy 6hIUmhJzsOOPaekX7pANiS9BZDdYEQ0my2mPmrSh3/4U2rGo8C8yrWum9 SnzpVpw+sYQMPdYiCeMUAIDt/DoGJLaWVhiSSe13hwv4BeeLSP3P7DRBv Q==; X-IronPort-AV: E=Sophos;i="5.87,188,1631548800"; d="scan'208";a="188815810" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 28 Oct 2021 12:45:08 +0800 IronPort-SDR: WsJOOtNLg1KWukDyu3cwfHgAuzdjMhFsY+HxjHaH6FNoKS8nmICnQLYqMb5LGP0wGbS7/ywKlQ 2KJMN15vcVewvBLbuiP567Nbu2ASt9xrwVlz4k8/iZQLCTXb/lvce1xK9GSZUxslpi54X3yRS2 FR+9Mw08Bm5ruzSc6t83WhOd8//WC6Hm8RXw6Iq+jXn1adrY11p1p+3FZIFktZpVkVTEytVY6Y Qpaty2OYQkEkWf09kRFmI0TtLtlFJSr0g+dG+QDi2roK9QEmeFUKSVbvaC96Tiz2cNnUIpVhNG hdUa5R/swMcbV2wDepHmijry Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 21:19:04 -0700 IronPort-SDR: iNOnp1wBPoD02q+irrry2h9dW5JALmfaZCjo37GKdhuJgZni76KXQrwBMWGrnKXhfT9DCmczEn 2X2XzbFlK65GAmFnEYTSfPlD6OMfScLzRWisgz/pCBD1+YZtfo2mOFLBiatFoTd3GdrQ6YjLIT fkp6GOGeNVSEovlx7gIWv+37V9Kfsy2Vm4yQ5BYAgI62Ai9JB9fBUsOfcjh4lWL/0QEe9tgFC6 dzsy/+cwPuMbMFzwvl8KKVH4XPEf8Ws6iFFRHSKLwG/Q9u7qkU67q2bJYhOvZzkBs4siz1lOPv FAo= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2021 21:45:09 -0700 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4HftK100lLz1RtVx for ; Wed, 27 Oct 2021 21:45:08 -0700 (PDT) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1635396308; x=1637988309; bh=WwHJ/ZVkBIipvA0SPz aWNs4FzpkkzsKcMKbxAl2+87k=; b=LBUrKClV3+hYstiCUc8ifqBE4ccUKqrE4z tyXnj/xsAxZgaTKsJpELFWTHWOXIZQFQLe3GsKSgDWvxlGouHFG3U8/slGxGJkKY zpC1QS91ISBZJWqlZB5bvKxqhBlfaG+mdKFt/KHQtgCCssP7Kd6VG2dp870HVDnp rUoJMmvY8JLZ2y8+mDlYYK1CAVgj524HH8QfJSwhlMDqX0uIjCovLVOv1o1EPm2Y kDDf6IVxnDdH1SH6ENbb0cdp01pPs6LLwGdOxA9dNZl0LxbVrD4fCRsc52VG0iJj uJLaovXmBVnMnEiJUQ3DAm/776xXiYG18HsBttSCzp7foC60YZRQ== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id FeSB8M7fOvFc for ; Wed, 27 Oct 2021 21:45:08 -0700 (PDT) Received: from toolbox.alistair23.me (unknown [10.225.165.40]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4HftJv4BZqz1RtVl; Wed, 27 Oct 2021 21:45:02 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Chih-Min Chao , Frank Chang , Richard Henderson , Alistair Francis Subject: [PULL 15/18] softfloat: add APIs to handle alternative sNaN propagation for fmax/fmin Date: Thu, 28 Oct 2021 14:43:39 +1000 Message-Id: <20211028044342.3070385-16-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028044342.3070385-1-alistair.francis@opensource.wdc.com> References: <20211028044342.3070385-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.71.153.141; envelope-from=prvs=928ee31ee=alistair.francis@opensource.wdc.com; helo=esa3.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Chih-Min Chao For "fmax/fmin ft0, ft1, ft2" and if one of the inputs is sNaN, The original logic: Return NaN and set invalid flag if ft1 =3D=3D sNaN || ft2 =3D=3D sNan= . The alternative path: Set invalid flag if ft1 =3D=3D sNaN || ft2 =3D=3D sNaN. Return NaN only if ft1 =3D=3D NaN && ft2 =3D=3D NaN. The IEEE 754 spec allows both implementation and some architecture such as riscv choose different defintions in two spec versions. (riscv-spec-v2.2 use original version, riscv-spec-20191213 changes to alternative) Signed-off-by: Chih-Min Chao Signed-off-by: Frank Chang Reviewed-by: Richard Henderson Message-id: 20211016085428.3001501-2-frank.chang@sifive.com Signed-off-by: Alistair Francis --- include/fpu/softfloat.h | 10 ++++++++++ fpu/softfloat.c | 19 +++++++++++++------ fpu/softfloat-parts.c.inc | 25 +++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index ec7dca0960..a249991e61 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -243,6 +243,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); +float16 float16_minimum_number(float16, float16, float_status *status); +float16 float16_maximum_number(float16, float16, float_status *status); float16 float16_sqrt(float16, float_status *status); FloatRelation float16_compare(float16, float16, float_status *status); FloatRelation float16_compare_quiet(float16, float16, float_status *stat= us); @@ -422,6 +424,8 @@ bfloat16 bfloat16_minnum(bfloat16, bfloat16, float_st= atus *status); bfloat16 bfloat16_maxnum(bfloat16, bfloat16, float_status *status); bfloat16 bfloat16_minnummag(bfloat16, bfloat16, float_status *status); bfloat16 bfloat16_maxnummag(bfloat16, bfloat16, float_status *status); +bfloat16 bfloat16_minimum_number(bfloat16, bfloat16, float_status *statu= s); +bfloat16 bfloat16_maximum_number(bfloat16, bfloat16, float_status *statu= s); bfloat16 bfloat16_sqrt(bfloat16, float_status *status); FloatRelation bfloat16_compare(bfloat16, bfloat16, float_status *status)= ; FloatRelation bfloat16_compare_quiet(bfloat16, bfloat16, float_status *s= tatus); @@ -589,6 +593,8 @@ float32 float32_minnum(float32, float32, float_status= *status); float32 float32_maxnum(float32, float32, float_status *status); float32 float32_minnummag(float32, float32, float_status *status); float32 float32_maxnummag(float32, float32, float_status *status); +float32 float32_minimum_number(float32, float32, float_status *status); +float32 float32_maximum_number(float32, float32, float_status *status); bool float32_is_quiet_nan(float32, float_status *status); bool float32_is_signaling_nan(float32, float_status *status); float32 float32_silence_nan(float32, float_status *status); @@ -778,6 +784,8 @@ float64 float64_minnum(float64, float64, float_status= *status); float64 float64_maxnum(float64, float64, float_status *status); float64 float64_minnummag(float64, float64, float_status *status); float64 float64_maxnummag(float64, float64, float_status *status); +float64 float64_minimum_number(float64, float64, float_status *status); +float64 float64_maximum_number(float64, float64, float_status *status); bool float64_is_quiet_nan(float64 a, float_status *status); bool float64_is_signaling_nan(float64, float_status *status); float64 float64_silence_nan(float64, float_status *status); @@ -1210,6 +1218,8 @@ float128 float128_minnum(float128, float128, float_= status *status); float128 float128_maxnum(float128, float128, float_status *status); float128 float128_minnummag(float128, float128, float_status *status); float128 float128_maxnummag(float128, float128, float_status *status); +float128 float128_minimum_number(float128, float128, float_status *statu= s); +float128 float128_maximum_number(float128, float128, float_status *statu= s); bool float128_is_quiet_nan(float128, float_status *status); bool float128_is_signaling_nan(float128, float_status *status); float128 float128_silence_nan(float128, float_status *status); diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 6e769f990c..9a28720d82 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -436,6 +436,11 @@ enum { minmax_isnum =3D 2, /* Set for the IEEE 754-2008 minNumMag() and minNumMag() operations.= */ minmax_ismag =3D 4, + /* + * Set for the IEEE 754-2019 minimumNumber() and maximumNumber() + * operations. + */ + minmax_isnumber =3D 8, }; =20 /* Simple helpers for checking if, or what kind of, NaN we have */ @@ -3927,12 +3932,14 @@ static float128 float128_minmax(float128 a, float= 128 b, { return type##_minmax(a, b, s, flags); } =20 #define MINMAX_2(type) \ - MINMAX_1(type, max, 0) \ - MINMAX_1(type, maxnum, minmax_isnum) \ - MINMAX_1(type, maxnummag, minmax_isnum | minmax_ismag) \ - MINMAX_1(type, min, minmax_ismin) \ - MINMAX_1(type, minnum, minmax_ismin | minmax_isnum) \ - MINMAX_1(type, minnummag, minmax_ismin | minmax_isnum | minmax_ismag= ) + MINMAX_1(type, max, 0) = \ + MINMAX_1(type, maxnum, minmax_isnum) = \ + MINMAX_1(type, maxnummag, minmax_isnum | minmax_ismag) = \ + MINMAX_1(type, maximum_number, minmax_isnumber) = \ + MINMAX_1(type, min, minmax_ismin) = \ + MINMAX_1(type, minnum, minmax_ismin | minmax_isnum) = \ + MINMAX_1(type, minnummag, minmax_ismin | minmax_isnum | minmax_ismag= ) \ + MINMAX_1(type, minimum_number, minmax_ismin | minmax_isnumber) = \ =20 MINMAX_2(float16) MINMAX_2(bfloat16) diff --git a/fpu/softfloat-parts.c.inc b/fpu/softfloat-parts.c.inc index dddee92d6e..41d4b17e41 100644 --- a/fpu/softfloat-parts.c.inc +++ b/fpu/softfloat-parts.c.inc @@ -1219,14 +1219,35 @@ static FloatPartsN *partsN(minmax)(FloatPartsN *a= , FloatPartsN *b, =20 if (unlikely(ab_mask & float_cmask_anynan)) { /* - * For minnum/maxnum, if one operand is a QNaN, and the other + * For minNum/maxNum (IEEE 754-2008) + * or minimumNumber/maximumNumber (IEEE 754-2019), + * if one operand is a QNaN, and the other * operand is numerical, then return numerical argument. */ - if ((flags & minmax_isnum) + if ((flags & (minmax_isnum | minmax_isnumber)) && !(ab_mask & float_cmask_snan) && (ab_mask & ~float_cmask_qnan)) { return is_nan(a->cls) ? b : a; } + + /* + * In IEEE 754-2019, minNum, maxNum, minNumMag and maxNumMag + * are removed and replaced with minimum, minimumNumber, maximum + * and maximumNumber. + * minimumNumber/maximumNumber behavior for SNaN is changed to: + * If both operands are NaNs, a QNaN is returned. + * If either operand is a SNaN, + * an invalid operation exception is signaled, + * but unless both operands are NaNs, + * the SNaN is otherwise ignored and not converted to a QNaN. + */ + if ((flags & minmax_isnumber) + && (ab_mask & float_cmask_snan) + && (ab_mask & ~float_cmask_anynan)) { + float_raise(float_flag_invalid, s); + return is_nan(a->cls) ? b : a; + } + return parts_pick_nan(a, b, s); } =20 --=20 2.31.1