From 8a8493abec206d497672086d17007334825e8668 Mon Sep 17 00:00:00 2001
From: Bin Cheng <bin.cheng@arm.com>
Date: Wed, 6 Dec 2017 16:43:43 +0000
Subject: [PATCH] pr41305.C: Refine test option.

	gcc/testsuite
	* g++.dg/graphite/pr41305.C: Refine test option.
	* gcc.dg/graphite/pr42205-1.c: Ditto.
	* gcc.dg/graphite/pr42205-2.c: Ditto.
	* gcc.dg/graphite/pr42211.c: Ditto.
	* gcc.dg/graphite/pr46185.c: Ditto.
	* gcc.dg/graphite/pr46966.c: Ditto.
	* gcc.dg/graphite/pr59817-1.c: Ditto.
	* gcc.dg/graphite/pr59817-2.c: Ditto.
	* gcc.dg/graphite/pr60740.c: Ditto.
	* gcc.dg/graphite/pr60785.c: Ditto.
	* gcc.dg/graphite/pr68715-2.c: Ditto.
	* gcc.dg/graphite/pr68715.c: Ditto.
	* gcc.dg/graphite/pr70045.c: Ditto.
	* gfortran.dg/graphite/pr14741.f90: Ditto.
	* gfortran.dg/graphite/pr40982.f90: Ditto.
	* gfortran.dg/graphite/pr42285.f90: Ditto.
	* gfortran.dg/graphite/pr42334-1.f: Ditto.
	* gfortran.dg/graphite/pr42334.f90: Ditto.
	* gfortran.dg/graphite/pr43349.f: Ditto.
	* gfortran.dg/graphite/pr59817.f: Ditto.

From-SVN: r255444
---
 gcc/testsuite/ChangeLog                       | 23 +++++++++++++++++++
 gcc/testsuite/g++.dg/graphite/pr41305.C       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr42205-1.c     |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr42205-2.c     |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr42211.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr46185.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr46966.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr59817-1.c     |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr59817-2.c     |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr60740.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr60785.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr68715-2.c     |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr68715.c       |  2 +-
 gcc/testsuite/gcc.dg/graphite/pr70045.c       |  2 +-
 .../gfortran.dg/graphite/pr14741.f90          |  2 +-
 .../gfortran.dg/graphite/pr40982.f90          |  2 +-
 .../gfortran.dg/graphite/pr42285.f90          |  2 +-
 .../gfortran.dg/graphite/pr42334-1.f          |  2 +-
 .../gfortran.dg/graphite/pr42334.f90          |  2 +-
 gcc/testsuite/gfortran.dg/graphite/pr43349.f  |  2 +-
 gcc/testsuite/gfortran.dg/graphite/pr59817.f  |  2 +-
 21 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e62aad4ccc5..9fef2d5bca4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,26 @@
+2017-12-06  Bin Cheng  <bin.cheng@arm.com>
+
+	* g++.dg/graphite/pr41305.C: Refine test option.
+	* gcc.dg/graphite/pr42205-1.c: Ditto.
+	* gcc.dg/graphite/pr42205-2.c: Ditto.
+	* gcc.dg/graphite/pr42211.c: Ditto.
+	* gcc.dg/graphite/pr46185.c: Ditto.
+	* gcc.dg/graphite/pr46966.c: Ditto.
+	* gcc.dg/graphite/pr59817-1.c: Ditto.
+	* gcc.dg/graphite/pr59817-2.c: Ditto.
+	* gcc.dg/graphite/pr60740.c: Ditto.
+	* gcc.dg/graphite/pr60785.c: Ditto.
+	* gcc.dg/graphite/pr68715-2.c: Ditto.
+	* gcc.dg/graphite/pr68715.c: Ditto.
+	* gcc.dg/graphite/pr70045.c: Ditto.
+	* gfortran.dg/graphite/pr14741.f90: Ditto.
+	* gfortran.dg/graphite/pr40982.f90: Ditto.
+	* gfortran.dg/graphite/pr42285.f90: Ditto.
+	* gfortran.dg/graphite/pr42334-1.f: Ditto.
+	* gfortran.dg/graphite/pr42334.f90: Ditto.
+	* gfortran.dg/graphite/pr43349.f: Ditto.
+	* gfortran.dg/graphite/pr59817.f: Ditto.
+
 2017-12-06  Charles Baylis  <charles.baylis@linaro.org>
 
 	* gcc.target/arm/addr-modes-float.c: Place dg-add-options after
diff --git a/gcc/testsuite/g++.dg/graphite/pr41305.C b/gcc/testsuite/g++.dg/graphite/pr41305.C
index 756b1267288..afab30a5e1e 100644
--- a/gcc/testsuite/g++.dg/graphite/pr41305.C
+++ b/gcc/testsuite/g++.dg/graphite/pr41305.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-O3 -floop-interchange -Wno-conversion-null -Wno-return-type" }
+// { dg-options "-O3 -floop-nest-optimize -Wno-conversion-null -Wno-return-type" }
 
 void __throw_bad_alloc ();
 
diff --git a/gcc/testsuite/gcc.dg/graphite/pr42205-1.c b/gcc/testsuite/gcc.dg/graphite/pr42205-1.c
index 9cca6dec44a..f08bbec96e5 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr42205-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr42205-1.c
@@ -1,5 +1,5 @@
 /* { dg-require-effective-target int32plus } */
-/* { dg-options "-O1 -ffast-math -floop-interchange" } */
+/* { dg-options "-O1 -ffast-math -floop-nest-optimize" } */
 
 int adler32(int adler, char *buf, int n)
 {
diff --git a/gcc/testsuite/gcc.dg/graphite/pr42205-2.c b/gcc/testsuite/gcc.dg/graphite/pr42205-2.c
index 595cedb90a5..9ceb1ce596a 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr42205-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr42205-2.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O1 -funsafe-math-optimizations -floop-interchange" } */
+/* { dg-options "-O1 -funsafe-math-optimizations -floop-nest-optimize" } */
 
 double f(double x)
 {
diff --git a/gcc/testsuite/gcc.dg/graphite/pr42211.c b/gcc/testsuite/gcc.dg/graphite/pr42211.c
index d8fb915f377..06bae273ffd 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr42211.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr42211.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O3 -floop-interchange" } */
+/* { dg-options "-O3 -floop-nest-optimize" } */
 
 typedef unsigned char uint8_t;
 
diff --git a/gcc/testsuite/gcc.dg/graphite/pr46185.c b/gcc/testsuite/gcc.dg/graphite/pr46185.c
index 7f9ae074719..ecb99f50ea3 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr46185.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr46185.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-require-effective-target size32plus } */
 /* { dg-require-effective-target int32plus } */
-/* { dg-options "-O2 -floop-interchange -ffast-math -fno-ipa-cp" } */
+/* { dg-options "-O2 -floop-nest-optimize -ffast-math -fno-ipa-cp" } */
 
 #define DEBUG 0
 #if DEBUG
diff --git a/gcc/testsuite/gcc.dg/graphite/pr46966.c b/gcc/testsuite/gcc.dg/graphite/pr46966.c
index bb55b71b7e6..7bc82eee279 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr46966.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr46966.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* This test is too big for small targets.  */
 /* { dg-require-effective-target size32plus } */
-/* { dg-options "-O -floop-interchange -ffast-math -fno-tree-copy-prop -fno-tree-loop-im" } */
+/* { dg-options "-O -floop-nest-optimize -ffast-math -fno-tree-copy-prop -fno-tree-loop-im" } */
 
 int a[1000][1000];
 
diff --git a/gcc/testsuite/gcc.dg/graphite/pr59817-1.c b/gcc/testsuite/gcc.dg/graphite/pr59817-1.c
index 175fa16fd71..f5f2a63c414 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr59817-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr59817-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 int kd;
 
diff --git a/gcc/testsuite/gcc.dg/graphite/pr59817-2.c b/gcc/testsuite/gcc.dg/graphite/pr59817-2.c
index 13950076814..064136e3de1 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr59817-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr59817-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 void
 xl(void)
diff --git a/gcc/testsuite/gcc.dg/graphite/pr60740.c b/gcc/testsuite/gcc.dg/graphite/pr60740.c
index 5b7c1802236..77152559b7e 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr60740.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr60740.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 int **db6 = 0;
 
diff --git a/gcc/testsuite/gcc.dg/graphite/pr60785.c b/gcc/testsuite/gcc.dg/graphite/pr60785.c
index 87c1c685b0a..59870f94eff 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr60785.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr60785.c
@@ -1,4 +1,4 @@
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 static int
 aqc(void)
diff --git a/gcc/testsuite/gcc.dg/graphite/pr68715-2.c b/gcc/testsuite/gcc.dg/graphite/pr68715-2.c
index 270d948f1f5..28d9e6066ea 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr68715-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr68715-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-Ofast -floop-interchange" } */
+/* { dg-options "-Ofast -floop-nest-optimize" } */
 
 int a, b, c, d, f, g;
 int e[1], h[1];
diff --git a/gcc/testsuite/gcc.dg/graphite/pr68715.c b/gcc/testsuite/gcc.dg/graphite/pr68715.c
index 14da2fbf939..28787b97214 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr68715.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr68715.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 int a[1], c[1];
 int b, d, e;
diff --git a/gcc/testsuite/gcc.dg/graphite/pr70045.c b/gcc/testsuite/gcc.dg/graphite/pr70045.c
index 9f98b1f0f11..f027b7c2ca7 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr70045.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr70045.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -floop-interchange" } */
+/* { dg-options "-O2 -floop-nest-optimize" } */
 
 int a, b, d, e, f;
 int c[9];
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr14741.f90 b/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
index e40262f1288..e70f0b641d6 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
@@ -1,4 +1,4 @@
-! { dg-options "-O3 -ffast-math -floop-interchange -floop-block -fdump-tree-graphite-all" }
+! { dg-options "-O3 -ffast-math -floop-nest-optimize -floop-block -fdump-tree-graphite-all" }
 
   INTEGER, PARAMETER :: N=1024
   REAL*8 :: A(N,N), B(N,N), C(N,N)
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr40982.f90 b/gcc/testsuite/gfortran.dg/graphite/pr40982.f90
index b9641aef031..560b745287f 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr40982.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr40982.f90
@@ -1,4 +1,4 @@
-! { dg-options "-O3 -fgraphite-identity -floop-interchange " }
+! { dg-options "-O3 -fgraphite-identity -floop-nest-optimize " }
 
 module mqc_m
 
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr42285.f90 b/gcc/testsuite/gfortran.dg/graphite/pr42285.f90
index d496d3724ba..12b1f887aeb 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr42285.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr42285.f90
@@ -1,4 +1,4 @@
-! { dg-options "-O2 -floop-interchange" }
+! { dg-options "-O2 -floop-nest-optimize" }
 
 SUBROUTINE EFGRDM(NCF,NFRG,G,RTRMS,GM,IOPT,K1)
   IMPLICIT DOUBLE PRECISION (A-H,O-Z)
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr42334-1.f b/gcc/testsuite/gfortran.dg/graphite/pr42334-1.f
index 2503dc3e8f2..fb7283d4907 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr42334-1.f
+++ b/gcc/testsuite/gfortran.dg/graphite/pr42334-1.f
@@ -1,4 +1,4 @@
-! { dg-options "-O2 -floop-interchange" }
+! { dg-options "-O2 -floop-nest-optimize" }
 
       subroutine linel(icmdl,stre,anisox)
       real*8 stre(6),tkl(3,3),ekl(3,3),anisox(3,3,3,3)
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr42334.f90 b/gcc/testsuite/gfortran.dg/graphite/pr42334.f90
index 4080c9f2ab3..54e0963fea2 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr42334.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr42334.f90
@@ -1,4 +1,4 @@
-! { dg-options "-O2 -floop-interchange -ftree-loop-distribution" }
+! { dg-options "-O2 -floop-nest-optimize -ftree-loop-distribution" }
 
 subroutine blockdis(bl1eg,bl2eg)
   implicit real*8 (a-h,o-z)
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr43349.f b/gcc/testsuite/gfortran.dg/graphite/pr43349.f
index 86e408f9b80..73aa1f41d91 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr43349.f
+++ b/gcc/testsuite/gfortran.dg/graphite/pr43349.f
@@ -1,4 +1,4 @@
-! { dg-options "-O2 -floop-interchange" }
+! { dg-options "-O2 -floop-nest-optimize" }
 
       SUBROUTINE BUG(A,B,X,Y,Z,N)
       IMPLICIT NONE
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr59817.f b/gcc/testsuite/gfortran.dg/graphite/pr59817.f
index a9ee8f19dd7..fbdcea26d6e 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr59817.f
+++ b/gcc/testsuite/gfortran.dg/graphite/pr59817.f
@@ -1,5 +1,5 @@
 ! { dg-do compile }
-! { dg-options "-O2 -floop-interchange" }
+! { dg-options "-O2 -floop-nest-optimize" }
       SUBROUTINE PREPD(ICAST,ICAS,ICASX,ICAS1,ICAS2,NDET,NM,III,IMP,
      *                 CASMIN)
       LOGICAL CASMIN
-- 
2.30.2