public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-8095] rs6000: Handle pcrel sibcalls to longcall functions [PR104894]
@ 2022-04-11 22:02 Peter Bergner
  0 siblings, 0 replies; only message in thread
From: Peter Bergner @ 2022-04-11 22:02 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:d74c4c6a1b4956b5cd9b2a770bb7261836fa1289

commit r12-8095-gd74c4c6a1b4956b5cd9b2a770bb7261836fa1289
Author: Peter Bergner <bergner@linux.ibm.com>
Date:   Mon Apr 11 17:00:44 2022 -0500

    rs6000: Handle pcrel sibcalls to longcall functions [PR104894]
    
    Before PCREL in POWER10, we were not allowed to perform sibcalls to longcall
    functions since callee's return would skip the TOC restore in the caller.
    However, with PCREL we can now safely perform a sibling call to longcall
    functions.  The problem with the current code is that pcrel sibcall
    branches to a PLT stub label even though -fno-plt was used.  The solution
    here is to check for a pcrel longcall and emit an inline plt stub in
    that case.
    
    2022-04-11  Peter Bergner  <bergner@linux.ibm.com>
    
    gcc/
            PR target/104894
            * config/rs6000/rs6000.cc (rs6000_sibcall_aix): Handle pcrel sibcalls
            to longcall functions.
    
    gcc/testsuite/
            PR target/104894
            * gcc.target/powerpc/pr104894.c: New test.
            * gcc.target/powerpc/pr104894-2.c: New test.

Diff:
---
 gcc/config/rs6000/rs6000.cc                   | 13 +++++++++++--
 gcc/testsuite/gcc.target/powerpc/pr104894-2.c | 22 ++++++++++++++++++++++
 gcc/testsuite/gcc.target/powerpc/pr104894.c   | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index ceaddafd33b..bc619592b9e 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -25678,11 +25678,20 @@ rs6000_sibcall_aix (rtx value, rtx func_desc, rtx tlsarg, rtx cookie)
   rtx r12 = NULL_RTX;
   rtx func_addr = func_desc;
 
-  gcc_assert (INTVAL (cookie) == 0);
-
   if (global_tlsarg)
     tlsarg = global_tlsarg;
 
+  /* Handle longcall attributes.  */
+  if (INTVAL (cookie) & CALL_LONG && SYMBOL_REF_P (func_desc))
+    {
+      /* PCREL can do a sibling call to a longcall function
+	 because we don't need to restore the TOC register.  */
+      gcc_assert (rs6000_pcrel_p ());
+      func_desc = rs6000_longcall_ref (func_desc, tlsarg);
+    }
+  else
+    gcc_assert (INTVAL (cookie) == 0);
+
   /* For ELFv2, r12 and CTR need to hold the function address
      for an indirect call.  */
   if (GET_CODE (func_desc) != SYMBOL_REF && DEFAULT_ABI == ABI_ELFv2)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104894-2.c b/gcc/testsuite/gcc.target/powerpc/pr104894-2.c
new file mode 100644
index 00000000000..d1a011ef4d9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr104894-2.c
@@ -0,0 +1,22 @@
+/* PR target/104894 */
+/* { dg-require-effective-target powerpc_elfv2 } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10 -fno-plt" } */
+
+/* Verify we do not ICE on the following test case and that we emit one
+   indirect call and one indirect sibcall, with r12 and CTR containing
+   the function addresses.  */
+
+void foo (void);
+
+void
+bar (void)
+{
+  foo ();
+  foo ();
+}
+
+/* { dg-final { scan-assembler-times {\mmtctr 12\M} 2 } } */
+/* { dg-final { scan-assembler-times {\mbctrl\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mbctr\M} 1 } } */
+/* { dg-final { scan-assembler-not {\mbl\M} } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr104894.c b/gcc/testsuite/gcc.target/powerpc/pr104894.c
new file mode 100644
index 00000000000..f46fe88168f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr104894.c
@@ -0,0 +1,20 @@
+/* PR target/104894 */
+/* { dg-require-effective-target powerpc_elfv2 } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10 -fno-plt" } */
+
+/* Verify we do not ICE on the following test case and that we emit an
+   indirect sibcall, with r12 and CTR containing the function address.  */
+
+void foo (void);
+
+void
+bar (void)
+{
+  foo ();
+}
+
+/* { dg-final { scan-assembler-times {\mmtctr 12\M} 1 } } */
+/* { dg-final { scan-assembler-times {\mbctr\M} 1 } } */
+/* { dg-final { scan-assembler-not {\mbl\M} } } */
+/* { dg-final { scan-assembler-not {\mbctrl\M} } } */


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-04-11 22:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 22:02 [gcc r12-8095] rs6000: Handle pcrel sibcalls to longcall functions [PR104894] Peter Bergner

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).