From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id B5B723857C73; Thu, 27 Oct 2022 22:07:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5B723857C73 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666908470; bh=GLX4ruWg36sI3YHaXE1eP4YEjBtTCcrw3RT+p6DEZ2M=; h=From:To:Subject:Date:From; b=aaP52rcGmwBogwqXskhPFhx24BuHdbbY1F/kr0DwSgSo5Km0PhRBhH2pvh6PKFZAM cSPKU1wTn5dNxt0QEYKoSbCAKQR0ZMMfPlkEIBUk9Z9S+j4rrqwxZahJrkivGGDMUT /fcpv4S/ZxesWhb2XT646gyDiuky/6IaVRJUe/Fg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work101)] Revert patch. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work101 X-Git-Oldrev: 42fa8cfd2a4dc0baece2540909cd4cde15a7ea4e X-Git-Newrev: 907eb4c13a36ae9a2adcd7f515d1de2dab8d2524 Message-Id: <20221027220750.B5B723857C73@sourceware.org> Date: Thu, 27 Oct 2022 22:07:50 +0000 (GMT) List-Id: https://gcc.gnu.org/g:907eb4c13a36ae9a2adcd7f515d1de2dab8d2524 commit 907eb4c13a36ae9a2adcd7f515d1de2dab8d2524 Author: Michael Meissner Date: Thu Oct 27 18:07:10 2022 -0400 Revert patch. 2022-10-27 Michael Meissner 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_builtin_code): New helper function. (complex_divide_builtin_code): 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. gcc/testsuite/ Revert patch. * gcc.target/powerpc/divic3-1.c: New test. * gcc.target/powerpc/divic3-2.c: Likewise. * gcc.target/powerpc/mulic3-1.c: Likewise. * gcc.target/powerpc/mulic3-2.c: Likewise. Diff: --- gcc/config/rs6000/rs6000-c.cc | 8 -- gcc/config/rs6000/rs6000.cc | 110 ++++++++++++---------------- gcc/config/rs6000/rs6000.opt | 4 - gcc/testsuite/gcc.target/powerpc/divic3-1.c | 18 ----- gcc/testsuite/gcc.target/powerpc/divic3-2.c | 17 ----- gcc/testsuite/gcc.target/powerpc/mulic3-1.c | 18 ----- gcc/testsuite/gcc.target/powerpc/mulic3-2.c | 17 ----- 7 files changed, 47 insertions(+), 145 deletions(-) diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc index 5c2f3bcee9f..56609462629 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; } diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 699cd599fd2..a85d7630b41 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -11123,6 +11123,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_ for the names, so @@ -11134,6 +11154,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"); @@ -28096,25 +28142,6 @@ rs6000_starting_frame_offset (void) return RS6000_STARTING_FRAME_OFFSET; } -/* 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_builtin_code (machine_mode mode) -{ - return (built_in_function) (BUILT_IN_COMPLEX_MUL_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_builtin_code (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 l to f128 if the default long double type is @@ -28133,54 +28160,11 @@ complex_divide_builtin_code (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_builtin_code (KCmode)) - newname = "__mulkc3"; - - else if (id == complex_multiply_builtin_code (ICmode)) - newname = "__multc3"; - - else if (id == complex_multiply_builtin_code (TCmode)) - newname = (TARGET_IEEEQUAD) ? "__mulkc3" : "__multc3"; - - else if (id == complex_divide_builtin_code (KCmode)) - newname = "__divkc3"; - - else if (id == complex_divide_builtin_code (ICmode)) - newname = "__divtc3"; - - else if (id == complex_divide_builtin_code (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 e2de03dda92..b63a5d443af 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 diff --git a/gcc/testsuite/gcc.target/powerpc/divic3-1.c b/gcc/testsuite/gcc.target/powerpc/divic3-1.c deleted file mode 100644 index 1cc6b1be904..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/divic3-1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* { dg-do compile { target { powerpc*-*-* } } } */ -/* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-require-effective-target longdouble128 } */ -/* { dg-require-effective-target ppc_float128_sw } */ -/* { dg-options "-O2 -mpower8-vector -mabi=ieeelongdouble -Wno-psabi" } */ - -/* Check that complex divide generates the right call for __ibm128 when long - double is IEEE 128-bit floating point. */ - -typedef _Complex long double c_ibm128_t __attribute__((mode(__IC__))); - -void -divide (c_ibm128_t *p, c_ibm128_t *q, c_ibm128_t *r) -{ - *p = *q / *r; -} - -/* { dg-final { scan-assembler "bl __divtc3" } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/divic3-2.c b/gcc/testsuite/gcc.target/powerpc/divic3-2.c deleted file mode 100644 index 8ff342e0116..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/divic3-2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* { dg-do compile { target { powerpc*-*-* } } } */ -/* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-require-effective-target longdouble128 } */ -/* { dg-options "-O2 -mpower8-vector -mabi=ibmlongdouble -Wno-psabi" } */ - -/* Check that complex divide generates the right call for __ibm128 when long - double is IBM 128-bit floating point. */ - -typedef _Complex long double c_ibm128_t __attribute__((mode(__TC__))); - -void -divide (c_ibm128_t *p, c_ibm128_t *q, c_ibm128_t *r) -{ - *p = *q / *r; -} - -/* { dg-final { scan-assembler "bl __divtc3" } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/mulic3-1.c b/gcc/testsuite/gcc.target/powerpc/mulic3-1.c deleted file mode 100644 index 4cd773c4b06..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/mulic3-1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* { dg-do compile { target { powerpc*-*-* } } } */ -/* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-require-effective-target longdouble128 } */ -/* { dg-require-effective-target ppc_float128_sw } */ -/* { dg-options "-O2 -mpower8-vector -mabi=ieeelongdouble -Wno-psabi" } */ - -/* Check that complex multiply generates the right call for __ibm128 when long - double is IEEE 128-bit floating point. */ - -typedef _Complex long double c_ibm128_t __attribute__((mode(__IC__))); - -void -multiply (c_ibm128_t *p, c_ibm128_t *q, c_ibm128_t *r) -{ - *p = *q * *r; -} - -/* { dg-final { scan-assembler "bl __multc3" } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/mulic3-2.c b/gcc/testsuite/gcc.target/powerpc/mulic3-2.c deleted file mode 100644 index 36fe8bc3061..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/mulic3-2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* { dg-do compile { target { powerpc*-*-* } } } */ -/* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-require-effective-target longdouble128 } */ -/* { dg-options "-O2 -mpower8-vector -mabi=ibmlongdouble -Wno-psabi" } */ - -/* Check that complex multiply generates the right call for __ibm128 when long - double is IBM 128-bit floating point. */ - -typedef _Complex long double c_ibm128_t __attribute__((mode(__TC__))); - -void -multiply (c_ibm128_t *p, c_ibm128_t *q, c_ibm128_t *r) -{ - *p = *q * *r; -} - -/* { dg-final { scan-assembler "bl __multc3" } } */