From nobody Wed Jun 12 01:38:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VzSqP2Tc4z5NQm9; Wed, 12 Jun 2024 01:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzSqP1psyz4rlk; Wed, 12 Jun 2024 01:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718156305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z5ZUCawdiz1kakdn1ERbDsO5LDDF/haEmFK/zuDPAMM=; b=bAIjXrhqKJRQoE7/fpb6UCXIhr2z4Z733IiQGL5KkYzLgvhuqjYTYlMHr1WLvyMzPDVwpq o1BYFK2c7wEszqlhJULLfmh4Zor70t9y2N6V4J4ytKDvAQ75ClUgjilXGzL5ubYHRDGNWs Bu5GeC+YGOh8wl+4W/7dGCaHG3bx1D0o03iwLwYEEnRutCX5QcIBWG7mE7ul7xnH8BEeK6 JiuCxJG9q3hXGWeEBwYbHjRP5DlvEtCnq7qimeg/NqnsR9gA17mZHsGYf5FBz5OMd2Oydj FtlxaNMNQOQW2Av2oHwY+t1/yn9XumXtuafbhOFW8qiCyqdIL8IC4GR6/454VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718156305; a=rsa-sha256; cv=none; b=iOaTvudMez8tJrwIC2VMCu/e8WCHYHyltTug0lxVvXpfz4HdhWPHQKrW6BejnuaqmQsXmA TQvsmioTZWZk8kbMqrNfNMW0i/TiYQ1Fm8qomjFCExYxRS9/77vbgKnUlE0vgzGGhjYPEo tyodO7YVeGavAaqDBsUWsRVCveopZNMRoGkWoOm6eJs+CdZa+XblwQvCmpOHcHQh0K11hL tBwBiCVjbsq5Z2iYUMKm99npGy1vecb3Le/7/wZ5WdE1HmyoLQuaanZSd5SfvMWZavYoX8 nbEVRW42c5GL0h2qQ2Eg9g0FyIs+f7u5G4Ui1N/DAwNqn/phIAyyo0CZ98vp6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718156305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z5ZUCawdiz1kakdn1ERbDsO5LDDF/haEmFK/zuDPAMM=; b=EeAdIIy4/hfegMTm4F+MWVga0kMJ1s3kfG/GOnsTBgmEjGkMbG62eJ6IuR4Uo2cOxq88Fv cYuQ9hUKonnBfH/2OVb/IhlpPcNVs/n8Eimr11th+XOFlHiMR9xW1oZJw5kN6RdmVfOweW zkiB9K8EgNONcxVbSf+JzUbpcyjukuiGXlx9m+btpkmJMTCeibh6EPtN32Qfy4a9j+Ms85 qEuMhVkWG7tJh2xLLD+PefWZSf2Z51rVYruyGfxHyj/B9TF7OxAJc3kY7Dym0AFbyx9GkM DHMSuPTlmSita5peFpiOYmZgznXRecFH6M6GRGNmCGgDG7cf121FKrTWNVV2Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VzSqP1PrkzYrb; Wed, 12 Jun 2024 01:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45C1cPYW009738; Wed, 12 Jun 2024 01:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45C1cPvs009735; Wed, 12 Jun 2024 01:38:25 GMT (envelope-from git) Date: Wed, 12 Jun 2024 01:38:25 GMT Message-Id: <202406120138.45C1cPvs009735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e77ad954bb82 - main - Revert "libm: fma: correct zero sign with small inputs" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e77ad954bb825983b4346b9cc646c9c910b1be24 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e77ad954bb825983b4346b9cc646c9c910b1be24 commit e77ad954bb825983b4346b9cc646c9c910b1be24 Author: Ed Maste AuthorDate: 2024-06-12 01:34:02 +0000 Commit: Ed Maste CommitDate: 2024-06-12 01:36:12 +0000 Revert "libm: fma: correct zero sign with small inputs" This change introduced a test failure, so revert until that can be addressed. This reverts commit 888796ade2842486d3167067e8034254c38aadd3. PR: 277783 Reported by: rlibby Sponsored by: The FreeBSD Foundation --- lib/msun/src/s_fma.c | 4 +--- lib/msun/src/s_fmal.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 686e80e66f5d..16902d321290 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -267,9 +267,7 @@ fma(double x, double y, double z) */ fesetround(oround); volatile double vzs = zs; /* XXX gcc CSE bug workaround */ - xs = ldexp(xy.lo, spread); - xy.hi += vzs; - return (xy.hi == 0 ? xs : xy.hi + xs); + return (xy.hi + vzs + ldexp(xy.lo, spread)); } if (oround != FE_TONEAREST) { diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index a53d85f5ca57..9d08bc72e12e 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -248,9 +248,7 @@ fmal(long double x, long double y, long double z) */ fesetround(oround); volatile long double vzs = zs; /* XXX gcc CSE bug workaround */ - xs = ldexpl(xy.lo, spread); - xy.hi += vzs; - return (xy.hi == 0 ? xs : xy.hi + xs); + return (xy.hi + vzs + ldexpl(xy.lo, spread)); } if (oround != FE_TONEAREST) {