public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/meissner/heads/work096)] Revert patch.
@ 2022-08-02 19:13 Michael Meissner
0 siblings, 0 replies; 2+ messages in thread
From: Michael Meissner @ 2022-08-02 19:13 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:551a50cb6de28a92bb867dda119f07c64bc37ba4
commit 551a50cb6de28a92bb867dda119f07c64bc37ba4
Author: Michael Meissner <meissner@linux.ibm.com>
Date: Tue Aug 2 15:13:05 2022 -0400
Revert patch.
2022-08-02 Michael Meissner <meissner@linux.ibm.com>
gcc/
Revert patch.
* config/rs6000/rs6000-c.cc (rs6000_cpu_cpp_builtins): Set
building_libgcc.
* config/rs6000/rs6000.cc (create_complex_muldiv): Delete.
(init_float128_ieee): Delete code to switch complex multiply and divide
for long double.
(complex_multiply_name): New helper function.
(complex_divide_name): Likewise.
(rs6000_mangle_decl_assembler_name): Add support for mangling the name
of complex 128-bit multiply and divide built-in functions.
* config/rs6000/rs6000.opt (building_libgcc): New target variable.
Diff:
---
gcc/config/rs6000/rs6000-c.cc | 8 ---
gcc/config/rs6000/rs6000.cc | 110 ++++++++++++++++++------------------------
gcc/config/rs6000/rs6000.opt | 4 --
3 files changed, 47 insertions(+), 75 deletions(-)
diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index c128845506c..a3787318fa0 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -780,14 +780,6 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
|| DEFAULT_ABI == ABI_ELFv2
|| (DEFAULT_ABI == ABI_AIX && !rs6000_compat_align_parm))
builtin_define ("__STRUCT_PARM_ALIGN__=16");
-
- /* Store whether or not we are building libgcc. This is needed to disable
- generating the alternate names for 128-bit complex multiply and divide.
- We need to disable generating __multc3, __divtc3, __mulkc3, and __divkc3
- when we are building those functions in libgcc. The variable
- flag_building_libgcc is only available for the C family of front-ends.
- We set this variable here to disable generating the alternate names. */
- building_libgcc = flag_building_libgcc;
}
\f
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 734b46958f3..a6ec4c71ac0 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -10966,6 +10966,26 @@ init_float128_ibm (machine_mode mode)
}
}
+/* Create a decl for either complex long double multiply or complex long double
+ divide when long double is IEEE 128-bit floating point. We can't use
+ __multc3 and __divtc3 because the original long double using IBM extended
+ double used those names. The complex multiply/divide functions are encoded
+ as builtin functions with a complex result and 4 scalar inputs. */
+
+static void
+create_complex_muldiv (const char *name, built_in_function fncode, tree fntype)
+{
+ tree fndecl = add_builtin_function (name, fntype, fncode, BUILT_IN_NORMAL,
+ name, NULL_TREE);
+
+ set_builtin_decl (fncode, fndecl, true);
+
+ if (TARGET_DEBUG_BUILTIN)
+ fprintf (stderr, "create complex %s, fncode: %d\n", name, (int) fncode);
+
+ return;
+}
+
/* Set up IEEE 128-bit floating point routines. Use different names if the
arguments can be passed in a vector register. The historical PowerPC
implementation of IEEE 128-bit floating point used _q_<op> for the names, so
@@ -10977,6 +10997,32 @@ init_float128_ieee (machine_mode mode)
{
if (FLOAT128_VECTOR_P (mode))
{
+ static bool complex_muldiv_init_p = false;
+
+ /* Set up to call __mulkc3 and __divkc3 under -mabi=ieeelongdouble. If
+ we have clone or target attributes, this will be called a second
+ time. We want to create the built-in function only once. */
+ if (mode == TFmode && TARGET_IEEEQUAD && !complex_muldiv_init_p)
+ {
+ complex_muldiv_init_p = true;
+ built_in_function fncode_mul =
+ (built_in_function) (BUILT_IN_COMPLEX_MUL_MIN + TCmode
+ - MIN_MODE_COMPLEX_FLOAT);
+ built_in_function fncode_div =
+ (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + TCmode
+ - MIN_MODE_COMPLEX_FLOAT);
+
+ tree fntype = build_function_type_list (complex_long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ NULL_TREE);
+
+ create_complex_muldiv ("__mulkc3", fncode_mul, fntype);
+ create_complex_muldiv ("__divkc3", fncode_div, fntype);
+ }
+
set_optab_libfunc (add_optab, mode, "__addkf3");
set_optab_libfunc (sub_optab, mode, "__subkf3");
set_optab_libfunc (neg_optab, mode, "__negkf2");
@@ -27924,25 +27970,6 @@ rs6000_starting_frame_offset (void)
return RS6000_STARTING_FRAME_OFFSET;
}
\f
-/* Internal function to return the built-in function id for the complex
- multiply operation for a given mode. */
-
-static inline built_in_function
-complex_multiply_name (machine_mode mode)
-{
- return (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + mode
- - MIN_MODE_COMPLEX_FLOAT);
-}
-
-/* Internal function to return the built-in function id for the complex divide
- operation for a given mode. */
-
-static inline built_in_function
-complex_divide_name (machine_mode mode)
-{
- return (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + mode
- - MIN_MODE_COMPLEX_FLOAT);
-}
/* On 64-bit Linux and Freebsd systems, possibly switch the long double library
function names from <foo>l to <foo>f128 if the default long double type is
@@ -27961,54 +27988,11 @@ complex_divide_name (machine_mode mode)
only do this transformation if the __float128 type is enabled. This
prevents us from doing the transformation on older 32-bit ports that might
have enabled using IEEE 128-bit floating point as the default long double
- type.
-
- We also use the TARGET_MANGLE_DECL_ASSEMBLER_NAME hook to change the
- function names used for complex multiply and divide to the appropriate
- names. */
+ type. */
static tree
rs6000_mangle_decl_assembler_name (tree decl, tree id)
{
- /* Handle complex multiply/divide. For IEEE 128-bit, use __mulkc3 or
- __divkc3 and for IBM 128-bit use __multc3 and __divtc3. */
- if ((TARGET_FLOAT128_TYPE || TARGET_IBM128)
- && !building_libgcc
- && TREE_CODE (decl) == FUNCTION_DECL
- && DECL_IS_UNDECLARED_BUILTIN (decl)
- && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL)
- {
- built_in_function id = DECL_FUNCTION_CODE (decl);
- const char *newname = NULL;
-
- if (id == complex_multiply_name (KCmode))
- newname = "__mulkc3";
-
- else if (id == complex_multiply_name (ICmode))
- newname = "__multc3";
-
- else if (id == complex_multiply_name (TCmode))
- newname = (TARGET_IEEEQUAD) ? "__mulkc3" : "__multc3";
-
- else if (id == complex_divide_name (KCmode))
- newname = "__divkc3";
-
- else if (id == complex_divide_name (ICmode))
- newname = "__divtc3";
-
- else if (id == complex_divide_name (TCmode))
- newname = (TARGET_IEEEQUAD) ? "__divkc3" : "__divtc3";
-
- if (newname)
- {
- if (TARGET_DEBUG_BUILTIN)
- fprintf (stderr, "Map complex mul/div => %s\n", newname);
-
- return get_identifier (newname);
- }
- }
-
- /* Map long double built-in functions if long double is IEEE 128-bit. */
if (TARGET_FLOAT128_TYPE && TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128
&& TREE_CODE (decl) == FUNCTION_DECL
&& DECL_IS_UNDECLARED_BUILTIN (decl)
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 1299d47e5b2..b227bf96888 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -100,10 +100,6 @@ unsigned int rs6000_recip_control
TargetVariable
unsigned int rs6000_debug
-;; Whether we are building libgcc or not.
-TargetVariable
-bool building_libgcc = false
-
;; Whether to enable the -mfloat128 stuff without necessarily enabling the
;; __float128 keyword.
TargetSave
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gcc(refs/users/meissner/heads/work096)] Revert patch.
@ 2022-08-02 18:08 Michael Meissner
0 siblings, 0 replies; 2+ messages in thread
From: Michael Meissner @ 2022-08-02 18:08 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:3c09dc57a78a25094b9caa51a2f4d24ea7d29d3e
commit 3c09dc57a78a25094b9caa51a2f4d24ea7d29d3e
Author: Michael Meissner <meissner@linux.ibm.com>
Date: Tue Aug 2 14:08:09 2022 -0400
Revert patch.
2022-08-02 Michael Meissner <meissner@linux.ibm.com>
gcc/
Revert patch.
* config/rs6000/rs6000.cc (create_complex_muldiv): Delete.
(init_float128_ieee): Delete code to switch complex multiply and divide
for long double.
(complex_multiply_name): New helper function.
(complex_divide_name): Likewise.
(rs6000_mangle_decl_assembler_name): Add support for mangling the name
of complex 128-bit multiply and divide built-in functions.
Diff:
---
gcc/config/rs6000/rs6000.cc | 109 +++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 62 deletions(-)
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index fe70da93be6..a6ec4c71ac0 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -10966,6 +10966,26 @@ init_float128_ibm (machine_mode mode)
}
}
+/* Create a decl for either complex long double multiply or complex long double
+ divide when long double is IEEE 128-bit floating point. We can't use
+ __multc3 and __divtc3 because the original long double using IBM extended
+ double used those names. The complex multiply/divide functions are encoded
+ as builtin functions with a complex result and 4 scalar inputs. */
+
+static void
+create_complex_muldiv (const char *name, built_in_function fncode, tree fntype)
+{
+ tree fndecl = add_builtin_function (name, fntype, fncode, BUILT_IN_NORMAL,
+ name, NULL_TREE);
+
+ set_builtin_decl (fncode, fndecl, true);
+
+ if (TARGET_DEBUG_BUILTIN)
+ fprintf (stderr, "create complex %s, fncode: %d\n", name, (int) fncode);
+
+ return;
+}
+
/* Set up IEEE 128-bit floating point routines. Use different names if the
arguments can be passed in a vector register. The historical PowerPC
implementation of IEEE 128-bit floating point used _q_<op> for the names, so
@@ -10977,6 +10997,32 @@ init_float128_ieee (machine_mode mode)
{
if (FLOAT128_VECTOR_P (mode))
{
+ static bool complex_muldiv_init_p = false;
+
+ /* Set up to call __mulkc3 and __divkc3 under -mabi=ieeelongdouble. If
+ we have clone or target attributes, this will be called a second
+ time. We want to create the built-in function only once. */
+ if (mode == TFmode && TARGET_IEEEQUAD && !complex_muldiv_init_p)
+ {
+ complex_muldiv_init_p = true;
+ built_in_function fncode_mul =
+ (built_in_function) (BUILT_IN_COMPLEX_MUL_MIN + TCmode
+ - MIN_MODE_COMPLEX_FLOAT);
+ built_in_function fncode_div =
+ (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + TCmode
+ - MIN_MODE_COMPLEX_FLOAT);
+
+ tree fntype = build_function_type_list (complex_long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ long_double_type_node,
+ NULL_TREE);
+
+ create_complex_muldiv ("__mulkc3", fncode_mul, fntype);
+ create_complex_muldiv ("__divkc3", fncode_div, fntype);
+ }
+
set_optab_libfunc (add_optab, mode, "__addkf3");
set_optab_libfunc (sub_optab, mode, "__subkf3");
set_optab_libfunc (neg_optab, mode, "__negkf2");
@@ -27924,25 +27970,6 @@ rs6000_starting_frame_offset (void)
return RS6000_STARTING_FRAME_OFFSET;
}
\f
-/* Internal function to return the built-in function id for the complex
- multiply operation for a given mode. */
-
-static inline built_in_function
-complex_multiply_name (machine_mode mode)
-{
- return (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + mode
- - MIN_MODE_COMPLEX_FLOAT);
-}
-
-/* Internal function to return the built-in function id for the complex divide
- operation for a given mode. */
-
-static inline built_in_function
-complex_divide_name (machine_mode mode)
-{
- return (built_in_function) (BUILT_IN_COMPLEX_DIV_MIN + mode
- - MIN_MODE_COMPLEX_FLOAT);
-}
/* On 64-bit Linux and Freebsd systems, possibly switch the long double library
function names from <foo>l to <foo>f128 if the default long double type is
@@ -27961,53 +27988,11 @@ complex_divide_name (machine_mode mode)
only do this transformation if the __float128 type is enabled. This
prevents us from doing the transformation on older 32-bit ports that might
have enabled using IEEE 128-bit floating point as the default long double
- type.
-
- We also use the TARGET_MANGLE_DECL_ASSEMBLER_NAME hook to change the
- function names used for complex multiply and divide to the appropriate
- names. */
+ type. */
static tree
rs6000_mangle_decl_assembler_name (tree decl, tree id)
{
- /* Handle complex multiply/divide. For IEEE 128-bit, use __mulkc3 or
- __divkc3 and for IBM 128-bit use __multc3 and __divtc3. */
- if ((TARGET_FLOAT128_TYPE || TARGET_IBM128)
- && TREE_CODE (decl) == FUNCTION_DECL
- && DECL_IS_UNDECLARED_BUILTIN (decl)
- && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL)
- {
- built_in_function id = DECL_FUNCTION_CODE (decl);
- const char *newname = NULL;
-
- if (id == complex_multiply_name (KCmode))
- newname = "__mulkc3";
-
- else if (id == complex_multiply_name (ICmode))
- newname = "__multc3";
-
- else if (id == complex_multiply_name (TCmode))
- newname = (TARGET_IEEEQUAD) ? "__mulkc3" : "__multc3";
-
- else if (id == complex_divide_name (KCmode))
- newname = "__divkc3";
-
- else if (id == complex_divide_name (ICmode))
- newname = "__divtc3";
-
- else if (id == complex_divide_name (TCmode))
- newname = (TARGET_IEEEQUAD) ? "__divkc3" : "__divtc3";
-
- if (newname)
- {
- if (TARGET_DEBUG_BUILTIN)
- fprintf (stderr, "Map complex mul/div => %s\n", newname);
-
- return get_identifier (newname);
- }
- }
-
- /* Map long double built-in functions if long double is IEEE 128-bit. */
if (TARGET_FLOAT128_TYPE && TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128
&& TREE_CODE (decl) == FUNCTION_DECL
&& DECL_IS_UNDECLARED_BUILTIN (decl)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-02 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-02 19:13 [gcc(refs/users/meissner/heads/work096)] Revert patch Michael Meissner
-- strict thread matches above, loose matches on Subject: below --
2022-08-02 18:08 Michael Meissner
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).