From patchwork Mon Apr 28 17:03:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 885483 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp5289796wrs; Mon, 28 Apr 2025 10:05:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUWIydgYYKPkvODC21m4AEilDu9W3GMy8xeQZqugXL/8L+DDzUToS2K0C44TLRUNPXu8rTUBA==@linaro.org X-Google-Smtp-Source: AGHT+IHFN/uwN9L4kBYmVE7fnrCxoAbzAgJ83TQtjydaQNwZiJ6K700kmatiJN7hEgkc3ytyUNAt X-Received: by 2002:a05:6000:144d:b0:39c:1258:7e18 with SMTP id ffacd0b85a97d-3a08a3ca147mr40272f8f.57.1745859951768; Mon, 28 Apr 2025 10:05:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1745859951; cv=pass; d=google.com; s=arc-20240605; b=Yy+1+YdgKKa14/RrepE5+7hBSbODj8cbQJM4SoXshUoJqD63PYwloB3/ign8fBgq+K 0sM1hy+rXzvadr3eXatoe/PSHt6EfjrrP7Igz6GpXrd3NAnOBzYofAVX75Bys86+0uAv KxfTEumB2Dcil1ntZ4RPIeTqlrNs0VhAeweDaqTeZC4Mf6DsjMFvVqBNTgLm2I6hcBrX NFwgkIgo4ZXdxRATAtT80Ryd9dJDlCAeVkn5XZykfkUQEANszPvxVF9ALKODTMb7V2ne LtYWVcCL8OKe1vnkxjmFs43Y1AnMWvpRy8VVhY8Xjx+yZdPUX7uDENdbytVJKhsO1OPF Gu2A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:dkim-filter:arc-filter:dmarc-filter :delivered-to:dkim-filter; bh=ry5mqY52kfDAts9M6u0g0ijReRKvyYAmiYrLWGguSJ8=; fh=GVJhlWdd4NNaBhOZ/uQFycFAyzDMQer7CEL5IpLL3Iw=; b=llxTWpdi1AtXidwQ3U+Kp2wmqxALVbgjclJJiPocxNHQlN++KD44zW7NKaM9DWQ3xD OoziHaZGKNyD17OZR0im8hg+9iQPbUT40UFQU6d8vrNz0MdKb45hPZxLtjJNpnATlsaQ Xqrsoswr9SW+F1M1HanCEw9X3IpzjW9MlDWo/ybx3j4wRmIY/xh/RwAA9NOvd1l7Fr2U xcgo2NLmsrKifgiwrc7iLqrQDCBZJh/wxlzaA9putsAK9Z94pGknzIX5/e674CIMxYdp aXipEldv1uFc+uPsblMMn69oOk+hcivGsl8ct1BzBYl42IC6szhzId88KAyDwPPxjkCR nrxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dcstaA7S; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id 5b1f17b1804b1-440a530436csi60513825e9.66.2025.04.28.10.05.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 10:05:51 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dcstaA7S; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 84B963858C60 for ; Mon, 28 Apr 2025 17:05:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 84B963858C60 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=dcstaA7S X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by sourceware.org (Postfix) with ESMTPS id B26553858D38 for ; Mon, 28 Apr 2025 17:04:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B26553858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B26553858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1033 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745859885; cv=none; b=riG6aWMmocYhrExb2XZQfpZw9rxd3uI7NKq3qHdRWyZMT2ecZm+NxVMK6yo/SnHE17uaAgLCZ6LzhNnG553pi1vwa/knGtamrkNs/mAfUPoB1ONsB5TaHmsAJXKNVWkMJpuofnKuKxlJzRETReAJLM9GZiuzvRFy9UmB9Cikprw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745859885; c=relaxed/simple; bh=smJwasGCuS7BvdU3Si9kAG+U9e/Bo2GNkth7/tl7lpQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZGajvHJ7l4Ai5gc73bQ4FtNege23Web9uwbHEaxnlLEGDYEfLebl0FPiOJJaBrlzhx0r0STOoqdyQHCBqFiItvDjQWMON9yfaLZ6+4gjuThru5Lq8FO4D81kEJ1uWLYK0tnctX0glEo3/QcNkz6LRjiCwnm7YKWpdLk6EzVen7k= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B26553858D38 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-3031354f134so4229615a91.3 for ; Mon, 28 Apr 2025 10:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745859884; x=1746464684; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ry5mqY52kfDAts9M6u0g0ijReRKvyYAmiYrLWGguSJ8=; b=dcstaA7SSX7JY9XBt1OERx0Z94t5/6zqc/cypC703t4W5PmIm136rz1L19Sr7sfGYc XZIKUwmUaSq44ICl6L8UbBUmT6NqzkGW/V2qDq5gHpWQRVH59QlFNDwfZTuhzDJtk1Zk Jiim++wmimNUTnAvOsRTX/U4GXvGXDtbp2VDatUsHwGVZaXBxSmumNBMTO3rHwDAGo/G leDQzcpunLDHjV/+A0b8ENA4nw/0gCDlGA+Yio6AW2zF6hqSkR0azzj1oEfY9ePrM4AZ CginINYDNyIOwtzkKbth1CQG+E+xotm1jqTRyrBemHYgcY0bCg5WRb0Rca+JVeHq+Bbz X2/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745859884; x=1746464684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ry5mqY52kfDAts9M6u0g0ijReRKvyYAmiYrLWGguSJ8=; b=c0o3YrkXy5Ko+UazqQEDIUbUosx6APwo8yMHkZYta2Ic4PxvGCUDzDk+u20aFBXXnQ oVKBcMCvuSHvxpvzj9U3mgm7iwXCEwXVMxN9yTDDK9/RyRx80EjIWuFBXfX0H0jNjdVm 7pS3o3rw7fULXgCXFSmpoLo7zX5Uy9vo8+PNA861X65xoxaMIorYBUC1nSayQDlWnEb2 ouYmnbtiIKM+9vIN3zdOQkER5Adlt8d4Lc5jJtc76baclkwgdckHbjJQUffd4rgjZg1E 1lin9reY1yVR/7LVhcJoI/yxuZgydvSUylZh9uZv2Lw0xYbxO9Vp7cwALeLrpZ2nTKy5 QG1A== X-Gm-Message-State: AOJu0YxhDM2wPjYeKvVIptowuyFjJ+bI13weViflCG/lIhBkt23g6Weg 1u372mu5OzzUvJG5LyZTA8VLEaJv1UkzThFFPQdrk1ZiQPewOvy9Vjy+0P5524abE/hOYz/VaQY o X-Gm-Gg: ASbGncsVjPB2SRLnJS3q4JC4ZIHj+NjvhElS2ZovcYvdcs4GVr7fyCrtBGheTVmSzLk JpUPc08lScq2qPbr8tiSkCtCoBNdOt06Hd61orfCrldIgQ5RsIAUoNcS309HIHzvJH0xOuuw2Ul siGOPGk4KbGMjmhnmkGfWhJ8+LHzJu9EUqiFu91C23ANrVP+W7I75dslWPRnYsTUGUU7OAf4+B/ 9dzuiXUQvtUCCcPrmQWaw9YWFoyhiEBJ/SFFTa6xrj6uinJlxE6N+07UPfqjOFlsR2XwOzVntCT n5vfFYwCicYJGF0f+jmL1Un4FfTCZ3dgiz+GrDu7th7emrAE3q2Zuw== X-Received: by 2002:a17:90b:4c04:b0:2ff:5ed8:83d0 with SMTP id 98e67ed59e1d1-30a2155af72mr916247a91.16.1745859883984; Mon, 28 Apr 2025 10:04:43 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:9bf1:ce18:36e8:dea9:8b39]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309f773725csm8322332a91.3.2025.04.28.10.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Apr 2025 10:04:43 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Wilco Dijkstra Subject: [PATCH v2 4/4] math: Optimize float ilogb/llogb Date: Mon, 28 Apr 2025 14:03:44 -0300 Message-ID: <20250428170430.2030400-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250428170430.2030400-1-adhemerval.zanella@linaro.org> References: <20250428170430.2030400-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patch=linaro.org@sourceware.org It removes the wrapper by moving the error/EDOM handling to an out-of-line implementation (__math_invalidf_i/__math_invalidf_li). Also, __glibc_unlikely is used on errors case since it helps code generation on recent gcc. The code now builds to with gcc-14 on aarch64: 0000000000000000 <__ilogbf>: 0: 1e260000 fmov w0, s0 4: d3577801 ubfx x1, x0, #23, #8 8: 340000e1 cbz w1, 24 <__ilogbf+0x24> c: 5101fc20 sub w0, w1, #0x7f 10: 7103fc3f cmp w1, #0xff 14: 54000040 b.eq 1c <__ilogbf+0x1c> // b.none 18: d65f03c0 ret 1c: 12b00000 mov w0, #0x7fffffff // #2147483647 20: 14000000 b 0 <__math_invalidf_i> 24: 53175800 lsl w0, w0, #9 28: 340000a0 cbz w0, 3c <__ilogbf+0x3c> 2c: 5ac01000 clz w0, w0 30: 12800fc1 mov w1, #0xffffff81 // #-127 34: 4b000020 sub w0, w1, w0 38: d65f03c0 ret 3c: 320107e0 mov w0, #0x80000001 // #-2147483647 40: 14000000 b 0 <__math_invalidf_i> Checked on aarch64-linux-gnu and x86_64-linux-gnu. --- sysdeps/ieee754/flt-32/e_ilogbf.c | 42 +----------------- sysdeps/ieee754/flt-32/math_config.h | 2 + sysdeps/ieee754/flt-32/math_errf.c | 33 ++++++++++++++ sysdeps/ieee754/flt-32/w_ilogbf.c | 66 ++++++++++++++++++++++++++++ sysdeps/ieee754/flt-32/w_llogbf.c | 2 + 5 files changed, 104 insertions(+), 41 deletions(-) create mode 100644 sysdeps/ieee754/flt-32/w_ilogbf.c create mode 100644 sysdeps/ieee754/flt-32/w_llogbf.c diff --git a/sysdeps/ieee754/flt-32/e_ilogbf.c b/sysdeps/ieee754/flt-32/e_ilogbf.c index 024b114638..a27fb94732 100644 --- a/sysdeps/ieee754/flt-32/e_ilogbf.c +++ b/sysdeps/ieee754/flt-32/e_ilogbf.c @@ -1,41 +1 @@ -/* Get integer exponent of a floating-point value. - Copyright (C) 1999-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include "math_config.h" - -int -__ieee754_ilogbf (float x) -{ - uint32_t ux = asuint (x); - int ex = (ux & ~SIGN_MASK) >> MANTISSA_WIDTH; - if (ex == 0) /* zero or subnormal */ - { - /* Clear sign and exponent. */ - ux <<= 1 + EXPONENT_WIDTH; - if (ux == 0) - return FP_ILOGB0; - /* sbunormal */ - return -127 - stdc_leading_zeros (ux); - } - if (ex == EXPONENT_MASK >> MANTISSA_WIDTH) /* NaN or Inf */ - return ux << (1 + EXPONENT_WIDTH) ? FP_ILOGBNAN : INT_MAX; - return ex - 127; -} +/* ilogbf is implemented at w_ilogbf.c */ diff --git a/sysdeps/ieee754/flt-32/math_config.h b/sysdeps/ieee754/flt-32/math_config.h index 8d9c8ee3ad..fd9481a016 100644 --- a/sysdeps/ieee754/flt-32/math_config.h +++ b/sysdeps/ieee754/flt-32/math_config.h @@ -208,6 +208,8 @@ attribute_hidden float __math_uflowf (uint32_t); attribute_hidden float __math_may_uflowf (uint32_t); attribute_hidden float __math_divzerof (uint32_t); attribute_hidden float __math_invalidf (float); +attribute_hidden int __math_invalidf_i (int); +attribute_hidden long int __math_invalidf_li (long int); attribute_hidden float __math_edomf (float x); /* Shared between expf, exp2f, exp10f, and powf. */ diff --git a/sysdeps/ieee754/flt-32/math_errf.c b/sysdeps/ieee754/flt-32/math_errf.c index edcc4c094a..244e38a4ce 100644 --- a/sysdeps/ieee754/flt-32/math_errf.c +++ b/sysdeps/ieee754/flt-32/math_errf.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include #include "math_config.h" #if WANT_ERRNO @@ -27,8 +28,24 @@ with_errnof (float y, int e) errno = e; return y; } + +NOINLINE static int +with_errnof_i (int y, int e) +{ + errno = e; + return y; +} + +NOINLINE static long int +with_errnof_li (long int y, int e) +{ + errno = e; + return y; +} #else # define with_errnof(x, e) (x) +# define with_errnof_i(x, x) (x) +# define with_errnof_li(x, x) (x) #endif attribute_hidden float @@ -80,3 +97,19 @@ __math_invalidf (float x) float y = (x - x) / (x - x); return isnan (x) ? y : with_errnof (y, EDOM); } + +attribute_hidden int +__math_invalidf_i (int x) +{ + float y = 0.0f / 0.0f; + math_force_eval (y); + return with_errnof_i (x, EDOM); +} + +attribute_hidden long int +__math_invalidf_li (long int x) +{ + float y = 0.0f / 0.0f; + math_force_eval (y); + return with_errnof_li (x, EDOM); +} diff --git a/sysdeps/ieee754/flt-32/w_ilogbf.c b/sysdeps/ieee754/flt-32/w_ilogbf.c new file mode 100644 index 0000000000..7f7314797d --- /dev/null +++ b/sysdeps/ieee754/flt-32/w_ilogbf.c @@ -0,0 +1,66 @@ +/* Get integer exponent of a floating-point value. + Copyright (C) 1999-2025 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include "math_config.h" + +#ifdef DEF_AS_LLOGBF +# define IMPL_NAME __llogb +# define FUNC_NAME llogb +# define RET_TYPE long int +# define RET_LOGB0 FP_LLOGB0 +# define RET_LOGBNAN FP_LLOGBNAN +# define RET_LOGMAX LONG_MAX +# define RET_INVALID __math_invalidf_li +#else +# define IMPL_NAME __ilogb +# define FUNC_NAME ilogb +# define RET_TYPE int +# define RET_LOGB0 FP_ILOGB0 +# define RET_LOGBNAN FP_ILOGBNAN +# define RET_LOGMAX INT_MAX +# define RET_INVALID __math_invalidf_i +#endif + +RET_TYPE +M_DECL_FUNC (IMPL_NAME) (float x) +{ + uint32_t ux = asuint (x); + int ex = (ux & ~SIGN_MASK) >> MANTISSA_WIDTH; + if (__glibc_unlikely (ex == 0)) + { + /* Zero or subnormal. + Clear sign and exponent. */ + ux <<= 1 + EXPONENT_WIDTH; + if (ux == 0) + return RET_INVALID (RET_LOGB0); + /* sbunormal */ + return (RET_TYPE)-127 - stdc_leading_zeros (ux); + } + if (__glibc_unlikely (ex == EXPONENT_MASK >> MANTISSA_WIDTH)) + /* NaN or Inf */ + return RET_INVALID (ux << (1 + EXPONENT_WIDTH) ? RET_LOGBNAN : RET_LOGMAX); + return ex - 127; +} +libm_alias_float (IMPL_NAME, FUNC_NAME); diff --git a/sysdeps/ieee754/flt-32/w_llogbf.c b/sysdeps/ieee754/flt-32/w_llogbf.c new file mode 100644 index 0000000000..8676434f6e --- /dev/null +++ b/sysdeps/ieee754/flt-32/w_llogbf.c @@ -0,0 +1,2 @@ +#define DEF_AS_LLOGBF +#include "w_ilogbf.c"