public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/meissner/heads/work106)] Revert patches
Date: Wed, 18 Jan 2023 08:10:33 +0000 (GMT) [thread overview]
Message-ID: <20230118081033.F0D4E3858D28@sourceware.org> (raw)
https://gcc.gnu.org/g:8f04200d59a29dd4c49c51c92e3a85bccde0eb70
commit 8f04200d59a29dd4c49c51c92e3a85bccde0eb70
Author: Michael Meissner <meissner@linux.ibm.com>
Date: Wed Jan 18 03:10:29 2023 -0500
Revert patches
Diff:
---
libgcc/config/rs6000/_divkc3.c | 18 +++++++++++-------
libgcc/config/rs6000/_mulkc3.c | 8 ++------
libgcc/config/rs6000/quad-float128.h | 25 ++++++++++++-------------
libgcc/config/rs6000/t-float128 | 15 +--------------
libgcc/config/rs6000/t-float128-hw | 20 ++++++--------------
libgcc/libgcc2.h | 4 ----
libgcc/soft-fp/quad.h | 2 --
7 files changed, 32 insertions(+), 60 deletions(-)
diff --git a/libgcc/config/rs6000/_divkc3.c b/libgcc/config/rs6000/_divkc3.c
index cfbc7b76516..59ab2137d1d 100644
--- a/libgcc/config/rs6000/_divkc3.c
+++ b/libgcc/config/rs6000/_divkc3.c
@@ -26,13 +26,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "soft-fp.h"
#include "quad-float128.h"
-#ifndef __LONG_DOUBLE_IEEE128__
-#error "_divkc3.c needs to be compiled with -mabi=ieeelongdouble."
-#endif
-
-#define COPYSIGN(x,y) __builtin_copysignl (x, y)
-#define INFINITY __builtin_infl ()
-#define FABS __builtin_fabsl
+#define COPYSIGN(x,y) __builtin_copysignf128 (x, y)
+#define INFINITY __builtin_inff128 ()
+#define FABS __builtin_fabsf128
#define isnan __builtin_isnan
#define isinf __builtin_isinf
#define isfinite __builtin_isfinite
@@ -41,11 +37,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define __divkc3 __divkc3_sw
#endif
+#ifndef __LONG_DOUBLE_IEEE128__
+#define RBIG (__LIBGCC_KF_MAX__ / 2)
+#define RMIN (__LIBGCC_KF_MIN__)
+#define RMIN2 (__LIBGCC_KF_EPSILON__)
+#define RMINSCAL (1 / __LIBGCC_KF_EPSILON__)
+#define RMAX2 (RBIG * RMIN2)
+#else
#define RBIG (__LIBGCC_TF_MAX__ / 2)
#define RMIN (__LIBGCC_TF_MIN__)
#define RMIN2 (__LIBGCC_TF_EPSILON__)
#define RMINSCAL (1 / __LIBGCC_TF_EPSILON__)
#define RMAX2 (RBIG * RMIN2)
+#endif
TCtype
__divkc3 (TFtype a, TFtype b, TFtype c, TFtype d)
diff --git a/libgcc/config/rs6000/_mulkc3.c b/libgcc/config/rs6000/_mulkc3.c
index 345d6300b4c..cfae81f8b5f 100644
--- a/libgcc/config/rs6000/_mulkc3.c
+++ b/libgcc/config/rs6000/_mulkc3.c
@@ -26,12 +26,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "soft-fp.h"
#include "quad-float128.h"
-#ifndef __LONG_DOUBLE_IEEE128__
-#error "_mulkc3.c needs to be compiled with -mabi=ieeelongdouble."
-#endif
-
-#define COPYSIGN(x,y) __builtin_copysignl (x, y)
-#define INFINITY __builtin_infl ()
+#define COPYSIGN(x,y) __builtin_copysignf128 (x, y)
+#define INFINITY __builtin_inff128 ()
#define isnan __builtin_isnan
#define isinf __builtin_isinf
diff --git a/libgcc/config/rs6000/quad-float128.h b/libgcc/config/rs6000/quad-float128.h
index 35eeccfa952..ae0622c744c 100644
--- a/libgcc/config/rs6000/quad-float128.h
+++ b/libgcc/config/rs6000/quad-float128.h
@@ -27,14 +27,21 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-/* Override quad.h's definitions for 128-bit floating point type. */
+/* quad.h defines the TFtype type by:
+ typedef float TFtype __attribute__ ((mode (TF)));
+
+ This define forces it to use KFmode (aka, ieee 128-bit floating point).
+ However, when the compiler's default is changed so that long double is IEEE
+ 128-bit floating point, we need to go back to using TFmode and TCmode. */
#ifndef __LONG_DOUBLE_IEEE128__
-#define TFtype _Float128 /* long double is IBM. */
-#define TCtype _Complex _Float128
+#define TF KF
+
+/* We also need TCtype to represent complex ieee 128-bit float for
+ __mulkc3 and __divkc3. */
+typedef __complex float TCtype __attribute__ ((mode (KC)));
#else
-#define TFtype long double /* long double is IEEE. */
-#define TCtype _Complex long double
+typedef __complex float TCtype __attribute__ ((mode (TC)));
#endif
/* Force the use of the VSX instruction set. */
@@ -93,11 +100,8 @@ extern UTItype_ppc __fixunskfti_sw (TFtype);
#endif
extern IBM128_TYPE __extendkftf2_sw (TFtype);
extern TFtype __trunctfkf2_sw (IBM128_TYPE);
-
-#ifdef __LONG_DOUBLE_IEEE128__
extern TCtype __mulkc3_sw (TFtype, TFtype, TFtype, TFtype);
extern TCtype __divkc3_sw (TFtype, TFtype, TFtype, TFtype);
-#endif
#ifdef _ARCH_PPC64
extern TItype_ppc __fixkfti (TFtype);
@@ -142,11 +146,8 @@ extern UTItype_ppc __fixunskfti_hw (TFtype);
#endif
extern IBM128_TYPE __extendkftf2_hw (TFtype);
extern TFtype __trunctfkf2_hw (IBM128_TYPE);
-
-#ifdef __LONG_DOUBLE_IEEE128__
extern TCtype __mulkc3_hw (TFtype, TFtype, TFtype, TFtype);
extern TCtype __divkc3_hw (TFtype, TFtype, TFtype, TFtype);
-#endif
/* Ifunc function declarations, to automatically switch between software
emulation and hardware support. */
@@ -187,10 +188,8 @@ extern IBM128_TYPE __extendkftf2 (TFtype);
extern TFtype __trunctfkf2 (IBM128_TYPE);
/* Complex __float128 built on __float128 interfaces. */
-#ifdef __LONG_DOUBLE_IEEE128__
extern TCtype __mulkc3 (TFtype, TFtype, TFtype, TFtype);
extern TCtype __divkc3 (TFtype, TFtype, TFtype, TFtype);
-#endif
/* Convert IEEE 128-bit floating point to/from string. We explicitly use
_Float128 instead of TFmode because _strtokf and _strfromkf must be compiled
diff --git a/libgcc/config/rs6000/t-float128 b/libgcc/config/rs6000/t-float128
index 07f8c441890..b09b5664af0 100644
--- a/libgcc/config/rs6000/t-float128
+++ b/libgcc/config/rs6000/t-float128
@@ -30,18 +30,11 @@ fp128_dec_funcs = _kf_to_sd _kf_to_dd _kf_to_td \
ibm128_dec_funcs = _tf_to_sd _tf_to_dd _tf_to_td \
_sd_to_tf _dd_to_tf _td_to_tf
-# Complex IEEE 128-bit multiply/divide support.
-fp128_cmuldiv = _mulkc3 _divkc3
-fp128_cmuldiv_static_obj = $(addsuffix $(objext),$(fp128_cmuldiv))
-fp128_cmuldiv_shared_obj = $(addsuffix _s$(objext),$(fp128_cmuldiv))
-fp128_cmuldiv_obj = $(fp128_cmuldiv_shared_obj) \
- $(fp128_cmuldiv_static_obj)
-
# New functions for software emulation
fp128_ppc_funcs = floattikf-sw floatuntikf-sw \
fixkfti-sw fixunskfti-sw \
extendkftf2-sw trunctfkf2-sw \
- sfp-exceptions $(fp128_cmuldiv) _powikf2
+ sfp-exceptions _mulkc3 _divkc3 _powikf2
ifeq ($(decimal_float),yes)
fp128_ppc_funcs += $(fp128_dec_funcs)
@@ -107,12 +100,6 @@ IBM128_CFLAGS_DECIMAL = -mno-gnu-attribute -Wno-psabi -mabi=ibmlongdouble
$(fp128_dec_objs) : INTERNAL_CFLAGS += $(FP128_CFLAGS_DECIMAL)
$(ibm128_dec_objs) : INTERNAL_CFLAGS += $(IBM128_CFLAGS_DECIMAL)
-# Force IEEE 128-bit complex multiply/divide support to be built with IEEE
-# 128-bit long double.
-FP128_CFLAGS_CMULDIV = -Wno-psabi -mabi=ieeelongdouble
-
-$(fp128_cmuldiv_obj) : INTERNAL_CFLAGS += $(FP128_CFLAGS_CMULDIV)
-
$(fp128_softfp_src) : $(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@)) $(fp128_dep)
@src="$(srcdir)/soft-fp/$(subst -sw,,$(subst kf,tf,$@))"; \
echo "Create $@"; \
diff --git a/libgcc/config/rs6000/t-float128-hw b/libgcc/config/rs6000/t-float128-hw
index d1eeb6cd3f2..d64ca4dd694 100644
--- a/libgcc/config/rs6000/t-float128-hw
+++ b/libgcc/config/rs6000/t-float128-hw
@@ -5,17 +5,16 @@
FLOAT128_HW_INSNS = -DFLOAT128_HW_INSNS
# New functions for hardware support
-fp128_cmuldiv_funcs = _mulkc3-hw _divkc3-hw
-fp128_cmuldiv_static_obj = $(addsuffix $(objext),$(fp128_cmuldiv_funcs))
-fp128_cmuldiv_shared_obj = $(addsuffix _s$(objext),$(fp128_cmuldiv_funcs))
-fp128_cmuldiv_obj = $(fp128_cmuldiv_static_obj) \
- $(fp128_cmuldiv_shared_obj)
-
-fp128_hw_funcs = float128-hw $(fp128_cmuldiv_funcs) _powikf2-hw
+fp128_hardfp_src = _mulkc3-hw.c _divkc3-hw.c
+fp128_hw_funcs = float128-hw _mulkc3-hw _divkc3-hw _powikf2-hw
+fp128_hw_src = $(srcdir)/config/rs6000/float128-hw.c _mulkc3-hw.c \
+ _divkc3-hw.c _powikf2-hw.c
fp128_hw_static_obj = $(addsuffix $(objext),$(fp128_hw_funcs))
fp128_hw_shared_obj = $(addsuffix _s$(objext),$(fp128_hw_funcs))
fp128_hw_obj = $(fp128_hw_static_obj) $(fp128_hw_shared_obj)
+fp128_ifunc_funcs = float128-ifunc
+fp128_ifunc_src = $(srcdir)/config/rs6000/float128-ifunc.c
fp128_ifunc_static_obj = float128-ifunc$(objext)
fp128_ifunc_shared_obj = float128-ifunc_s$(objext)
fp128_ifunc_obj = $(fp128_ifunc_static_obj) $(fp128_ifunc_shared_obj)
@@ -37,13 +36,6 @@ $(fp128_hw_obj) : $(srcdir)/config/rs6000/t-float128-hw
$(fp128_ifunc_obj) : INTERNAL_CFLAGS += $(FP128_CFLAGS_SW)
$(fp128_ifunc_obj) : $(srcdir)/config/rs6000/t-float128-hw
-# Build IEEE 128-bit complex multiply/divide support with explicit IEEE 128-bit
-# long double. Also build the float128-ifunc module with explicit IEEE 128-bit
-# support, because it has to support software/hardware variants of complex
-# mulitply/divide.
-$(fp128_cmuldiv_obj) : INTERNAL_CFLAGS += $(FP128_CFLAGS_CMULDIV)
-$(fp128_ifunc_obj) : INTERNAL_CFLAGS += $(FP128_CFLAGS_CMULDIV)
-
_mulkc3-hw.c: $(srcdir)/config/rs6000/_mulkc3.c
(echo "#define __mulkc3 __mulkc3_hw"; \
cat $(srcdir)/config/rs6000/_mulkc3.c) > _mulkc3-hw.c
diff --git a/libgcc/libgcc2.h b/libgcc/libgcc2.h
index 6a249877c7a..fc24ac34502 100644
--- a/libgcc/libgcc2.h
+++ b/libgcc/libgcc2.h
@@ -156,13 +156,9 @@ typedef float XFtype __attribute__ ((mode (XF)));
typedef _Complex float XCtype __attribute__ ((mode (XC)));
#endif
#if LIBGCC2_HAS_TF_MODE
-#ifndef TFtype
typedef float TFtype __attribute__ ((mode (TF)));
-#endif
-#ifndef TCtype
typedef _Complex float TCtype __attribute__ ((mode (TC)));
#endif
-#endif
typedef int cmp_return_type __attribute__((mode (__libgcc_cmp_return__)));
typedef int shift_count_type __attribute__((mode (__libgcc_shift_count__)));
diff --git a/libgcc/soft-fp/quad.h b/libgcc/soft-fp/quad.h
index 71f87d36ba9..3889bb44f1f 100644
--- a/libgcc/soft-fp/quad.h
+++ b/libgcc/soft-fp/quad.h
@@ -65,9 +65,7 @@
#define _FP_HIGHBIT_DW_Q \
((_FP_W_TYPE) 1 << (_FP_WFRACBITS_DW_Q - 1) % _FP_W_TYPE_SIZE)
-#ifndef TFtype
typedef float TFtype __attribute__ ((mode (TF)));
-#endif
#if _FP_W_TYPE_SIZE < 64
next reply other threads:[~2023-01-18 8:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 8:10 Michael Meissner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-18 15:57 Michael Meissner
2023-01-18 5:27 Michael Meissner
2023-01-18 1:57 Michael Meissner
2023-01-17 23:53 Michael Meissner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230118081033.F0D4E3858D28@sourceware.org \
--to=meissner@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).