From nobody Mon Sep 14 00:45:09 2026 X-Original-To: dev-commits-src-branches@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 4hjmdf1nP1z6rKpp for ; Mon, 14 Sep 2026 00:45:10 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hjmdf0VSlz4pfw for ; Mon, 14 Sep 2026 00:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789346710; 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=YHK4Jxf/Z4Tab/Z320wKUef/1eDfUvd1U1vHThIqp3o=; b=KuIv5tzKgtnak9mzs+ItUWfZgUAYSGS3RQLV1FN9QEKU7dT+B0FkgVmoVm6IUdk52WoqSX cbtApoTq/aR+/na4H/SxgiJNgD7lbUz46H0TmX3sJJfcnzM6017k/4la/doZSOwmekKfdm J9wdlf9NVO2qFzrw+g+BHulyLLHbOrS1J4kyRkYEHsqji3U4fUZ0hrym+lGV81Y/Cqpz7w k2J36pgDFvwO43r0kH0afP+8cQUQu7/EUESU/SMAIjoPWrs5wOHGsezliXwnTToU3QXnIJ kq/urQYjChApNagiN6LR4Nn3Rcs0Xr4w0mmR5hMEKAN9ZKqsTcHIy73ivykaiw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789346710; b=DsLeLsb9clUB0OymkZZT23z5eHOWGsv76Sfd3EjaULsKE1tic7CQ0LQ1ovUTzi+CYHEKAm JRgVYL8qBwnS99RIbMA9lyyr0+KsqSejJE6IcBG1aGFbBU+asg5CIZO+xifRKL5BMrp1/M RdNMgGMdmPJ9YyNa0MMwCw0LKmNhf1xRGjeRTIoGGw45ZoRcEk7X9mddZaSJj0sB2rM74a xVP/+BWCxOayCl3iuXW52xCWN1RNsqPenXODyItMnDMtKFi74DrcgPJWEjfJQFOqXeyECZ FHQff2UtfTHeFfShVIyjpRkif7zWapFpTvXVWv+g9d+gwXOGqmEHx0q+SJyjLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789346710; 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=YHK4Jxf/Z4Tab/Z320wKUef/1eDfUvd1U1vHThIqp3o=; b=cBDtmplf8o9h5kNiY+0ab71kIYIkgd6YyIDjr0Phz/cv7bGvfYfoAUQA/ap9UShbQxHlRG 195K4NoVc9A81ayWhfguliUiBOwlYOa8rcCAtYxI3IVy3UXIzQhhdn2W7Jb5Ny0Wmi35jL +nFScHVsMv8FHP02YeGkUL1Oc4CTrDEhuF/vqRSQozQgce/sUd9z0wP2jiNIjnHOY3A/rC g0OmRYIqyaLSandGWAvz5BeMY+/YlQt+w6UCztL6jWMLVl5C7Ol1HOngFb4oZfhR9UN42Z PElKpEzPfCv0XgagXkYlg1IKtPuN1IYnRBsS6KPlxBGRVI+ctm/LrdIVF+9/gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hjmdd6D0Dz16LD for ; Mon, 14 Sep 2026 00:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c004 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 00:45:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cf46693f1351 - stable/15 - lib/msun amd64: use AVX FMA instructions for fma(3) and fmaf(3) when available List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf46693f1351fc42e84cacbf81b7b625a5bdab72 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 00:45:09 +0000 Message-Id: <6aa74395.1c004.dbecf86@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cf46693f1351fc42e84cacbf81b7b625a5bdab72 commit cf46693f1351fc42e84cacbf81b7b625a5bdab72 Author: Konstantin Belousov AuthorDate: 2026-09-06 05:01:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-14 00:44:42 +0000 lib/msun amd64: use AVX FMA instructions for fma(3) and fmaf(3) when available (cherry picked from commit 18a5549bcb81ec084f284a98046631db277ad47c) --- lib/msun/amd64/Makefile.inc | 9 ++++++++- lib/msun/amd64/s_fma_avx.S | 24 ++++++++++++++++++++++++ lib/msun/amd64/s_fmaf_avx.S | 24 ++++++++++++++++++++++++ lib/msun/src/s_fma.c | 11 ++++++++++- lib/msun/src/s_fmaf.c | 11 ++++++++++- 5 files changed, 76 insertions(+), 3 deletions(-) diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc index f1e6aef552ca..0efb16314af3 100644 --- a/lib/msun/amd64/Makefile.inc +++ b/lib/msun/amd64/Makefile.inc @@ -1,8 +1,15 @@ -ARCH_SRCS = e_fmod.S e_fmodf.S e_fmodl.S \ +.PATH: ${LIBC_SRCTOP}/amd64/string + +ARCH_SRCS = amd64_archlevel.c \ + e_fmod.S e_fmodf.S e_fmodl.S \ e_remainder.S e_remainderf.S e_remainderl.S \ e_sqrt.S e_sqrtf.S e_sqrtl.S \ + s_fma_avx.S s_fmaf_avx.S \ s_llrint.S s_llrintf.S s_llrintl.S \ s_logbl.S s_lrint.S s_lrintf.S s_lrintl.S \ s_remquo.S s_remquof.S s_remquol.S \ s_rintl.S s_scalbn.S s_scalbnf.S s_scalbnl.S LDBL_PREC = 64 + +CFLAGS+=-D_RENAME_FMA +CFLAGS+=-D_RENAME_FMAF diff --git a/lib/msun/amd64/s_fma_avx.S b/lib/msun/amd64/s_fma_avx.S new file mode 100644 index 000000000000..6585d0ffb074 --- /dev/null +++ b/lib/msun/amd64/s_fma_avx.S @@ -0,0 +1,24 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * This software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include "amd64_archlevel.h" + + .text +ARCHENTRY(fma, avx) + vfmadd132sd %xmm1, %xmm2, %xmm0 + ret +ARCHEND(fma, avx) + +ARCHFUNCS(fma) + ARCHFUNC(fma, sw) + NOARCHFUNC + NOARCHFUNC + ARCHFUNC(fma, avx) +ENDARCHFUNCS(fma) diff --git a/lib/msun/amd64/s_fmaf_avx.S b/lib/msun/amd64/s_fmaf_avx.S new file mode 100644 index 000000000000..61645693b20d --- /dev/null +++ b/lib/msun/amd64/s_fmaf_avx.S @@ -0,0 +1,24 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * This software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include "amd64_archlevel.h" + + .text +ARCHENTRY(fmaf, avx): + vfmadd132ss %xmm1, %xmm2, %xmm0 + ret +ARCHEND(fmaf, avx): + +ARCHFUNCS(fmaf) + ARCHFUNC(fmaf, sw) + NOARCHFUNC + NOARCHFUNC + ARCHFUNC(fmaf, avx) +ENDARCHFUNCS(fmaf) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 23a84491dd2a..107d78543887 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -163,6 +163,10 @@ dd_mul(double a, double b) return (ret); } +#ifdef _RENAME_FMA +double fma_sw(double, double, double); +#endif + /* * Fused multiply-add: Compute x * y + z with a single rounding error. * @@ -181,7 +185,12 @@ dd_mul(double a, double b) * since this implementation will likely be several times slower. */ double -fma(double x, double y, double z) +#ifdef _RENAME_FMA +fma_sw +#else +fma +#endif +(double x, double y, double z) { double xs, ys, zs, adj; struct dd xy, r; diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c index 5f3d5d1b1b99..666d2bb26d91 100644 --- a/lib/msun/src/s_fmaf.c +++ b/lib/msun/src/s_fmaf.c @@ -38,6 +38,10 @@ fmaf(float x, float y, float z) return (__builtin_fmaf(x, y, z)); } #else +#ifdef _RENAME_FMAF +float fmaf_sw(float, float, float); +#endif + /* * Fused multiply-add: Compute x * y + z with a single rounding error. * @@ -46,7 +50,12 @@ fmaf(float x, float y, float z) * rounding occurs. */ float -fmaf(float x, float y, float z) +#ifdef _RENAME_FMAF +fmaf_sw +#else +fmaf +#endif +(float x, float y, float z) { double xy, result; uint32_t hr, lr;