Hello! 2014-11-04 Uros Bizjak <ubiz...@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. Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN. Uros.
Index: g++.dg/ipa/devirt-44.C =================================================================== --- g++.dg/ipa/devirt-44.C (revision 217089) +++ g++.dg/ipa/devirt-44.C (working copy) @@ -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();} Index: g++.dg/ipa/devirt-45.C =================================================================== --- g++.dg/ipa/devirt-45.C (revision 217089) +++ g++.dg/ipa/devirt-45.C (working copy) @@ -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();} Index: g++.dg/tree-prof/morefunc.C =================================================================== --- g++.dg/tree-prof/morefunc.C (revision 217089) +++ g++.dg/tree-prof/morefunc.C (working copy) @@ -52,4 +52,4 @@ } /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */ - +/* { dg-final-use { cleanup-ipa-dump "profile" } } */ Index: g++.dg/tree-prof/pr35545.C =================================================================== --- g++.dg/tree-prof/pr35545.C (revision 217089) +++ g++.dg/tree-prof/pr35545.C (working copy) @@ -47,6 +47,6 @@ } /* { 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" } } */ Index: g++.dg/tree-prof/reorder.C =================================================================== --- g++.dg/tree-prof/reorder.C (revision 217089) +++ g++.dg/tree-prof/reorder.C (working copy) @@ -45,4 +45,4 @@ } /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */ - +/* { dg-final-use { cleanup-ipa-dump "profile" } } */ Index: gcc.dg/fold-reassoc-3.c =================================================================== --- gcc.dg/fold-reassoc-3.c (revision 217089) +++ gcc.dg/fold-reassoc-3.c (working copy) @@ -13,5 +13,5 @@ } /* { 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" } } */ Index: gcc.dg/tree-prof/20050826-2.c =================================================================== --- gcc.dg/tree-prof/20050826-2.c (revision 217089) +++ gcc.dg/tree-prof/20050826-2.c (working copy) @@ -73,3 +73,4 @@ } /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */ +/* { dg-final-use { cleanup-tree-dump "dom1" } } */ Index: gcc.dg/tree-prof/cmpsf-1.c =================================================================== --- gcc.dg/tree-prof/cmpsf-1.c (revision 217089) +++ gcc.dg/tree-prof/cmpsf-1.c (working copy) @@ -182,3 +182,4 @@ } /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */ +/* { dg-final-use { cleanup-tree-dump "dom1" } } */ Index: gcc.dg/tree-ssa/pr61144.c =================================================================== --- gcc.dg/tree-ssa/pr61144.c (revision 217089) +++ gcc.dg/tree-ssa/pr61144.c (working copy) @@ -5,3 +5,4 @@ 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" } } */