[src/netbsd-10]: src/external/gpl3/gcc/dist/gcc/config/sh Pull up following r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e9eb95a4bbf4
branches:  netbsd-10
changeset: 378085:e9eb95a4bbf4
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jul 19 14:11:14 2023 +0000

description:
Pull up following revision(s) (requested by rin in ticket #236):

        external/gpl3/gcc/dist/gcc/config/sh/sh.md: revision 1.3

gcc: Fix peephole optimization bug for sh3 (PR port-sh3/56311)

Cherry-picked from upstream:
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=4dbb3af1efe55174a714d15c2994cf2842ef8c28
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101469

Now, the PR confirmed fixed. No regression observed for full ATF run on
landisk (compared with GCC built with this peephole optimization being
removed by hand).

We thank Oleg Endo, the author of the upstream commit.
Also thanks hgutch@ and uwe@ for analysis.

diffstat:

 external/gpl3/gcc/dist/gcc/config/sh/sh.md |  39 ++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diffs (49 lines):

diff -r 89f0ba1eb4b1 -r e9eb95a4bbf4 external/gpl3/gcc/dist/gcc/config/sh/sh.md
--- a/external/gpl3/gcc/dist/gcc/config/sh/sh.md        Fri Jul 14 08:34:20 2023 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/sh/sh.md        Wed Jul 19 14:11:14 2023 +0000
@@ -10681,6 +10681,45 @@
    && peep2_reg_dead_p (2, operands[1]) && peep2_reg_dead_p (3, operands[0])"
   [(const_int 0)]
 {
+  if (MEM_P (operands[3]) && reg_overlap_mentioned_p (operands[0], operands[3]))
+    {
+      // Take care when the eliminated operand[0] register is part of
+      // the destination memory address.
+      rtx addr = XEXP (operands[3], 0);
+
+      if (REG_P (addr))
+       operands[3] = replace_equiv_address (operands[3], operands[1]);
+
+      else if (GET_CODE (addr) == PLUS && REG_P (XEXP (addr, 0))
+              && CONST_INT_P (XEXP (addr, 1))
+              && REGNO (operands[0]) == REGNO (XEXP (addr, 0)))
+       operands[3] = replace_equiv_address (operands[3],
+                           gen_rtx_PLUS (SImode, operands[1], XEXP (addr, 1)));
+
+      else if (GET_CODE (addr) == PLUS && REG_P (XEXP (addr, 0))
+              && REG_P (XEXP (addr, 1)))
+        {
+          // register + register address  @(R0, Rn)
+          // can change only the Rn in the address, not R0.
+          if (REGNO (operands[0]) == REGNO (XEXP (addr, 0))
+             && REGNO (XEXP (addr, 0)) != 0)
+           {
+             operands[3] = replace_equiv_address (operands[3],
+                           gen_rtx_PLUS (SImode, operands[1], XEXP (addr, 1)));
+           }
+          else if (REGNO (operands[0]) == REGNO (XEXP (addr, 1))
+                  && REGNO (XEXP (addr, 1)) != 0)
+            {
+             operands[3] = replace_equiv_address (operands[3],
+                           gen_rtx_PLUS (SImode, XEXP (addr, 0), operands[1]));
+            }
+          else
+            FAIL;
+        }
+      else
+        FAIL;
+    }
+
   emit_insn (gen_addsi3 (operands[1], operands[1], operands[2]));
   sh_peephole_emit_move_insn (operands[3], operands[1]);
 })