diff mbox series

[pushed] aarch64: Fix sibcalls involving shared-ZT0 functions

Message ID mptzfvujcfq.fsf@arm.com
State Committed
Commit 6d56f590483b17c538e332097807a6c5a9225ea3
Headers
Series [pushed] aarch64: Fix sibcalls involving shared-ZT0 functions |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged

Commit Message

Richard Sandiford Feb. 21, 2024, 11:15 a.m. UTC 
  In:

  void bar() __arm_inout("za");
  void foo() __arm_inout("za", "zt0") { bar(); }

foo cannot tail-call bar because foo needs to restore ZT0 after
the call.  I'd forgotten to update the ok_for_sibcall rules
to handle this when adding SME2.

Thanks to Sander de Smalen for the spot.

Tested on aarch64-linux-gnu & pushed.

Richard


gcc/
	* config/aarch64/aarch64.cc (aarch64_function_ok_for_sibcall):
	Check that each individual piece of state is shared in the same
	way, rather than using an aggregate check for PSTATE.ZA.

gcc/testsuite/
	* gcc.target/aarch64/sme/sibcall_9.c: New test.
---
 gcc/config/aarch64/aarch64.cc                 |  6 ++-
 .../gcc.target/aarch64/sme/sibcall_9.c        | 51 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/sme/sibcall_9.c
diff mbox series

Patch

diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index de746e28ca5..f9cedd31bc1 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -6334,8 +6334,10 @@  aarch64_function_ok_for_sibcall (tree, tree exp)
   tree fntype = TREE_TYPE (TREE_TYPE (CALL_EXPR_FN (exp)));
   if (aarch64_fntype_pstate_sm (fntype) & ~aarch64_cfun_incoming_pstate_sm ())
     return false;
-  if (aarch64_fntype_pstate_za (fntype) != aarch64_cfun_incoming_pstate_za ())
-    return false;
+  for (auto state : { "za", "zt0" })
+    if (bool (aarch64_cfun_shared_flags (state))
+	!= bool (aarch64_fntype_shared_flags (fntype, state)))
+      return false;
   return true;
 }
 
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/sibcall_9.c b/gcc/testsuite/gcc.target/aarch64/sme/sibcall_9.c
new file mode 100644
index 00000000000..2e133c881a8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sme/sibcall_9.c
@@ -0,0 +1,51 @@ 
+// { dg-options "-O2 -fno-schedule-insns -fno-schedule-insns2" }
+// { dg-final { check-function-bodies "**" "" } }
+
+#pragma GCC target "+sme2"
+
+void gen_zt0() __arm_preserves("za") __arm_out("zt0");
+void callee() __arm_inout("za");
+
+/*
+** caller_inout:
+**	...
+**	str	zt0, \[[^\n]+\]
+**	bl	callee
+**	ldr	zt0, \[[^\n]+\]
+**	...
+**	ret
+*/
+void caller_inout() __arm_inout("za", "zt0") { callee(); }
+
+/*
+** caller_in:
+**	...
+**	str	zt0, \[[^\n]+\]
+**	bl	callee
+**	ldr	zt0, \[[^\n]+\]
+**	...
+**	ret
+*/
+void caller_in() __arm_inout("za") __arm_in("zt0") { callee(); }
+
+/*
+** caller_out:
+**	...
+**	str	zt0, \[[^\n]+\]
+**	bl	callee
+**	ldr	zt0, \[[^\n]+\]
+**	...
+**	ret
+*/
+void caller_out() __arm_inout("za") __arm_in("zt0") { gen_zt0(); callee(); }
+
+/*
+** caller_preserves:
+**	...
+**	str	zt0, \[[^\n]+\]
+**	bl	callee
+**	ldr	zt0, \[[^\n]+\]
+**	...
+**	ret
+*/
+void caller_preserves() __arm_inout("za") __arm_preserves("zt0") { callee(); }