devirt-44.C (dg-options): Remove -fdump-tree-optimized.

	* g++.dg/ipa/devirt-44.C (dg-options): Remove -fdump-tree-optimized.
	* g++.dg/ipa/devirt-45.C (dg-options): Ditto.
	* g++.dg/tree-prof/morefunc.C (dg-final-use): Cleanup profile ipa dump.
	* g++.dg/tree-prof/reorder.C (dg-final-use): Ditto.
	* g++.dg/tree-prof/pr35545.C (dg-fina-use): Cleanup profile_estimate
	ipa dump.
	* gcc.dg/fold-reassoc-3.c (dg-final): Fix scan string.
	Cleanup original tree dump.
	* gcc.dg/tree-prof/20050826-2.c (dg-final-use): Cleanup dom1 tree dump.
	* gcc.dg/tree-prof/cmpsf-1.c (dg-final-use): Ditto.
	* gcc.dg/tree-ssa/pr61144.c (dg-final): Cleanup optimized tree dump.

From-SVN: r217097

10 files changed, 28 insertions, 12 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f9d73a3..2a6599b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2014-11-04  Uros Bizjak  <ubizjak@gmail.com>
+
+	* g++.dg/ipa/devirt-44.C (dg-options): Remove -fdump-tree-optimized.
+	* g++.dg/ipa/devirt-45.C (dg-options): Ditto.
+	* g++.dg/tree-prof/morefunc.C (dg-final-use): Cleanup profile ipa dump.
+	* g++.dg/tree-prof/reorder.C (dg-final-use): Ditto.
+	* g++.dg/tree-prof/pr35545.C (dg-fina-use): Cleanup profile_estimate
+	ipa dump.
+	* gcc.dg/fold-reassoc-3.c (dg-final): Fix scan string.
+	Cleanup original tree dump.
+	* gcc.dg/tree-prof/20050826-2.c (dg-final-use): Cleanup dom1 tree dump.
+	* gcc.dg/tree-prof/cmpsf-1.c (dg-final-use): Ditto.
+	* gcc.dg/tree-ssa/pr61144.c (dg-final): Cleanup optimized tree dump.
+
 2014-11-04  Martin Jambor  <mjambor@suse.cz>
 
 	* g++/dg/ipa/devirt-40.C: Changed dump to not matching OBJ_TYPE_REF in
@@ -10,7 +24,6 @@
 
 2014-11-04  Andrew Stubbs  <ams@codesourcery.com>
 
-	gcc/testsuite/
 	* gcc.target/powerpc/pr60102.c: Move dg-skip-if after dg-options.
 	* gcc.target/powerpc/swaps-p8-12.c: Skip test if there would be
 	conflicting -mcpu options.
@@ -2256,10 +2269,10 @@
 
 	* gcc.dg/tree-prof/peel-1.c: Update.
 	* gcc.dg/tree-prof/unroll-1.c: Update.
-	* gcc.dg/gcc.dg/unroll_1.c: Update.
-	* gcc.dg/gcc.dg/unroll_2.c: Update.
-	* gcc.dg/gcc.dg/unroll_3.c: Update.
-	* gcc.dg/gcc.dg/unroll_4.c: Update.
+	* gcc.dg/unroll_1.c: Update.
+	* gcc.dg/unroll_2.c: Update.
+	* gcc.dg/unroll_3.c: Update.
+	* gcc.dg/unroll_4.c: Update.
 
 2014-10-14  DJ Delorie  <dj@redhat.com>
 
diff --git a/gcc/testsuite/g++.dg/ipa/devirt-44.C b/gcc/testsuite/g++.dg/ipa/devirt-44.C
index bd6c198..cfc6e55 100644
--- a/gcc/testsuite/g++.dg/ipa/devirt-44.C
+++ b/gcc/testsuite/g++.dg/ipa/devirt-44.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining -fdump-tree-optimized" } */
+/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining" } */
 struct A {
   virtual int foo () {return 1;}
   int wrapfoo () {foo();}
diff --git a/gcc/testsuite/g++.dg/ipa/devirt-45.C b/gcc/testsuite/g++.dg/ipa/devirt-45.C
index 5c47e08..4616c95 100644
--- a/gcc/testsuite/g++.dg/ipa/devirt-45.C
+++ b/gcc/testsuite/g++.dg/ipa/devirt-45.C
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining -fdump-tree-optimized" } */
+/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining" } */
 struct A {
   virtual int foo () {return 1;}
   int wrapfoo () {foo();}
diff --git a/gcc/testsuite/g++.dg/tree-prof/morefunc.C b/gcc/testsuite/g++.dg/tree-prof/morefunc.C
index d5cee40..722b4b0 100644
--- a/gcc/testsuite/g++.dg/tree-prof/morefunc.C
+++ b/gcc/testsuite/g++.dg/tree-prof/morefunc.C
@@ -52,4 +52,4 @@ int main()
 }
 
 /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */
-
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/g++.dg/tree-prof/pr35545.C b/gcc/testsuite/g++.dg/tree-prof/pr35545.C
index 8f703a2..4e84413 100644
--- a/gcc/testsuite/g++.dg/tree-prof/pr35545.C
+++ b/gcc/testsuite/g++.dg/tree-prof/pr35545.C
@@ -47,6 +47,6 @@ int main()
 
 }
 /* { dg-final-use { scan-ipa-dump "Indirect call -> direct call" "profile_estimate" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile_estimate" } } */
 /* { dg-final-use { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */
 /* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/g++.dg/tree-prof/reorder.C b/gcc/testsuite/g++.dg/tree-prof/reorder.C
index 223bcf9..41d6a15 100644
--- a/gcc/testsuite/g++.dg/tree-prof/reorder.C
+++ b/gcc/testsuite/g++.dg/tree-prof/reorder.C
@@ -45,4 +45,4 @@ int main()
 }
 
 /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */
-
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-reassoc-3.c b/gcc/testsuite/gcc.dg/fold-reassoc-3.c
index 313fb98..be64527 100644
--- a/gcc/testsuite/gcc.dg/fold-reassoc-3.c
+++ b/gcc/testsuite/gcc.dg/fold-reassoc-3.c
@@ -13,5 +13,5 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-not " - " "original" } } */
-/* { dg-final { scan-tree-dump-not " \\\+ " "original" } } */
-/* { dg-final { cleanup-tree-dump "orginal" } } */
+/* { dg-final { scan-tree-dump-not " \\+ " "original" } } */
+/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
index 233c7ec..881a0fd 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
@@ -73,3 +73,4 @@ main (void)
 }
 
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */
+/* { dg-final-use { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c b/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c
index 565dd1c..a932c96 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c
@@ -182,3 +182,4 @@ main (void)
 }
 
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */
+/* { dg-final-use { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
index cd34b14..d1427d0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
@@ -5,3 +5,4 @@ static int dummy = 0;
 extern int foo __attribute__((__weak__, __alias__("dummy")));
 int bar() { if (foo) return 1; return 0; }
 /* { dg-final { scan-tree-dump-not "return 0" "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */