mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
a5721ebc68
For arguments with X^2 + Y^2 close to 1, clog and clog10 avoid large errors from log(hypot) by computing X^2 + Y^2 - 1 in a way that avoids cancellation error and then using log1p. However, the thresholds for using that approach still result in log being used on argument as large as sqrt(13/16) > 0.9, leading to significant errors, in some cases above the 9ulp maximum allowed in glibc libm. This patch arranges for the approach using log1p to be used in any cases where |X|, |Y| < 1 and X^2 + Y^2 >= 0.5 (with the existing allowance for cases where one of X and Y is very small), adjusting the __x2y2m1 functions to work with the wider range of inputs. This way, log only gets used on arguments below sqrt(1/2) (or substantially above 1), where the error involved is much less. Tested for x86_64, x86, mips64 and powerpc. For the ulps regeneration I removed the existing clog and clog10 ulps before regenerating to allow any reduced ulps to appear. Tests added include those found by random test generation to produce large ulps either before or after the patch, and some found by trying inputs close to the (0.75, 0.5) threshold where the potential errors from using log are largest. [BZ #19016] * sysdeps/generic/math_private.h (__x2y2m1f): Update comment to allow more cases with X^2 + Y^2 >= 0.5. * sysdeps/ieee754/dbl-64/x2y2m1.c (__x2y2m1): Likewise. Add -1 as normal element in sum instead of special-casing based on values of arguments. * sysdeps/ieee754/dbl-64/x2y2m1f.c (__x2y2m1f): Update comment. * sysdeps/ieee754/ldbl-128/x2y2m1l.c (__x2y2m1l): Likewise. Add -1 as normal element in sum instead of special-casing based on values of arguments. * sysdeps/ieee754/ldbl-128ibm/x2y2m1l.c (__x2y2m1l): Likewise. * sysdeps/ieee754/ldbl-96/x2y2m1.c [FLT_EVAL_METHOD != 0] (__x2y2m1): Update comment. * sysdeps/ieee754/ldbl-96/x2y2m1l.c (__x2y2m1l): Likewise. Add -1 as normal element in sum instead of special-casing based on values of arguments. * math/s_clog.c (__clog): Handle more cases using log1p without hypot. * math/s_clog10.c (__clog10): Likewise. * math/s_clog10f.c (__clog10f): Likewise. * math/s_clog10l.c (__clog10l): Likewise. * math/s_clogf.c (__clogf): Likewise. * math/s_clogl.c (__clogl): Likewise. * math/auto-libm-test-in: Add more tests of clog and clog10. * math/auto-libm-test-out: Regenerated. * sysdeps/i386/fpu/libm-test-ulps: Update. * sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
123 lines
3.6 KiB
C
123 lines
3.6 KiB
C
/* Compute complex base 10 logarithm.
|
|
Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <complex.h>
|
|
#include <math.h>
|
|
#include <math_private.h>
|
|
#include <float.h>
|
|
|
|
/* log_10 (2). */
|
|
#define M_LOG10_2f 0.3010299956639811952137388947244930267682f
|
|
|
|
/* pi * log10 (e). */
|
|
#define M_PI_LOG10Ef 1.364376353841841347485783625431355770210f
|
|
|
|
__complex__ float
|
|
__clog10f (__complex__ float x)
|
|
{
|
|
__complex__ float result;
|
|
int rcls = fpclassify (__real__ x);
|
|
int icls = fpclassify (__imag__ x);
|
|
|
|
if (__glibc_unlikely (rcls == FP_ZERO && icls == FP_ZERO))
|
|
{
|
|
/* Real and imaginary part are 0.0. */
|
|
__imag__ result = signbit (__real__ x) ? M_PI_LOG10Ef : 0.0;
|
|
__imag__ result = __copysignf (__imag__ result, __imag__ x);
|
|
/* Yes, the following line raises an exception. */
|
|
__real__ result = -1.0 / fabsf (__real__ x);
|
|
}
|
|
else if (__glibc_likely (rcls != FP_NAN && icls != FP_NAN))
|
|
{
|
|
/* Neither real nor imaginary part is NaN. */
|
|
float absx = fabsf (__real__ x), absy = fabsf (__imag__ x);
|
|
int scale = 0;
|
|
|
|
if (absx < absy)
|
|
{
|
|
float t = absx;
|
|
absx = absy;
|
|
absy = t;
|
|
}
|
|
|
|
if (absx > FLT_MAX / 2.0f)
|
|
{
|
|
scale = -1;
|
|
absx = __scalbnf (absx, scale);
|
|
absy = (absy >= FLT_MIN * 2.0f ? __scalbnf (absy, scale) : 0.0f);
|
|
}
|
|
else if (absx < FLT_MIN && absy < FLT_MIN)
|
|
{
|
|
scale = FLT_MANT_DIG;
|
|
absx = __scalbnf (absx, scale);
|
|
absy = __scalbnf (absy, scale);
|
|
}
|
|
|
|
if (absx == 1.0f && scale == 0)
|
|
{
|
|
__real__ result = __log1pf (absy * absy) * ((float) M_LOG10E / 2.0f);
|
|
math_check_force_underflow_nonneg (__real__ result);
|
|
}
|
|
else if (absx > 1.0f && absx < 2.0f && absy < 1.0f && scale == 0)
|
|
{
|
|
float d2m1 = (absx - 1.0f) * (absx + 1.0f);
|
|
if (absy >= FLT_EPSILON)
|
|
d2m1 += absy * absy;
|
|
__real__ result = __log1pf (d2m1) * ((float) M_LOG10E / 2.0f);
|
|
}
|
|
else if (absx < 1.0f
|
|
&& absx >= 0.5f
|
|
&& absy < FLT_EPSILON / 2.0f
|
|
&& scale == 0)
|
|
{
|
|
float d2m1 = (absx - 1.0f) * (absx + 1.0f);
|
|
__real__ result = __log1pf (d2m1) * ((float) M_LOG10E / 2.0f);
|
|
}
|
|
else if (absx < 1.0f
|
|
&& absx >= 0.5f
|
|
&& scale == 0
|
|
&& absx * absx + absy * absy >= 0.5f)
|
|
{
|
|
float d2m1 = __x2y2m1f (absx, absy);
|
|
__real__ result = __log1pf (d2m1) * ((float) M_LOG10E / 2.0f);
|
|
}
|
|
else
|
|
{
|
|
float d = __ieee754_hypotf (absx, absy);
|
|
__real__ result = __ieee754_log10f (d) - scale * M_LOG10_2f;
|
|
}
|
|
|
|
__imag__ result = M_LOG10E * __ieee754_atan2f (__imag__ x, __real__ x);
|
|
}
|
|
else
|
|
{
|
|
__imag__ result = __nanf ("");
|
|
if (rcls == FP_INFINITE || icls == FP_INFINITE)
|
|
/* Real or imaginary part is infinite. */
|
|
__real__ result = HUGE_VALF;
|
|
else
|
|
__real__ result = __nanf ("");
|
|
}
|
|
|
|
return result;
|
|
}
|
|
#ifndef __clog10f
|
|
weak_alias (__clog10f, clog10f)
|
|
#endif
|