mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-02-27 05:15:28 +08:00
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.
140 lines
4.0 KiB
Bash
Executable File
140 lines
4.0 KiB
Bash
Executable File
#!/bin/sh
|
|
LC_ALL=C
|
|
export LC_ALL
|
|
|
|
if test "$#" -ne 4; then
|
|
echo "Usage $0 int_kinds real_kinds compile use_iec_60559"
|
|
exit 1
|
|
fi
|
|
|
|
# Possible kinds must be listed in ascending order
|
|
possible_integer_kinds="$1"
|
|
possible_real_kinds="$2"
|
|
compile="$3"
|
|
use_iec_60559="$4"
|
|
|
|
largest=""
|
|
smallest=""
|
|
for k in $possible_integer_kinds; do
|
|
echo " integer (kind=$k) :: i" > tmp$$.f90
|
|
echo " i = 1_$k" >> tmp$$.f90
|
|
echo " end" >> tmp$$.f90
|
|
if $compile -S tmp$$.f90 > /dev/null 2>&1; then
|
|
s=`expr 8 \* $k`
|
|
largest="$k"
|
|
|
|
if [ $s -eq 128 ]; then
|
|
prefix="__"
|
|
else
|
|
prefix=""
|
|
fi
|
|
|
|
if [ "$smallest" = "" ]; then
|
|
smallest="$k"
|
|
fi
|
|
|
|
echo "typedef ${prefix}int${s}_t GFC_INTEGER_${k};"
|
|
echo "typedef ${prefix}uint${s}_t GFC_UINTEGER_${k};"
|
|
echo "typedef GFC_INTEGER_${k} GFC_LOGICAL_${k};"
|
|
echo "#define HAVE_GFC_LOGICAL_${k}"
|
|
echo "#define HAVE_GFC_INTEGER_${k}"
|
|
echo ""
|
|
fi
|
|
rm -f tmp$$.*
|
|
done
|
|
|
|
echo "#define GFC_INTEGER_LARGEST GFC_INTEGER_${largest}"
|
|
echo "#define GFC_UINTEGER_LARGEST GFC_UINTEGER_${largest}"
|
|
echo "#define GFC_DEFAULT_CHAR ${smallest}"
|
|
echo ""
|
|
|
|
|
|
# Get the kind value for long double, so we may disambiguate it
|
|
# from _Float128.
|
|
echo "use iso_c_binding; print *, c_long_double ; end" > tmq$$.f90
|
|
long_double_kind=`$compile -S -fdump-parse-tree tmq$$.f90 | grep TRANSFER \
|
|
| sed 's/ *TRANSFER *//'`
|
|
rm -f tmq$$.*
|
|
|
|
|
|
for k in $possible_real_kinds; do
|
|
echo " real (kind=$k) :: x" > tmp$$.f90
|
|
echo " x = 1.0_$k" >> tmp$$.f90
|
|
echo " end" >> tmp$$.f90
|
|
if $compile -S tmp$$.f90 > /dev/null 2>&1; then
|
|
case $k in
|
|
4) ctype="float" ; cplxtype="complex float" ; suffix="f" ;;
|
|
8) ctype="double" ; cplxtype="complex double" ; suffix="" ;;
|
|
# If we have a REAL(KIND=10), it is always long double
|
|
10) ctype="long double" ; cplxtype="complex long double" ; suffix="l" ;;
|
|
# If we have a REAL(KIND=16), it is either long double or __float128
|
|
16) if [ $long_double_kind -ne 16 ]; then
|
|
ctype="_Float128"
|
|
cplxtype="_Complex _Float128"
|
|
echo "#define GFC_REAL_16_IS_FLOAT128"
|
|
if [ x$use_iec_60559 = xyes ]; then
|
|
suffix="f128"
|
|
echo "#define GFC_REAL_16_USE_IEC_60559"
|
|
else
|
|
suffix="q"
|
|
fi
|
|
else
|
|
ctype="long double"
|
|
cplxtype="complex long double"
|
|
suffix="l"
|
|
echo "#define GFC_REAL_16_IS_LONG_DOUBLE"
|
|
fi ;;
|
|
*) echo "$0: Unknown type" >&2 ; exit 1 ;;
|
|
esac
|
|
|
|
# Check for the value of HUGE
|
|
echo "print *, huge(0._$k) ; end" > tmq$$.f90
|
|
huge=`$compile -S -fdump-parse-tree tmq$$.f90 | grep TRANSFER \
|
|
| sed 's/ *TRANSFER *//' | sed 's/_.*//'`
|
|
rm -f tmq$$.*
|
|
|
|
# Check for the value of TINY
|
|
echo "print *, tiny(0._$k) ; end" > tmq$$.f90
|
|
tiny=`$compile -S -fdump-parse-tree tmq$$.f90 | grep TRANSFER \
|
|
| sed 's/ *TRANSFER *//' | sed 's/_.*//'`
|
|
rm -f tmq$$.*
|
|
|
|
# Check for the value of DIGITS
|
|
echo "print *, digits(0._$k) ; end" > tmq$$.f90
|
|
digits=`$compile -S -fdump-parse-tree tmq$$.f90 | grep TRANSFER \
|
|
| sed 's/ *TRANSFER *//'`
|
|
rm -f tmq$$.*
|
|
|
|
# Check for the value of RADIX
|
|
echo "print *, radix(0._$k) ; end" > tmq$$.f90
|
|
radix=`$compile -S -fdump-parse-tree tmq$$.f90 | grep TRANSFER \
|
|
| sed 's/ *TRANSFER *//'`
|
|
rm -f tmq$$.*
|
|
|
|
# Output the information we've gathered
|
|
echo "typedef ${ctype} GFC_REAL_${k};"
|
|
echo "typedef ${cplxtype} GFC_COMPLEX_${k};"
|
|
echo "#define HAVE_GFC_REAL_${k}"
|
|
echo "#define HAVE_GFC_COMPLEX_${k}"
|
|
echo "#define GFC_REAL_${k}_HUGE ${huge}${suffix}"
|
|
echo "#define GFC_REAL_${k}_TINY ${tiny}${suffix}"
|
|
echo "#define GFC_REAL_${k}_LITERAL_SUFFIX ${suffix}"
|
|
if [ "x$suffix" = "x" ]; then
|
|
echo "#define GFC_REAL_${k}_LITERAL(X) (X)"
|
|
else
|
|
echo "#define GFC_REAL_${k}_LITERAL(X) (X ## ${suffix})"
|
|
fi
|
|
echo "#define GFC_REAL_${k}_DIGITS ${digits}"
|
|
echo "#define GFC_REAL_${k}_RADIX ${radix}"
|
|
echo ""
|
|
fi
|
|
rm -f tmp$$.*
|
|
done
|
|
|
|
|
|
# After this, we include a header that can override some of the
|
|
# autodetected settings.
|
|
echo '#include "kinds-override.h"'
|
|
|
|
exit 0
|