133d0d422e
As mentioned by Joseph in PR105101, glibc 2.26 or later has on x86
(both -m32/-m64), powerpc64le, ia64 and mips support for
*f128 math/complex APIs plus strtof128 and strfromf128, and these APIs allow
us to avoid libquadmath for Fortran purposes on these architectures,
replace *q math/complex APIs, strtof128 instead of strtoflt128 and,
while strfromf128 unfortunately isn't a perfect replacement to
quadmath_snprintf, it can be made to work.
The advantage of this is that when configured against such glibcs
(2.26 is now almost 5 years old), we can avoid linking against an extra shared
library and the math support in glibc is maintained better than libquadmath.
We need both a compiler change (so that for glibc 2.26+ it uses *f128 APIs
instead of *q) and library change.
The above mentioned problem with strfromf128 is that the strfrom* functions
are severely restricted versions of snprintf. In libgfortran, we handle
!isfinite differently and just use snprintf/quadmath_snprintf for
%+-#.*{L,Q}{f,e} printing.
strfrom* doesn't allow +, -, # modifiers and it only supports .34 or
similar precision, not .* . The L/Q etc. letters are omitted.
The + is there to force + sign at the start if it is positive.
Workaround in the patch is to add the + at the start manually for
!signbit (val).
The - (left alignment instead of right) I don't understand why we need it,
when minimum field width isn't specified (for strfrom* can't be specified),
no padding is ever added anywhere I believe.
The # is to force adding . - workaround is to search for first . or e or '\0'
character, if it is '\0', just append ., if it is e, insert . before e and
memmove the rest (which is just a few bytes, e, +/- and at most a few digits)
one byte later.
The .* case is handled by creating the format string for strfrom* by
snprintf into a temporary buffer.
As requested, this patch also switches from using __float128 type in
libgfortran to _Float128 which is equivalent on all arches that support
__float128.
The change is done in a backwards compatible change, when GCC is configured
against glibc 2.26 or newer, libgfortran.so.5 itself doesn't link against
-lquadmath nor uses any libquadmath APIs, libgfortran.a doesn't use any
libquadmath APIs either. User programs and libraries when being linked
by gfortran driver are linked against -lgfortran and -lquadmath, but
the latter only in the --as-needed linker mode, which means it needs
to be around during linking and will be linked in if there are any
calls to math/complex functions with real(kind=16) or complex(kind=16)
in compilation units compiled by older versions of gcc, but if either
user code doesn't call those math/complex functions for the largest
supported kind, or the code is recompiled by gcc with this change in,
libquadmath won't be linked in.
2022-06-28 Jakub Jelinek <jakub@redhat.com>
gcc/fortran/
* gfortran.h (gfc_real_info): Add use_iec_60559 bitfield.
* trans-types.h (gfc_real16_use_iec_60559): Declare.
* trans-types.cc (gfc_real16_use_iec_60559): Define.
(gfc_init_kinds): When building powerpc64le-linux libgfortran
on glibc 2.26 to 2.31, set gfc_real16_use_iec_60559 and
use_iec_60559.
(gfc_build_real_type): Set gfc_real16_use_iec_60559 and use_iec_60559
on glibc 2.26 or later.
* trans-intrinsic.cc (gfc_build_intrinsic_lib_fndecls): Adjust
comment. Handle gfc_real16_use_iec_60559.
(gfc_get_intrinsic_lib_fndecl): Handle use_iec_60559.
libgfortran/
* configure.ac: Check for strtof128 and strfromf128.
Check for math and complex *f128 functions. Set
have_iec_60559_libc_support to yes if *f128 support is around, for
--enable-libquadmath-support default to "default" rather than yes if
have_iec_60559_libc_support is yes.
* acinclude.m4 (LIBGFOR_CHECK_FLOAT128): Test
_Float128/_Complex _Float128 rather than __float128 and
_Complex float __attribute__((mode(TC))). If libquadmath support
is defaulted and have_iec_60559_libc_support is yes, define and subst
USE_IEC_60559. Remove unused LIBGFOR_BUILD_QUAD conditional.
* Makefile.am (kinds.h): Pass @USE_IEC_60559@ as an extra
mk-kinds-h.sh argument.
* mk-kinds-h.sh: Accept 4th use_iec_60559 argument. Use
_Float128/_Complex _Float128 types instead of __float128 and
_Complex float __attribute__((mode(TC))), and if use_iec_60559 is yes,
use f128 suffix instead of q and define GFC_REAL_16_USE_IEC_60559.
* kinds-override.h: Use _Float128/_Complex _Float128 types instead of
__float128 and _Complex float __attribute__((mode(TC))), if
USE_IEC_60559 is defined, use f128 suffixes instead of q and
define GFC_REAL_17_USE_IEC_60559.
* libgfortran.h: Don't include quadmath_weak.h if USE_IEC_60559 is
defined.
(GFC_REAL_16_INFINITY, GFC_REAL_16_QUIET_NAN): Define
for GFC_REAL_16_USE_IEC_60559 differently.
* caf/single.c (convert_type): Use _Float128/_Complex _Float128
instead of __float128 and _Complex float __attribute__((mode(TC))).
For HAVE_GFC_REAL_10 when HAVE_GFC_REAL_16 isn't defined use
_Complex long double instead of long double.
* ieee/issignaling_fallback.h (ieee854_float128_shape_type): Use
_Float128 instead of __float128.
(__issignalingf128): Change argument type to _Float128.
(issignaling): Use _Float128 instead of __float128 in _Generic.
* intrinsics/cshift0.c (cshift0): Use _Float128 instead of __float128
in a comment. Fix a comment typo, logn double -> long double.
* intrinsics/erfc_scaled.c (_THRESH, _M_2_SQRTPI, _INF, _ERFC, _EXP):
Use different definitions if GFC_REAL_16_USE_IEC_60559.
(_THRESH, _M_2_SQRTPI): Use GFC_REAL_17_LITERAL macro.
(_ERFC, _EXP): Use different definitions if GFC_REAL_17_USE_IEC_60559.
* intrinsics/spread_generic.c (spread, spread_scalar): Use _Float128
instead of __float128 in a comment. Fix a comment typo,
logn double -> long double.
* intrinsics/trigd.c (ENABLE_SIND, ENABLE_COSD, ENABLE_TAND): Handle
GFC_REAL_16_USE_IEC_60559.
* intrinsics/pack_generic.c (pack): Use _Float128 instead of
__float128 in a comment. Fix a comment typo, logn double ->
long double.
* intrinsics/unpack_generic.c (unpack1, unpack0): Likewise.
* runtime/in_pack_generic.c (internal_pack): Likewise.
* runtime/in_unpack_generic.c (internal_unpack): Likewise.
* io/read.c (convert_real, convert_infnan): Handle
GFC_REAL_16_USE_IEC_60559 and GFC_REAL_17_USE_IEC_60559.
* io/transfer128.c (tmp1, tmp2): Don't define if libquadmath
isn't needed.
* io/write_float.def (gfor_strfromf128): New function.
(DTOA2Q, FDTOA2Q): Define differently if
GFC_REAL_16_USE_IEC_60559 or GFC_REAL_17_USE_IEC_60559.
* m4/mtype.m4: Use different suffix if GFC_REAL_16_USE_IEC_60559
or GFC_REAL_17_USE_IEC_60559.
* config.h.in: Regenerated.
* configure: Regenerated.
* Makefile.in: Regenerated.
* generated/bessel_r16.c: Regenerated.
* generated/bessel_r17.c: Regenerated.
* generated/norm2_r16.c: Regenerated.
* generated/norm2_r17.c: Regenerated.
225 lines
6.2 KiB
C
225 lines
6.2 KiB
C
/* Generic helper function for repacking arrays.
|
|
Copyright (C) 2003-2022 Free Software Foundation, Inc.
|
|
Contributed by Paul Brook <paul@nowt.org>
|
|
|
|
This file is part of the GNU Fortran runtime library (libgfortran).
|
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 3 of the License, or (at your option) any later version.
|
|
|
|
Libgfortran 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 General Public License for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "libgfortran.h"
|
|
#include <string.h>
|
|
|
|
extern void *internal_pack (gfc_array_char *);
|
|
export_proto(internal_pack);
|
|
|
|
void *
|
|
internal_pack (gfc_array_char * source)
|
|
{
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type stride[GFC_MAX_DIMENSIONS];
|
|
index_type stride0;
|
|
index_type dim;
|
|
index_type ssize;
|
|
const char *src;
|
|
char *dest;
|
|
void *destptr;
|
|
int packed;
|
|
index_type size;
|
|
index_type type_size;
|
|
|
|
if (source->base_addr == NULL)
|
|
return NULL;
|
|
|
|
type_size = GFC_DTYPE_TYPE_SIZE(source);
|
|
size = GFC_DESCRIPTOR_SIZE (source);
|
|
switch (type_size)
|
|
{
|
|
case GFC_DTYPE_INTEGER_1:
|
|
case GFC_DTYPE_LOGICAL_1:
|
|
return internal_pack_1 ((gfc_array_i1 *) source);
|
|
|
|
case GFC_DTYPE_INTEGER_2:
|
|
case GFC_DTYPE_LOGICAL_2:
|
|
return internal_pack_2 ((gfc_array_i2 *) source);
|
|
|
|
case GFC_DTYPE_INTEGER_4:
|
|
case GFC_DTYPE_LOGICAL_4:
|
|
return internal_pack_4 ((gfc_array_i4 *) source);
|
|
|
|
case GFC_DTYPE_INTEGER_8:
|
|
case GFC_DTYPE_LOGICAL_8:
|
|
return internal_pack_8 ((gfc_array_i8 *) source);
|
|
|
|
#if defined(HAVE_GFC_INTEGER_16)
|
|
case GFC_DTYPE_INTEGER_16:
|
|
case GFC_DTYPE_LOGICAL_16:
|
|
return internal_pack_16 ((gfc_array_i16 *) source);
|
|
#endif
|
|
case GFC_DTYPE_REAL_4:
|
|
return internal_pack_r4 ((gfc_array_r4 *) source);
|
|
|
|
case GFC_DTYPE_REAL_8:
|
|
return internal_pack_r8 ((gfc_array_r8 *) source);
|
|
|
|
/* FIXME: This here is a hack, which will have to be removed when
|
|
the array descriptor is reworked. Currently, we don't store the
|
|
kind value for the type, but only the size. Because on targets with
|
|
_Float128, we have sizeof(long double) == sizeof(_Float128),
|
|
we cannot discriminate here and have to fall back to the generic
|
|
handling (which is suboptimal). */
|
|
#if !defined(GFC_REAL_16_IS_FLOAT128)
|
|
# if defined (HAVE_GFC_REAL_10)
|
|
case GFC_DTYPE_REAL_10:
|
|
return internal_pack_r10 ((gfc_array_r10 *) source);
|
|
# endif
|
|
|
|
# if defined (HAVE_GFC_REAL_16)
|
|
case GFC_DTYPE_REAL_16:
|
|
return internal_pack_r16 ((gfc_array_r16 *) source);
|
|
# endif
|
|
#endif
|
|
|
|
case GFC_DTYPE_COMPLEX_4:
|
|
return internal_pack_c4 ((gfc_array_c4 *) source);
|
|
|
|
case GFC_DTYPE_COMPLEX_8:
|
|
return internal_pack_c8 ((gfc_array_c8 *) source);
|
|
|
|
/* FIXME: This here is a hack, which will have to be removed when
|
|
the array descriptor is reworked. Currently, we don't store the
|
|
kind value for the type, but only the size. Because on targets with
|
|
_Float128, we have sizeof(long double) == sizeof(_Float128),
|
|
we cannot discriminate here and have to fall back to the generic
|
|
handling (which is suboptimal). */
|
|
#if !defined(GFC_REAL_16_IS_FLOAT128)
|
|
# if defined (HAVE_GFC_COMPLEX_10)
|
|
case GFC_DTYPE_COMPLEX_10:
|
|
return internal_pack_c10 ((gfc_array_c10 *) source);
|
|
# endif
|
|
|
|
# if defined (HAVE_GFC_COMPLEX_16)
|
|
case GFC_DTYPE_COMPLEX_16:
|
|
return internal_pack_c16 ((gfc_array_c16 *) source);
|
|
# endif
|
|
#endif
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
switch(GFC_DESCRIPTOR_SIZE (source))
|
|
{
|
|
case 1:
|
|
return internal_pack_1 ((gfc_array_i1 *) source);
|
|
|
|
case 2:
|
|
if (GFC_UNALIGNED_2(source->base_addr))
|
|
break;
|
|
else
|
|
return internal_pack_2 ((gfc_array_i2 *) source);
|
|
|
|
case 4:
|
|
if (GFC_UNALIGNED_4(source->base_addr))
|
|
break;
|
|
else
|
|
return internal_pack_4 ((gfc_array_i4 *) source);
|
|
|
|
case 8:
|
|
if (GFC_UNALIGNED_8(source->base_addr))
|
|
break;
|
|
else
|
|
return internal_pack_8 ((gfc_array_i8 *) source);
|
|
|
|
#ifdef HAVE_GFC_INTEGER_16
|
|
case 16:
|
|
if (GFC_UNALIGNED_16(source->base_addr))
|
|
break;
|
|
else
|
|
return internal_pack_16 ((gfc_array_i16 *) source);
|
|
#endif
|
|
default:
|
|
break;
|
|
}
|
|
|
|
dim = GFC_DESCRIPTOR_RANK (source);
|
|
ssize = 1;
|
|
packed = 1;
|
|
for (index_type n = 0; n < dim; n++)
|
|
{
|
|
count[n] = 0;
|
|
stride[n] = GFC_DESCRIPTOR_STRIDE(source,n);
|
|
extent[n] = GFC_DESCRIPTOR_EXTENT(source,n);
|
|
if (extent[n] <= 0)
|
|
{
|
|
/* Do nothing. */
|
|
packed = 1;
|
|
break;
|
|
}
|
|
|
|
if (ssize != stride[n])
|
|
packed = 0;
|
|
|
|
ssize *= extent[n];
|
|
}
|
|
|
|
if (packed)
|
|
return source->base_addr;
|
|
|
|
/* Allocate storage for the destination. */
|
|
destptr = xmallocarray (ssize, size);
|
|
dest = (char *)destptr;
|
|
src = source->base_addr;
|
|
stride0 = stride[0] * size;
|
|
|
|
while (src)
|
|
{
|
|
/* Copy the data. */
|
|
memcpy(dest, src, size);
|
|
/* Advance to the next element. */
|
|
dest += size;
|
|
src += stride0;
|
|
count[0]++;
|
|
/* Advance to the next source element. */
|
|
index_type n = 0;
|
|
while (count[n] == extent[n])
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
src -= stride[n] * extent[n] * size;
|
|
n++;
|
|
if (n == dim)
|
|
{
|
|
src = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
src += stride[n] * size;
|
|
}
|
|
}
|
|
}
|
|
return destptr;
|
|
}
|