From edf95e51e53697f3050f076675c26a4cece17741 Mon Sep 17 00:00:00 2001
From: Omar Tahir <omar.tahir@arm.com>
Date: Thu, 9 Jul 2020 10:14:19 +0100
Subject: [PATCH] ira: Fix unnecessary register spill

The variables first_moveable_pseudo and last_moveable_pseudo aren't
reset after compiling a function, which means they leak into the first
scheduler pass of the following function. In some cases, this can cause
an extra spill during register allocation of the second function.

gcc/ChangeLog:

	* ira.c (move_unallocated_pseudos): Zero first_moveable_pseudo and
	last_moveable_pseudo before returning.

gcc/testsuite/ChangeLog:

	* gcc.target/aarch64/nospill.c: New test.
---
 gcc/ira.c                                  |  2 ++
 gcc/testsuite/gcc.target/aarch64/nospill.c | 35 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/aarch64/nospill.c

diff --git a/gcc/ira.c b/gcc/ira.c
index a655ae12eb2..b748a6de3c2 100644
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -5126,6 +5126,8 @@ move_unallocated_pseudos (void)
 		   INSN_UID (newinsn), i);
 	SET_REG_N_REFS (i, 0);
       }
+
+  first_moveable_pseudo = last_moveable_pseudo = 0;
 }
 
 /* If the backend knows where to allocate pseudos for hard
diff --git a/gcc/testsuite/gcc.target/aarch64/nospill.c b/gcc/testsuite/gcc.target/aarch64/nospill.c
new file mode 100644
index 00000000000..968a4267e0d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/nospill.c
@@ -0,0 +1,35 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+/* The pseudo for P is marked as moveable in the IRA pass. */
+float
+func_0 (float a, float b, float c)
+{
+  float p = c / a;
+
+  if (b > 1)
+    {
+      b /= p;
+      if (c > 2)
+        a /= 3;
+    }
+
+  return b / c * a;
+}
+
+/* If first_moveable_pseudo and last_moveable_pseudo are not reset correctly,
+   they will carry over and spill the pseudo for Q. */
+float
+func_1 (float a, float b, float c)
+{
+  float q = a + b;
+
+  c *= a / (b + b);
+  if (a > 0)
+    c *= q;
+
+  return a * b * c;
+}
+
+/* We have plenty of spare registers, so check nothing has been spilled. */
+/* { dg-final { scan-assembler-not "\tstr\t" } } */
-- 
2.30.2