From patchwork Tue Apr 29 16:30:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 885757 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp425212wrq; Tue, 29 Apr 2025 09:41:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUsRNi/FYujuvc7NXw4OvChypNX0WwHjwJkRCeS/VwHQQ8hPv3XM6YtcshwDjbIb10umYNEBQ==@linaro.org X-Google-Smtp-Source: AGHT+IEGFby2pFNDYc18o9cMudJHPRlDqwHSzDMDe1AZSB94UR4Mpzo4BZsVPnCRM6ljbXcdK271 X-Received: by 2002:a05:6214:f64:b0:6e6:6713:3ea8 with SMTP id 6a1803df08f44-6f4fce9dcbemr1234786d6.23.1745944891146; Tue, 29 Apr 2025 09:41:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1745944891; cv=pass; d=google.com; s=arc-20240605; b=bb7w7bFA6qoqRIoookhBBX0GYPgB8cEzIhyb6hpQOjzKPMtIirhiu9tjmUi1nYfFYp AfMTWdXlUOCKGuDryRntJUbs8WVe+sr5V5gkADyjB586e2NYvmAT8D5oySu+0ChqbsLV /G24MCqUvVnD6Z0pw1Z6zZwbrlJ5q0faS95k+UPlWQKEYFUHLB+D8N4aWQEmate2wSIM LxmadC+Xyvr1B9sptPHw4Fpttw63CYsfOgIQ4ubVHezFZ0heO+zID/QppBejO8jniKOC oF9stNi3aRkXDjhJFazb0n4SBCoY23+Y4h7LsxNvOC6SvODzgO3xjfWo0YN/FGs4++4x dl0Q== 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=TZ0B7KaibDNvpPu/oWeSX5CMAHs54GU+aI7HtPisn/g=; fh=QEQhASUpKkWwnOlb+v2n9KZRZHJ12Go9dzJxmOcjPvE=; b=AYGecbF3K8CmE/qc83Pgz65dcJbWz01QjRiXo3LJ5EUzeNlviWTZYomVpkTprCWMFq Jw/inesnRqYfDBjoqPtBrrG3SsNcHy/QWduStpJGMpgTwd+2ndhHJXEPPM0PB3eolCmw lw1kDmCS+WvsJTFyRbIpc4vwOsmV2S50HTGLQTNixTFvqNYcVuJLcpmBHTyvrFLV9p5j 5aG/LeKnOvBUGrrWlh/O/Of2bm2X4FEXmdJHkHY0RkQAP8hetMHXabKUl4gACezjYFGY CJ7RCk/1IjzKqQjDczR0+5m7ij6Ytx7t/i3SR0EbN21lC20OcbjyNfdndLvX/FS9Ejt7 qiFQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iSTwuuKt; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id 6a1803df08f44-6f4c08d27b5si127770196d6.52.2025.04.29.09.41.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 09:41:31 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iSTwuuKt; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 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 B31F63857B84 for ; Tue, 29 Apr 2025 16:41:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B31F63857B84 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=iSTwuuKt X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 6AD043858D3C for ; Tue, 29 Apr 2025 16:40:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AD043858D3C 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 6AD043858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745944817; cv=none; b=g1g4TsPLCo3YK6LDVgx0ye3W+heWkhYxJjZpX8ThUyp4w63mGMJ/zxOyOaR/+HG5fD0+fjZ9nZwNrJZAAgUNu8UYAXfQq8SDsbVNJSLSjmlqWy+q07J4Vrgxl2xkHrKa9A7mIikWY3zN9zVWeLxaty6bVUFXokdRIEdLd6GU+cM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1745944817; c=relaxed/simple; bh=eFsC7+YRFX/gZKfQ6MYWKKqlM6Ssu6MIUYPyOQIlw6w=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=dAq+VxyI6Yx0LoCV/M04IYfzhSo3EhBgrd15Bau8oeICWz099fPK5L++LAhJGp8jxR1MluLWe36kWaJ67VMaihekwQthTHhwqJPiCIqXOn2G04M0GkdSFf6BZPur5SdrQh2JXHNzr2P3GtX0jM3107Gi+FD0Nt6UVgTP6wiJE9I= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AD043858D3C Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-736a72220edso6251500b3a.3 for ; Tue, 29 Apr 2025 09:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745944816; x=1746549616; 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=TZ0B7KaibDNvpPu/oWeSX5CMAHs54GU+aI7HtPisn/g=; b=iSTwuuKtoOvyFFL1WsQQEXMEo7M15xUaq+lLADnXqEflSNsl7EtXM94/AidwycKSSr N2Nx6QyHf3VSNSfHpPUXs2YB+a0qgc78WHRvqhmeIcC3T2n98v5Ee6HAvl6fKlK6/k/i hJ8OPPdu9w9ScVohMR/ftmrNBUs5ttNaibfcL1Kd43D9fH2U07PSYPXcH6YQtnZAFIUo Rk4cnOtKHFIKvDrBWbAKD/YVGJoufLpHl3juZw8zJ7EQVNG50xvPyVVAfNAjZFDbuI+1 5kcSfiOckq0GguARBFrvCMK0M87DxAf7hJcjR4kZKb7KVGaM9XbnXEzBXLEPec7c830F ZN9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745944816; x=1746549616; 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=TZ0B7KaibDNvpPu/oWeSX5CMAHs54GU+aI7HtPisn/g=; b=m3nI4+Ug2hM9RbPZ0YS2+TTBi7DKCBk4+OmQDuGW1eSCf0lDWAiB1c6curj9Vrwwr8 MUk64LJ2STWoYPkGaDr9P5N/oaTLT87NljaZGDAm+0/Bbgfnao7KcEJ0h+0yRAuBMlfi E4U4dGKYu3en7Ofi+pTDpwnEGHisUPiA+iT8orBUXZUXittOHAbBuxXqsF4fOFPQtXCD OL5zZMslFxKoXLjYLeLgbBFrpygbqAz1LY+JWAZpoie6vkU37vAyXzvI65FJVIvtXKrw W09I0vok7J/0gqxzy1uYcMWx+977ZF0BzMyHfLEKnkMBRGAaRfHzhkW+2UI7Je2igjx+ ToTg== X-Gm-Message-State: AOJu0YxUU2Yz8DdSETESRbScQsg4ev0n7YR0RCw53pH+/9GFAfwWltEH 0L5ihBS+vLXAj7lu2RgVFpLZ6zbcyhlEmh7RZ6G3PAiAQ3ljEwEaqXG/iRqAw3ESHPBEhglcyi9 B X-Gm-Gg: ASbGnct9BP3eeLzlffjffRWAP9UE1KKPWVayIIst/opnyW+DMX2jhsj2i2eSQ8Q7RbF 8PFdEgxoci88Stj0B0m+4tFEPp4IZJXSK8EtuRjwJCLK3P66A3diOUwmKskgslASrGCgcN8sO0R 8sLGm+MSVJ1Yz1c+ItvwKc4yQdhy3iFtREhDGSm4OkSo6LaRvH3Eu9vMCrsPoms+2jY0Vv/maJB Cz+f7mI2FGAorMwG75vZ9FUzjp8KsDvP99lwBoEHP5mfs7lK8STie6zOXGFlLp642pZyP0M5KP9 BTp6/2E++T3YIcKU6ks1IRQEg+XQM6XnNj7b5UDIhFbppR59uVjthA== X-Received: by 2002:a05:6a00:4b05:b0:73b:71a9:a5ad with SMTP id d2e1a72fcca58-740293ae420mr5216784b3a.16.1745944815957; Tue, 29 Apr 2025 09:40:15 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:9bf1:b7a9:b8c3:bb3a:fca6]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e259134d5sm10492409b3a.19.2025.04.29.09.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 09:40:15 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Wilco Dijkstra , Xiaolin Tang , Peter Bergner Subject: [PATCH v3 2/6] math: Optimize double ilogb/llogb Date: Tue, 29 Apr 2025 13:30:00 -0300 Message-ID: <20250429164007.2928271-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250429164007.2928271-1-adhemerval.zanella@linaro.org> References: <20250429164007.2928271-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_invalid_i/__math_invalid_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 <__ilogb>: 0: 9e660000 fmov x0, d0 4: d374f801 ubfx x1, x0, #52, #11 8: 340000e1 cbz w1, 24 <__ilogb+0x24> c: 510ffc20 sub w0, w1, #0x3ff 10: 711ffc3f cmp w1, #0x7ff 14: 54000040 b.eq 1c <__ilogb+0x1c> // b.none 18: d65f03c0 ret 1c: 12b00000 mov w0, #0x7fffffff // #2147483647 20: 14000000 b 0 <__math_invalid_i> 24: d374cc00 lsl x0, x0, #12 28: b40000a0 cbz x0, 3c <__ilogb+0x3c> 2c: dac01000 clz x0, x0 30: 12807fc1 mov w1, #0xfffffc01 // #-1023 34: 4b000020 sub w0, w1, w0 38: d65f03c0 ret 3c: 320107e0 mov w0, #0x80000001 // #-2147483647 40: 14000000 b 0 <__math_invalid_i> Some ABI requires additional adjustments: * i386 and m68k requires to use the template version, since both provide __ieee754_ilogb implementatations. * loongarch uses a custom implementation as well. * powerpc64le also has a custom implementation for POWER9, which is also used for float and float128 version. The generic e_ilogb.c implementation is moved on powerpc to keep the current code as-is. Checked on aarch64-linux-gnu and x86_64-linux-gnu. --- sysdeps/i386/fpu/math_err.c | 1 - sysdeps/i386/fpu/w_ilogb.c | 2 + sysdeps/i386/fpu/w_llogb.c | 2 + sysdeps/ieee754/dbl-64/e_ilogb.c | 42 +-------------- sysdeps/ieee754/dbl-64/math_config.h | 2 + sysdeps/ieee754/dbl-64/math_err.c | 32 ++++++++++++ sysdeps/ieee754/dbl-64/w_ilogb-impl.h | 37 +++++++++++++ sysdeps/ieee754/dbl-64/w_ilogb.c | 52 +++++++++++++++++++ sysdeps/ieee754/dbl-64/w_llogb.c | 2 + .../fpu/{e_ilogb.c => w_ilogb-impl.h} | 12 ++--- sysdeps/m68k/m680x0/fpu/math_err.c | 1 - sysdeps/m68k/m680x0/w_ilogb.c | 2 + sysdeps/m68k/m680x0/w_llogb.c | 2 + sysdeps/powerpc/powerpc64/le/fpu/e_ilogb.c | 41 +++++++++++++++ sysdeps/powerpc/powerpc64/le/fpu/w_ilogb.c | 2 + sysdeps/powerpc/powerpc64/le/fpu/w_llogb.c | 2 + 16 files changed, 184 insertions(+), 50 deletions(-) delete mode 100644 sysdeps/i386/fpu/math_err.c create mode 100644 sysdeps/i386/fpu/w_ilogb.c create mode 100644 sysdeps/i386/fpu/w_llogb.c create mode 100644 sysdeps/ieee754/dbl-64/w_ilogb-impl.h create mode 100644 sysdeps/ieee754/dbl-64/w_ilogb.c create mode 100644 sysdeps/ieee754/dbl-64/w_llogb.c rename sysdeps/loongarch/fpu/{e_ilogb.c => w_ilogb-impl.h} (86%) delete mode 100644 sysdeps/m68k/m680x0/fpu/math_err.c create mode 100644 sysdeps/m68k/m680x0/w_ilogb.c create mode 100644 sysdeps/m68k/m680x0/w_llogb.c create mode 100644 sysdeps/powerpc/powerpc64/le/fpu/e_ilogb.c create mode 100644 sysdeps/powerpc/powerpc64/le/fpu/w_ilogb.c create mode 100644 sysdeps/powerpc/powerpc64/le/fpu/w_llogb.c diff --git a/sysdeps/i386/fpu/math_err.c b/sysdeps/i386/fpu/math_err.c deleted file mode 100644 index 1cc8931700..0000000000 --- a/sysdeps/i386/fpu/math_err.c +++ /dev/null @@ -1 +0,0 @@ -/* Not needed. */ diff --git a/sysdeps/i386/fpu/w_ilogb.c b/sysdeps/i386/fpu/w_ilogb.c new file mode 100644 index 0000000000..9c26217021 --- /dev/null +++ b/sysdeps/i386/fpu/w_ilogb.c @@ -0,0 +1,2 @@ +#include +#include diff --git a/sysdeps/i386/fpu/w_llogb.c b/sysdeps/i386/fpu/w_llogb.c new file mode 100644 index 0000000000..5e8891a668 --- /dev/null +++ b/sysdeps/i386/fpu/w_llogb.c @@ -0,0 +1,2 @@ +#include +#include diff --git a/sysdeps/ieee754/dbl-64/e_ilogb.c b/sysdeps/ieee754/dbl-64/e_ilogb.c index 89e7498266..1ea2f23e2f 100644 --- a/sysdeps/ieee754/dbl-64/e_ilogb.c +++ b/sysdeps/ieee754/dbl-64/e_ilogb.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_ilogb (double x) -{ - uint64_t ux = asuint64 (x); - int ex = (ux & ~SIGN_MASK) >> MANTISSA_WIDTH; - if (ex == 0) /* zero or subnormal */ - { - /* Clear sign and exponent */ - ux <<= 12; - if (ux == 0) - return FP_ILOGB0; - /* subnormal */ - return -1023 - stdc_leading_zeros (ux); - } - if (ex == EXPONENT_MASK >> MANTISSA_WIDTH) /* NaN or Inf */ - return ux << 12 ? FP_ILOGBNAN : INT_MAX; - return ex - 1023; -} +/* ilogb is implemented at w_ilogb.c */ diff --git a/sysdeps/ieee754/dbl-64/math_config.h b/sysdeps/ieee754/dbl-64/math_config.h index 3382e385f9..5766f6a1db 100644 --- a/sysdeps/ieee754/dbl-64/math_config.h +++ b/sysdeps/ieee754/dbl-64/math_config.h @@ -164,6 +164,8 @@ attribute_hidden double __math_divzero (uint32_t); /* Invalid input unless it is a quiet NaN. */ attribute_hidden double __math_invalid (double); +attribute_hidden int __math_invalid_i (int); +attribute_hidden long int __math_invalid_li (long int); /* Error handling using output checking, only for errno setting. */ diff --git a/sysdeps/ieee754/dbl-64/math_err.c b/sysdeps/ieee754/dbl-64/math_err.c index 4a07fd5714..b8c645a3df 100644 --- a/sysdeps/ieee754/dbl-64/math_err.c +++ b/sysdeps/ieee754/dbl-64/math_err.c @@ -29,8 +29,24 @@ with_errno (double y, int e) errno = e; return y; } + +NOINLINE static int +with_errno_i (int y, int e) +{ + errno = e; + return y; +} + +NOINLINE static long int +with_errno_li (long int y, int e) +{ + errno = e; + return y; +} #else #define with_errno(x, e) (x) +#define with_errno_i(x, e) (x) +#define with_errno_li(x, e) (x) #endif attribute_hidden double @@ -83,6 +99,22 @@ __math_invalid (double x) return isnan (x) ? y : with_errno (y, EDOM); } +attribute_hidden int +__math_invalid_i (int r) +{ + double y = 0.0 / 0.0; + math_force_eval (y); + return with_errno_i (r, EDOM); +} + +attribute_hidden long int +__math_invalid_li (long int r) +{ + double y = 0.0 / 0.0; + math_force_eval (y); + return with_errno_li (r, EDOM); +} + /* Check result and set errno if necessary. */ attribute_hidden double diff --git a/sysdeps/ieee754/dbl-64/w_ilogb-impl.h b/sysdeps/ieee754/dbl-64/w_ilogb-impl.h new file mode 100644 index 0000000000..c91973507f --- /dev/null +++ b/sysdeps/ieee754/dbl-64/w_ilogb-impl.h @@ -0,0 +1,37 @@ +/* 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 + . */ + +static inline RET_TYPE +IMPL_NAME (double x) +{ + uint64_t ux = asuint64 (x); + int ex = (ux & ~SIGN_MASK) >> MANTISSA_WIDTH; + if (__glibc_unlikely (ex == 0)) /* zero or subnormal */ + { + /* Clear sign and exponent */ + ux <<= 12; + if (ux == 0) + return RET_INVALID (RET_LOGB0); + /* subnormal */ + return (RET_TYPE)-1023 - stdc_leading_zeros (ux); + } + if (__glibc_unlikely (ex == EXPONENT_MASK >> MANTISSA_WIDTH)) + /* NaN or Inf */ + return RET_INVALID (ux << 12 ? RET_LOGBNAN : RET_LOGMAX); + return ex - 1023; +} diff --git a/sysdeps/ieee754/dbl-64/w_ilogb.c b/sysdeps/ieee754/dbl-64/w_ilogb.c new file mode 100644 index 0000000000..e460f14dc9 --- /dev/null +++ b/sysdeps/ieee754/dbl-64/w_ilogb.c @@ -0,0 +1,52 @@ +/* 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 "math_config.h" + +#ifdef DEF_AS_LLOGB +# define DECL_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_invalid_li +#else +# define DECL_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_invalid_i +#endif +#define __IMPL_NAME(x,y) x ## _ ## y +#define _IMPL_NAME(x,y) __IMPL_NAME(x,y) +#define IMPL_NAME _IMPL_NAME(FUNC_NAME, impl) +#include + +RET_TYPE +DECL_NAME (double x) +{ + return IMPL_NAME (x); +} +libm_alias_double (DECL_NAME, FUNC_NAME) diff --git a/sysdeps/ieee754/dbl-64/w_llogb.c b/sysdeps/ieee754/dbl-64/w_llogb.c new file mode 100644 index 0000000000..c984cd151a --- /dev/null +++ b/sysdeps/ieee754/dbl-64/w_llogb.c @@ -0,0 +1,2 @@ +#define DEF_AS_LLOGB +#include "w_ilogb.c" diff --git a/sysdeps/loongarch/fpu/e_ilogb.c b/sysdeps/loongarch/fpu/w_ilogb-impl.h similarity index 86% rename from sysdeps/loongarch/fpu/e_ilogb.c rename to sysdeps/loongarch/fpu/w_ilogb-impl.h index f21fa5c019..1905373189 100644 --- a/sysdeps/loongarch/fpu/e_ilogb.c +++ b/sysdeps/loongarch/fpu/w_ilogb-impl.h @@ -1,4 +1,4 @@ -/* __ieee754_ilogb(). LoongArch version. +/* Get integer exponent of a floating-point value. LoongArch version. Copyright (C) 2022-2025 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,20 +16,18 @@ License along with the GNU C Library; if not, see . */ -#define NO_MATH_REDIRECT -#include #include -int -__ieee754_ilogb (double x) +static inline RET_TYPE +IMPL_NAME (double x) { int x_cond; asm volatile ("fclass.d \t%0, %1" : "=f" (x_cond) : "f" (x)); if (__glibc_unlikely (x_cond & _FCLASS_ZERO)) - return FP_ILOGB0; + return RET_INVALID (RET_LOGB0); else if (__glibc_unlikely (x_cond & ( _FCLASS_NAN | _FCLASS_INF))) - return FP_ILOGBNAN; + return RET_INVALID (RET_LOGBNAN); else { asm volatile ("fabs.d \t%0, %1" : "=f" (x) : "f" (x)); diff --git a/sysdeps/m68k/m680x0/fpu/math_err.c b/sysdeps/m68k/m680x0/fpu/math_err.c deleted file mode 100644 index 1cc8931700..0000000000 --- a/sysdeps/m68k/m680x0/fpu/math_err.c +++ /dev/null @@ -1 +0,0 @@ -/* Not needed. */ diff --git a/sysdeps/m68k/m680x0/w_ilogb.c b/sysdeps/m68k/m680x0/w_ilogb.c new file mode 100644 index 0000000000..9c26217021 --- /dev/null +++ b/sysdeps/m68k/m680x0/w_ilogb.c @@ -0,0 +1,2 @@ +#include +#include diff --git a/sysdeps/m68k/m680x0/w_llogb.c b/sysdeps/m68k/m680x0/w_llogb.c new file mode 100644 index 0000000000..5e8891a668 --- /dev/null +++ b/sysdeps/m68k/m680x0/w_llogb.c @@ -0,0 +1,2 @@ +#include +#include diff --git a/sysdeps/powerpc/powerpc64/le/fpu/e_ilogb.c b/sysdeps/powerpc/powerpc64/le/fpu/e_ilogb.c new file mode 100644 index 0000000000..89e7498266 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/le/fpu/e_ilogb.c @@ -0,0 +1,41 @@ +/* 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_ilogb (double x) +{ + uint64_t ux = asuint64 (x); + int ex = (ux & ~SIGN_MASK) >> MANTISSA_WIDTH; + if (ex == 0) /* zero or subnormal */ + { + /* Clear sign and exponent */ + ux <<= 12; + if (ux == 0) + return FP_ILOGB0; + /* subnormal */ + return -1023 - stdc_leading_zeros (ux); + } + if (ex == EXPONENT_MASK >> MANTISSA_WIDTH) /* NaN or Inf */ + return ux << 12 ? FP_ILOGBNAN : INT_MAX; + return ex - 1023; +} diff --git a/sysdeps/powerpc/powerpc64/le/fpu/w_ilogb.c b/sysdeps/powerpc/powerpc64/le/fpu/w_ilogb.c new file mode 100644 index 0000000000..9c26217021 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/le/fpu/w_ilogb.c @@ -0,0 +1,2 @@ +#include +#include diff --git a/sysdeps/powerpc/powerpc64/le/fpu/w_llogb.c b/sysdeps/powerpc/powerpc64/le/fpu/w_llogb.c new file mode 100644 index 0000000000..5e8891a668 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/le/fpu/w_llogb.c @@ -0,0 +1,2 @@ +#include +#include