S/390: Don't fetch the return address early with ooo

We used to load the return address slot some time in advance.  This
helped on older machines to resolve the data dependencies in time.
However, it is pointless on out of order CPUs.  Disabled with that
patch.

gcc/ChangeLog:

2017-06-01  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* config/s390/s390.c (s390_emit_epilogue): Disable early return
	address fetch for z10 or later.

From-SVN: r248789

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9ff24c97a3a162b63b13ab798cdca10c68ee0f6f..9cfcfad9090f1279c0babd9aa582667d242ef5e1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-01  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * config/s390/s390.c (s390_emit_epilogue): Disable early return
+       address fetch for z10 or later.
+
 2017-06-01  Claudiu Zissulescu  <claziss@synopsys.com>
 
        * config/arc/arc.md (tst_movb): Add guard when splitting.

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 7be22d9c75c38364a52acd5bcd17d15403273ebe..eb94237d96992ccc0f65678e22e09d551589b023 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -11410,38 +11410,39 @@ s390_emit_epilogue (bool sibcall)
                                gen_rtx_REG (Pmode, i), cfa_restores);
        }
 
-      if (! sibcall)
-       {
-         /* Fetch return address from stack before load multiple,
-            this will do good for scheduling.
-
-            Only do this if we already decided that r14 needs to be
-            saved to a stack slot. (And not just because r14 happens to
-            be in between two GPRs which need saving.)  Otherwise it
-            would be difficult to take that decision back in
-            s390_optimize_prologue.  */
-         if (cfun_gpr_save_slot (RETURN_REGNUM) == SAVE_SLOT_STACK)
-           {
-             int return_regnum = find_unused_clobbered_reg();
-             if (!return_regnum)
-               return_regnum = 4;
-             return_reg = gen_rtx_REG (Pmode, return_regnum);
-
-             addr = plus_constant (Pmode, frame_pointer,
-                                   offset + cfun_frame_layout.gprs_offset
-                                   + (RETURN_REGNUM
-                                      - cfun_frame_layout.first_save_gpr_slot)
-                                   * UNITS_PER_LONG);
-             addr = gen_rtx_MEM (Pmode, addr);
-             set_mem_alias_set (addr, get_frame_alias_set ());
-             emit_move_insn (return_reg, addr);
+      /* Fetch return address from stack before load multiple,
+        this will do good for scheduling.
+
+        Only do this if we already decided that r14 needs to be
+        saved to a stack slot. (And not just because r14 happens to
+        be in between two GPRs which need saving.)  Otherwise it
+        would be difficult to take that decision back in
+        s390_optimize_prologue.
+
+        This optimization is only helpful on in-order machines.  */
+      if (! sibcall
+         && cfun_gpr_save_slot (RETURN_REGNUM) == SAVE_SLOT_STACK
+         && s390_tune <= PROCESSOR_2097_Z10)
+       {
+         int return_regnum = find_unused_clobbered_reg();
+         if (!return_regnum)
+           return_regnum = 4;
+         return_reg = gen_rtx_REG (Pmode, return_regnum);
+
+         addr = plus_constant (Pmode, frame_pointer,
+                               offset + cfun_frame_layout.gprs_offset
+                               + (RETURN_REGNUM
+                                  - cfun_frame_layout.first_save_gpr_slot)
+                               * UNITS_PER_LONG);
+         addr = gen_rtx_MEM (Pmode, addr);
+         set_mem_alias_set (addr, get_frame_alias_set ());
+         emit_move_insn (return_reg, addr);
 
-             /* Once we did that optimization we have to make sure
-                s390_optimize_prologue does not try to remove the
-                store of r14 since we will not be able to find the
-                load issued here.  */
-             cfun_frame_layout.save_return_addr_p = true;
-           }
+         /* Once we did that optimization we have to make sure
+            s390_optimize_prologue does not try to remove the store
+            of r14 since we will not be able to find the load issued
+            here.  */
+         cfun_frame_layout.save_return_addr_p = true;
        }
 
       insn = restore_gprs (frame_pointer,