From patchwork Thu Mar 21 16:43:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 781588 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp928655wrj; Thu, 21 Mar 2024 09:45:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVr1DtTAfFoTzN682X2lrnhO+czcamjwwaYZe5zs71mmKKu9KSZhU6xoM1z717CdoaQAEj1jp+9yoKg6QSUkJS0 X-Google-Smtp-Source: AGHT+IH7An3lnMO0gzhy02LrLAul5T4QpObjDG917I6DqnfTybLkX/0Z4vnfrh37LYY3lH3AqIAc X-Received: by 2002:a05:620a:21cb:b0:789:f613:2d5d with SMTP id h11-20020a05620a21cb00b00789f6132d5dmr9837179qka.10.1711039548939; Thu, 21 Mar 2024 09:45:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711039548; cv=pass; d=google.com; s=arc-20160816; b=EC9AgjnCoJVgbBoe9S5qFESVDUad+4d6yt2JGzB2OFpMkS9SMI1UyF0WbZ2D2gmi6X uojYXvLitDTBy5Zu4EPPAtIi3dhM5ZjxpxMhlyEFvghw7TwBciQWN/kOfeWwOUts7W/F Hf2NcowJLHmR2pe3nwH3PtFsHbwsfG9zKN1Sw5ztiRqvxaFmedyQYHS+fD7ycnE7rNIl iT8VUL/lg0j3RGPwdvy7pyZiugMNfKHWaHNaQNPhV1toqI1gWUymTqLJLoCI1ka9ZAHo Yf0nwFdewdckdeGV2v5d1MuXHxv+KJziWSaKu/VWGpygYzbLpY4f91XflyZ9gOXO5LKO Ntiw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:arc-filter:dmarc-filter:delivered-to; bh=3gTSKqePJhhgVkKF2Oni/s3e8N6TubY4O/UTslyMKiM=; fh=+6orIzRLXQY2FWXAtGF+abYflc8V+YPKzsYFuX0DJM4=; b=srdpGAuYxLwtTWg0cVJxu7ZKmUit9bZ/JLdadUrZbG1eUsdluOpE5D9SuVy9y4eC4/ mNAhvTGXVE6t57VyOXGRHkvwVBWE919taNd0DjAnKHp+bWYaSvHzWzR91KUFXuvibwpk 3GB36//zlpDx5DhXu4ZwAxUtr0jmJJo1+dtkSvKC4DPtSQxLDxwQM23dX4CO0lhZnDJ7 gxNypHiKusLQ/JK4XIx3S+B70jCX2EypKZM6ywammi4kP9nUYBf2oxPG/zv0zgQxWVcf KBkTBosUJk1F3xI/5wkHj3mzuTjuEOl/uuYafM3QKmSFe9xomXOQFmtuQ1vnOo/YcT2R KhQQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R48UEGDl; 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 s22-20020ae9f716000000b00789e98dc91fsi96851qkg.187.2024.03.21.09.45.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 09:45:48 -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=R48UEGDl; 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 91229385841A for ; Thu, 21 Mar 2024 16:45:48 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 05BD63858430 for ; Thu, 21 Mar 2024 16:43:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 05BD63858430 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 05BD63858430 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::632 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711039425; cv=none; b=hGLhDTZi2+JPBPgf+GRE815DaB/uJ5+HELvfFTNLWsUOigFP47rS4/866U55R6AC/DAFx/vObM0Pl4Ou2qD20QVU2K1HUJC+Z/4W/XGx48SKoiNuiINEm8FqrEvMPnzYvWF7/v0zERwF3CgbmxdeMgig8EXtxl9oK8bBsTkzuwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711039425; c=relaxed/simple; bh=7lsd+JEB6OXhLwzIRmgXKA+7kg76cGxq/9jNxZ2FcCw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=Yo9kWde3+Xcg6Dwqp+PsXopgmcIyTdujgOd/Gyuq/Ro+hhMkYVduYuv+uNqIHblYFd2kWOkj40QT26LyNBSy8d4kz/Hy1V2UwLxm0H9JJqmJ0XCfT9fDzDw7c7wbgm2rgmtSDFq1vym+IuhiN5+1utcTrdytqLur0THE8SH1rBU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1e034607879so8996125ad.0 for ; Thu, 21 Mar 2024 09:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711039420; x=1711644220; 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=3gTSKqePJhhgVkKF2Oni/s3e8N6TubY4O/UTslyMKiM=; b=R48UEGDlIuS64ZoilywrJbjD4Yp6I2/pAJylOfcGtIBgjFjBXF3zED5OH51vgcuxvV e04tX8SIioOQYgZc6Et72kusRcONHbf2e9lpu+qu/l8X90Jn/l3ONJbNkAJZ1WT7d0wD gR6nBUy3RYn7NVHDbu0CSgAbsE/l2cxaas7YZ5+qtkBWf8hOP7h7GC5EOkiVfW2EWxP+ Br1TuInZj2wRXVLDbzzevkDjRNBYyPFIJVEqpDhXJtdDalIp1SJXx4cH3ZzI/JsEczO0 gRwf4o/d6ipF7QC3Wt4K3hnkOLtInGQWn4tTLI3TgIQb4dsvZsvpMsaeOtZ55fiDundJ /6Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039420; x=1711644220; 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=3gTSKqePJhhgVkKF2Oni/s3e8N6TubY4O/UTslyMKiM=; b=xK7HKApUYKhCAMpuXvzDII6BanG8840MNsW9Nzxn2h9aUjAHEHL/ayXnmgCOSilTHN d+dN4nAxaqRcTSfKYkkD1BK5buco5jciFjT169ZWzyIMgJWgQh9vKcXogC8V2jzw7shj qbY0M1WNzeDrRL0jolAM0R/jMdGgtzJyujHwrvBxLPqHdiriqwHUG6PHBMJsLZZLvAOa oYin55y4dSPeOOktyKrNBInw+HbgeQARKskot3izkE6uFJkM0A53t6jNviuq0RfpcCVy tHqCHioteK2BOhHro9QnNrAfd1fobqajAPy6kdp0xh2XK7HEYRk+D4kAouuuGJzvdSAU wKhQ== X-Gm-Message-State: AOJu0YxE+J3L3ALZBXmWG1at6Dx32XM55NFxJ6GamUkXb0RrCFwo2Igm PVOBLn1euepGfuuXm3Or0hdGO+QyoS0+fCBqXFBU/Gxuw5vDs107a7kPJDq/6Fjtp1BMu1uG4uh H X-Received: by 2002:a17:903:447:b0:1e0:1a69:b000 with SMTP id iw7-20020a170903044700b001e01a69b000mr7727177plb.46.1711039420260; Thu, 21 Mar 2024 09:43:40 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:1d04:42cc:aea4:27d6:375f]) by smtp.gmail.com with ESMTPSA id q1-20020a170902bd8100b001dd75d4b408sm18074pls.302.2024.03.21.09.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 09:43:39 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: "H . J . Lu" Subject: [PATCH v2 6/6] i386: Use generic exp10 Date: Thu, 21 Mar 2024 13:43:25 -0300 Message-Id: <20240321164325.539976-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240321164325.539976-1-adhemerval.zanella@linaro.org> References: <20240321164325.539976-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 The resulting performance is slight better (Ryzen 5900, gcc 13.2.1): * master "exp10": { "": { "duration": 3.70091e+09, "iterations": 5.8534e+07, "max": 91.279, "min": 62.6225, "mean": 63.2267 } } * patch "exp10": { "": { "duration": 3.70793e+09, "iterations": 6.328e+07, "max": 259.592, "min": 52.1145, "mean": 58.5957 } } Checked on i686-linux-gnu. --- sysdeps/i386/fpu/Versions | 1 + sysdeps/i386/fpu/e_exp10.S | 51 ----------------------- sysdeps/i386/fpu/e_exp10.c | 2 + sysdeps/i386/fpu/e_exp_data.c | 1 - sysdeps/i386/fpu/w_exp10_compat.c | 8 ---- sysdeps/ieee754/dbl-64/e_exp10.c | 7 +++- sysdeps/mach/hurd/i386/libm.abilist | 1 + sysdeps/unix/sysv/linux/i386/libm.abilist | 1 + 8 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 sysdeps/i386/fpu/e_exp10.S create mode 100644 sysdeps/i386/fpu/e_exp10.c delete mode 100644 sysdeps/i386/fpu/e_exp_data.c delete mode 100644 sysdeps/i386/fpu/w_exp10_compat.c diff --git a/sysdeps/i386/fpu/Versions b/sysdeps/i386/fpu/Versions index 9509f9b7c7..7326f25583 100644 --- a/sysdeps/i386/fpu/Versions +++ b/sysdeps/i386/fpu/Versions @@ -5,6 +5,7 @@ libm { } GLIBC_2.40 { # No SVID compatible error handling. + exp10; fmod; fmodf; } } diff --git a/sysdeps/i386/fpu/e_exp10.S b/sysdeps/i386/fpu/e_exp10.S deleted file mode 100644 index 902f70b77f..0000000000 --- a/sysdeps/i386/fpu/e_exp10.S +++ /dev/null @@ -1,51 +0,0 @@ - -#include -#include -#include - -DEFINE_DBL_MIN - -#ifdef PIC -# define MO(op) op##@GOTOFF(%ecx) -#else -# define MO(op) op -#endif - - .text -/* 10^x = 2^(x * log2(10)) */ -ENTRY(__ieee754_exp10) -#ifdef PIC - LOAD_PIC_REG (cx) -#endif - fldl 4(%esp) -/* I added the following ugly construct because exp(+-Inf) resulted - in NaN. The ugliness results from the bright minds at Intel. - For the i686 the code can be written better. - -- drepper@cygnus.com. */ - fxam /* Is NaN or +-Inf? */ - fstsw %ax - movb $0x45, %dh - andb %ah, %dh - cmpb $0x05, %dh - je 1f /* Is +-Inf, jump. */ - fldl2t - fmulp /* x * log2(10) */ - fld %st - frndint /* int(x * log2(10)) */ - fsubr %st,%st(1) /* fract(x * log2(10)) */ - fxch - f2xm1 /* 2^(fract(x * log2(10))) - 1 */ - fld1 - faddp /* 2^(fract(x * log2(10))) */ - fscale /* e^x */ - fstp %st(1) - DBL_NARROW_EVAL_UFLOW_NONNEG_NAN - ret - -1: testl $0x200, %eax /* Test sign. */ - jz 2f /* If positive, jump. */ - fstp %st - fldz /* Set result to 0. */ -2: ret -END (__ieee754_exp10) -libm_alias_finite (__ieee754_exp10, __exp10) diff --git a/sysdeps/i386/fpu/e_exp10.c b/sysdeps/i386/fpu/e_exp10.c new file mode 100644 index 0000000000..340254fc6e --- /dev/null +++ b/sysdeps/i386/fpu/e_exp10.c @@ -0,0 +1,2 @@ +#define EXP10_VERSION GLIBC_2_40 +#include diff --git a/sysdeps/i386/fpu/e_exp_data.c b/sysdeps/i386/fpu/e_exp_data.c deleted file mode 100644 index 1cc8931700..0000000000 --- a/sysdeps/i386/fpu/e_exp_data.c +++ /dev/null @@ -1 +0,0 @@ -/* Not needed. */ diff --git a/sysdeps/i386/fpu/w_exp10_compat.c b/sysdeps/i386/fpu/w_exp10_compat.c deleted file mode 100644 index 49a0e03385..0000000000 --- a/sysdeps/i386/fpu/w_exp10_compat.c +++ /dev/null @@ -1,8 +0,0 @@ -/* i386 provides an optimized __ieee754_exp10. */ -#ifdef SHARED -# define NO_COMPAT_NEEDED 1 -# include -#else -# include -# include -#endif diff --git a/sysdeps/ieee754/dbl-64/e_exp10.c b/sysdeps/ieee754/dbl-64/e_exp10.c index 225fc74c4c..c63b852f72 100644 --- a/sysdeps/ieee754/dbl-64/e_exp10.c +++ b/sysdeps/ieee754/dbl-64/e_exp10.c @@ -99,7 +99,7 @@ __exp10 (double x) /* Reduce x: z = x * N / log10(2), k = round(z). */ double_t z = __exp_data.invlog10_2N * x; - double_t kd; + double kd; int64_t ki; #if TOINT_INTRINSICS kd = roundtoint (z); @@ -147,7 +147,10 @@ __exp10 (double x) strong_alias (__exp10, __ieee754_exp10) libm_alias_finite (__ieee754_exp10, __exp10) #if LIBM_SVID_COMPAT -versioned_symbol (libm, __exp10, exp10, GLIBC_2_39); +# ifndef EXP10_VERSION +# define EXP10_VERSION GLIBC_2_39 +# endif +versioned_symbol (libm, __exp10, exp10, EXP10_VERSION); libm_alias_double_other (__exp10, exp10) #else libm_alias_double (__exp10, exp10) diff --git a/sysdeps/mach/hurd/i386/libm.abilist b/sysdeps/mach/hurd/i386/libm.abilist index 88e7538e51..01c5633663 100644 --- a/sysdeps/mach/hurd/i386/libm.abilist +++ b/sysdeps/mach/hurd/i386/libm.abilist @@ -1181,5 +1181,6 @@ GLIBC_2.35 fsqrt F GLIBC_2.35 fsqrtl F GLIBC_2.35 hypot F GLIBC_2.35 hypotf F +GLIBC_2.40 exp10 F GLIBC_2.40 fmod F GLIBC_2.40 fmodf F diff --git a/sysdeps/unix/sysv/linux/i386/libm.abilist b/sysdeps/unix/sysv/linux/i386/libm.abilist index c99c60161d..3413cfdbe7 100644 --- a/sysdeps/unix/sysv/linux/i386/libm.abilist +++ b/sysdeps/unix/sysv/linux/i386/libm.abilist @@ -1188,5 +1188,6 @@ GLIBC_2.35 fsqrt F GLIBC_2.35 fsqrtl F GLIBC_2.35 hypot F GLIBC_2.35 hypotf F +GLIBC_2.40 exp10 F GLIBC_2.40 fmod F GLIBC_2.40 fmodf F