From: Jeff Law <law@redhat.com>
Date: Wed, 5 Feb 2020 17:00:48 +0000 (-0700)
Subject: Fix testsuite "regression" on hppa after recent IRA changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;ds=sidebyside;h=f976fe0937c2b46880628c2e2749ca3a788c5db0;hp=91bc3c98851670360dfcd312399c3ba35fb50231;p=gcc.git

Fix testsuite "regression" on hppa after recent IRA changes.

	* gcc.target/hppa/shadd-3.c: Disable delay slot filling and
	adjust expected shadd insn count appropriately.
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f6291df9795..0a6513e666b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-05  Jeff Law  <law@redhat.com>
+
+	* gcc.target/hppa/shadd-3.c: Disable delay slot filling and
+	adjust expected shadd insn count appropriately.
+
 2020-02-05  David Malcolm  <dmalcolm@redhat.com>
 
 	* gcc.dg/analyzer/data-model-1.c: Update for changed output to
diff --git a/gcc/testsuite/gcc.target/hppa/shadd-3.c b/gcc/testsuite/gcc.target/hppa/shadd-3.c
index f0443ea9977..2d0b648f384 100644
--- a/gcc/testsuite/gcc.target/hppa/shadd-3.c
+++ b/gcc/testsuite/gcc.target/hppa/shadd-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile }  */
-/* { dg-options "-O2" }  */
+/* { dg-options "-O2 -fno-delayed-branch" }  */
 /* In this test we want to verify that combine canonicalizes the
    MULT into an ASHIFT which in turn allows postreload-gcse to
    find the common subexpression.
@@ -8,8 +8,9 @@
    for parsing here, so we count the shadd insns.  More is not
    necessarily better in this test.  If this test is too fragile
    over time we'll have to revisit the combine and/or postreload
-   dumps.  */
-/* { dg-final { scan-assembler-times "sh.add" 5 } }  */
+   dumps.  Note we have disabled delay slot filling to improve
+   test stability.  */
+/* { dg-final { scan-assembler-times "sh.add" 4 } }  */
 
 extern void oof (void);
 typedef struct simple_bitmap_def *sbitmap;