testsuite: auto-wipe dump files

gcc/testsuite/ChangeLog 2015-05-29 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * lib/gcc-dg.exp (cleanup-ipa-dump, cleanup-rtl-dump, cleanup-tree-dump, cleanup-dump, cleanup-saved-temps): Remove. Adjust all callers. (schedule-cleanups, dg-keep-saved-temps): New proc. (gcc-dg-test-1): Schedule cleanups. * lib/profopt.exp (profopt-execute): Likewise. * g++.dg/cdce3.C: Adjust expected line numbers. * gcc.dg/cdce1.c: Likewise. * gcc.dg/cdce2.c: Likewise. * gcc.dg/strlenopt-22.c: Fix comment delimiter. * gcc.dg/strlenopt-24.c: Likewise. * gcc.dg/tree-ssa/vrp26.c: Likewise. * gcc.dg/tree-ssa/vrp28.c: Likewise. * obj-c++.dg/encode-2.mm: Likewise. libgomp/ChangeLog 2015-05-29 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * testsuite/libgomp.graphite/bounds.c: Adjust for cleanup-tree-dump removal. * testsuite/libgomp.graphite/force-parallel-1.c: Likewise. * testsuite/libgomp.graphite/force-parallel-2.c: Likewise. * testsuite/libgomp.graphite/force-parallel-3.c: Likewise. * testsuite/libgomp.graphite/force-parallel-4.c: Likewise. * testsuite/libgomp.graphite/force-parallel-5.c: Likewise. * testsuite/libgomp.graphite/force-parallel-6.c: Likewise. * testsuite/libgomp.graphite/force-parallel-7.c: Likewise. * testsuite/libgomp.graphite/force-parallel-8.c: Likewise. * testsuite/libgomp.graphite/force-parallel-9.c: Likewise. * testsuite/libgomp.graphite/pr41118.c: Likewise. gcc/ChangeLog 2015-05-29 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * config/arm/neon-testgen.ml (emit_epilogue): Remove manual call to cleanup-saved-temps. * doc/sourcebuild.texi (Clean up generated test files): Expand introduction. (dg-keep-saved-temps): Document new proc. (cleanup-ipa-dump, cleanup-rtl-dump, cleanup-tree-dump, cleanup-saved-temps): Remove. From-SVN: r223858
author: Bernhard Reutner-Fischer <aldot@gcc.gnu.org> 2015-05-29 10:20:29 +0200
committer: Bernhard Reutner-Fischer <aldot@gcc.gnu.org> 2015-05-29 10:20:29 +0200
commit: c469078de7c017978bda033baff3e991987b5509 (patch)
tree: 531d2e5e2630db6b51e375651cdb7371e09faa9e /gcc/testsuite/gcc.dg
parent: 90bb09c4f70b65c0cf4725f4eb1920a35f70d654 (diff)
download: gcc-c469078de7c017978bda033baff3e991987b5509.tar.gz
2526 files changed, 7 insertions, 2659 deletions
diff --git a/gcc/testsuite/gcc.dg/20050811-1.c b/gcc/testsuite/gcc.dg/20050811-1.c
index 010aa5a09ed..e74a14f192e 100644
--- a/gcc/testsuite/gcc.dg/20050811-1.c
+++ b/gcc/testsuite/gcc.dg/20050811-1.c
@@ -17,4 +17,3 @@ int bar (int x)
     return foo ();
 }
 
-// { dg-final { cleanup-rtl-dump "*" } }
diff --git a/gcc/testsuite/gcc.dg/20050811-2.c b/gcc/testsuite/gcc.dg/20050811-2.c
index afee9b0afde..fab8de1545d 100644
--- a/gcc/testsuite/gcc.dg/20050811-2.c
+++ b/gcc/testsuite/gcc.dg/20050811-2.c
@@ -17,4 +17,3 @@ int bar (int x)
     return foo ();
 }
 
-/* { dg-final { cleanup-rtl-dump "postreload*" } } */
diff --git a/gcc/testsuite/gcc.dg/20101013-1.c b/gcc/testsuite/gcc.dg/20101013-1.c
index b5bd3a7ce65..4422e761f3f 100644
--- a/gcc/testsuite/gcc.dg/20101013-1.c
+++ b/gcc/testsuite/gcc.dg/20101013-1.c
@@ -8,4 +8,3 @@ int foo(int a)
 }
 
 /* { dg-final { scan-tree-dump ">>" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/20111227-2.c b/gcc/testsuite/gcc.dg/20111227-2.c
index dfedf318235..2de29b91be1 100644
--- a/gcc/testsuite/gcc.dg/20111227-2.c
+++ b/gcc/testsuite/gcc.dg/20111227-2.c
@@ -43,4 +43,3 @@ int main(void)
   return 0;
 }
 /* { dg-final { scan-rtl-dump "Elimination opportunities = 3 realized = 3" "ree" } }  */
-/* { dg-final { cleanup-rtl-dump "ree" } }  */
diff --git a/gcc/testsuite/gcc.dg/20111227-3.c b/gcc/testsuite/gcc.dg/20111227-3.c
index 2dcdcc4cca8..f1bd35911ab 100644
--- a/gcc/testsuite/gcc.dg/20111227-3.c
+++ b/gcc/testsuite/gcc.dg/20111227-3.c
@@ -43,4 +43,3 @@ int main(void)
   return 0;
 }
 /* { dg-final { scan-rtl-dump "Elimination opportunities = 3 realized = 3" "ree" } }  */
-/* { dg-final { cleanup-rtl-dump "ree" } }  */
diff --git a/gcc/testsuite/gcc.dg/20141029-1.c b/gcc/testsuite/gcc.dg/20141029-1.c
index 1d18a1b8ac3..4a5d92efa73 100644
--- a/gcc/testsuite/gcc.dg/20141029-1.c
+++ b/gcc/testsuite/gcc.dg/20141029-1.c
@@ -25,4 +25,3 @@ foo()
     }
 }
 /* { dg-final { scan-rtl-dump-times "mem/v(/.)*:HI" 4 "final" } } */
-/* { dg-final { cleanup-rtl-dump "final" } } */
diff --git a/gcc/testsuite/gcc.dg/20150120-1.c b/gcc/testsuite/gcc.dg/20150120-1.c
index 0cb4cf68c80..18906c47a09 100644
--- a/gcc/testsuite/gcc.dg/20150120-1.c
+++ b/gcc/testsuite/gcc.dg/20150120-1.c
@@ -49,4 +49,3 @@ fn9 (unsigned int x)
 }
 
 /* { dg-final { scan-tree-dump-times "x \\+ 1" 9 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/20150120-2.c b/gcc/testsuite/gcc.dg/20150120-2.c
index 47a47be9020..976b6548e27 100644
--- a/gcc/testsuite/gcc.dg/20150120-2.c
+++ b/gcc/testsuite/gcc.dg/20150120-2.c
@@ -30,4 +30,3 @@ int fn6 (int z)
 
 /* { dg-final { scan-tree-dump-times "~y & x" 4 "original" } } */
 /* { dg-final { scan-tree-dump-times "z & -4" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/20150120-3.c b/gcc/testsuite/gcc.dg/20150120-3.c
index a216399280b..322556f4add 100644
--- a/gcc/testsuite/gcc.dg/20150120-3.c
+++ b/gcc/testsuite/gcc.dg/20150120-3.c
@@ -30,4 +30,3 @@ int fn6 (int z)
 
 /* { dg-final { scan-tree-dump-times "~y \\| x" 4 "original" } } */
 /* { dg-final { scan-tree-dump-times "z \\| -4" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/alias-10.c b/gcc/testsuite/gcc.dg/alias-10.c
index 6e9cb3f3c42..95d8b196cae 100644
--- a/gcc/testsuite/gcc.dg/alias-10.c
+++ b/gcc/testsuite/gcc.dg/alias-10.c
@@ -29,4 +29,3 @@ void foo (bitmap head, bitmap_element *elt)
 
 
 /* { dg-final { scan-tree-dump-times "Unswitching" 1 "unswitch"} } */
-/* { dg-final { cleanup-tree-dump "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/asr_div1.c b/gcc/testsuite/gcc.dg/asr_div1.c
index 61430ca6a98..11b52469bcd 100644
--- a/gcc/testsuite/gcc.dg/asr_div1.c
+++ b/gcc/testsuite/gcc.dg/asr_div1.c
@@ -53,4 +53,3 @@ main ()
 
 /* { dg-final { scan-rtl-dump "\\(const_int 36 " "combine" { target aarch64*-*-* } } } */
 
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/attr-alloc_align-3.c b/gcc/testsuite/gcc.dg/attr-alloc_align-3.c
index 2efe0c0684a..34d1b4a0a2d 100644
--- a/gcc/testsuite/gcc.dg/attr-alloc_align-3.c
+++ b/gcc/testsuite/gcc.dg/attr-alloc_align-3.c
@@ -53,4 +53,3 @@ test6 (int len, int align)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/attr-assume_aligned-3.c b/gcc/testsuite/gcc.dg/attr-assume_aligned-3.c
index 3731aac50ea..0e4c70b610d 100644
--- a/gcc/testsuite/gcc.dg/attr-assume_aligned-3.c
+++ b/gcc/testsuite/gcc.dg/attr-assume_aligned-3.c
@@ -21,4 +21,3 @@ test2 (int len)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-1.c b/gcc/testsuite/gcc.dg/autopar/outer-1.c
index a9d2185f0ce..d36b5576c3b 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-1.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-1.c
@@ -29,5 +29,3 @@ int main(void)
 /* Check that outer loop is parallelized.  */
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-2.c b/gcc/testsuite/gcc.dg/autopar/outer-2.c
index e0a142f0d11..fd7c2be9dda 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-2.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-2.c
@@ -29,5 +29,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-3.c b/gcc/testsuite/gcc.dg/autopar/outer-3.c
index c6e0adbffdf..55454a43eaa 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-3.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-3.c
@@ -29,5 +29,3 @@ int main(void)
 /* Check that outer loop is parallelized.  */
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-4.c b/gcc/testsuite/gcc.dg/autopar/outer-4.c
index d60023f5d86..6fd37c52aa9 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-4.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-4.c
@@ -33,5 +33,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-5.c b/gcc/testsuite/gcc.dg/autopar/outer-5.c
index fa80293263c..6a0ae91da44 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-5.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-5.c
@@ -46,5 +46,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/outer-6.c b/gcc/testsuite/gcc.dg/autopar/outer-6.c
index b16366932fe..6bef7ccc3e0 100644
--- a/gcc/testsuite/gcc.dg/autopar/outer-6.c
+++ b/gcc/testsuite/gcc.dg/autopar/outer-6.c
@@ -47,5 +47,3 @@ int main(void)
 /* { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "parallelizing inner loop" 0 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/parallelization-1.c b/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
index de2a0f3cc71..222831a9dea 100644
--- a/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
+++ b/gcc/testsuite/gcc.dg/autopar/parallelization-1.c
@@ -29,5 +29,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/pr39500-1.c b/gcc/testsuite/gcc.dg/autopar/pr39500-1.c
index 6428bd062fe..33b93b37aba 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr39500-1.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr39500-1.c
@@ -25,4 +25,3 @@ int main (void)
 /* Check that the first loop in parloop got parallelized.  */
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/pr39500-2.c b/gcc/testsuite/gcc.dg/autopar/pr39500-2.c
index eabac3f88c6..12fa909e07f 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr39500-2.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr39500-2.c
@@ -17,4 +17,3 @@ int main (void)
 /* This loop cannot be parallelized due to a dependence.  */
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 0 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/pr46194.c b/gcc/testsuite/gcc.dg/autopar/pr46194.c
index 574d6e6722c..3daf2ab2d3a 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr46194.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr46194.c
@@ -21,4 +21,3 @@ int foo (void)
 /* This loop cannot be parallelized due to a dependence.  */
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 0 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/pr49580.c b/gcc/testsuite/gcc.dg/autopar/pr49580.c
index e08fd0e0c6c..ddb622f6e0d 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr49580.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr49580.c
@@ -34,5 +34,4 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/pr49960-1.c b/gcc/testsuite/gcc.dg/autopar/pr49960-1.c
index ac9d5678499..34d55529e2b 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr49960-1.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr49960-1.c
@@ -32,5 +32,3 @@ int main()
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 0 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/pr49960.c b/gcc/testsuite/gcc.dg/autopar/pr49960.c
index 5dacb8de84a..c4132783198 100644
--- a/gcc/testsuite/gcc.dg/autopar/pr49960.c
+++ b/gcc/testsuite/gcc.dg/autopar/pr49960.c
@@ -52,5 +52,3 @@ void main ()
 
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 0 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "loopfn" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1.c b/gcc/testsuite/gcc.dg/autopar/reduc-1.c
index 8018a558c43..6e9a2801454 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-1.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-1.c
@@ -68,6 +68,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 3 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 4 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1char.c b/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
index 76645c85075..48ead887a9d 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-1char.c
@@ -62,6 +62,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 3 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 4 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-1short.c b/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
index 526f170096a..f3f547cf7e9 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-1short.c
@@ -61,6 +61,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 3 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 4 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2.c b/gcc/testsuite/gcc.dg/autopar/reduc-2.c
index e0abb265b5b..3ad16e49d36 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-2.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-2.c
@@ -65,6 +65,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 3 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 4 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2char.c b/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
index ada1275f99d..072489f4d85 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-2char.c
@@ -62,7 +62,5 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 2 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-2short.c b/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
index 3363c68f428..4dbbc8ae45a 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-2short.c
@@ -61,6 +61,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 2 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-3.c b/gcc/testsuite/gcc.dg/autopar/reduc-3.c
index 6bc204711e5..0d4baeff185 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-3.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-3.c
@@ -52,6 +52,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 2 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-6.c b/gcc/testsuite/gcc.dg/autopar/reduc-6.c
index fface8fed35..91f679eed04 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-6.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-6.c
@@ -59,5 +59,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Detected reduction" 0 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 1 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "FAILED: it is not a part of reduction" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-7.c b/gcc/testsuite/gcc.dg/autopar/reduc-7.c
index f66069e56ca..77b99e152ec 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-7.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-7.c
@@ -86,6 +86,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 2 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-8.c b/gcc/testsuite/gcc.dg/autopar/reduc-8.c
index 4a416df2372..16fb954df07 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-8.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-8.c
@@ -86,5 +86,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 2 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/autopar/reduc-9.c b/gcc/testsuite/gcc.dg/autopar/reduc-9.c
index 2c1677ce5ee..90f4db2861f 100644
--- a/gcc/testsuite/gcc.dg/autopar/reduc-9.c
+++ b/gcc/testsuite/gcc.dg/autopar/reduc-9.c
@@ -86,5 +86,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "Detected reduction" 2 "parloops" } } */
 /* { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized" 3 "parloops" } } */
-/* { dg-final { cleanup-tree-dump "parloops" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand1.c b/gcc/testsuite/gcc.dg/binop-notand1.c
index cadf7e532c5..7a56aa6128e 100644
--- a/gcc/testsuite/gcc.dg/binop-notand1.c
+++ b/gcc/testsuite/gcc.dg/binop-notand1.c
@@ -8,4 +8,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand1a.c b/gcc/testsuite/gcc.dg/binop-notand1a.c
index 2d8202a0c13..c7e932b2638 100644
--- a/gcc/testsuite/gcc.dg/binop-notand1a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand1a.c
@@ -10,4 +10,3 @@ foo (char a, unsigned short b)
 /* As long as comparisons aren't boolified and casts from boolean-types
    aren't preserved, the folding of  X & !X to zero fails.  */
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand2.c b/gcc/testsuite/gcc.dg/binop-notand2.c
index 0076d4be7a1..40613548ea8 100644
--- a/gcc/testsuite/gcc.dg/binop-notand2.c
+++ b/gcc/testsuite/gcc.dg/binop-notand2.c
@@ -8,4 +8,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand2a.c b/gcc/testsuite/gcc.dg/binop-notand2a.c
index 0076d4be7a1..40613548ea8 100644
--- a/gcc/testsuite/gcc.dg/binop-notand2a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand2a.c
@@ -8,4 +8,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand3.c b/gcc/testsuite/gcc.dg/binop-notand3.c
index 5f8e32ff8fa..2fc1652ff1a 100644
--- a/gcc/testsuite/gcc.dg/binop-notand3.c
+++ b/gcc/testsuite/gcc.dg/binop-notand3.c
@@ -8,4 +8,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand3a.c b/gcc/testsuite/gcc.dg/binop-notand3a.c
index 40e8038a78d..26f351b70be 100644
--- a/gcc/testsuite/gcc.dg/binop-notand3a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand3a.c
@@ -8,4 +8,3 @@ foo (short a)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand4.c b/gcc/testsuite/gcc.dg/binop-notand4.c
index 1c3fefd61e9..d6ed6b54eba 100644
--- a/gcc/testsuite/gcc.dg/binop-notand4.c
+++ b/gcc/testsuite/gcc.dg/binop-notand4.c
@@ -8,4 +8,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand4a.c b/gcc/testsuite/gcc.dg/binop-notand4a.c
index 1178cf78826..dce6a5c7eb5 100644
--- a/gcc/testsuite/gcc.dg/binop-notand4a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand4a.c
@@ -10,4 +10,3 @@ foo (unsigned char a, _Bool b)
 /* As long as comparisons aren't boolified and casts from boolean-types
    aren't preserved, the folding of  X & !X to zero fails.  */
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand5.c b/gcc/testsuite/gcc.dg/binop-notand5.c
index 463f19b04da..3b749909423 100644
--- a/gcc/testsuite/gcc.dg/binop-notand5.c
+++ b/gcc/testsuite/gcc.dg/binop-notand5.c
@@ -8,4 +8,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand5a.c b/gcc/testsuite/gcc.dg/binop-notand5a.c
index 289abcb6b85..378752b06df 100644
--- a/gcc/testsuite/gcc.dg/binop-notand5a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand5a.c
@@ -8,4 +8,3 @@ foo (long a, unsigned long b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand6.c b/gcc/testsuite/gcc.dg/binop-notand6.c
index e1882aca679..040efc92d4e 100644
--- a/gcc/testsuite/gcc.dg/binop-notand6.c
+++ b/gcc/testsuite/gcc.dg/binop-notand6.c
@@ -8,4 +8,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notand6a.c b/gcc/testsuite/gcc.dg/binop-notand6a.c
index b9fe4052d58..9f3d33b526b 100644
--- a/gcc/testsuite/gcc.dg/binop-notand6a.c
+++ b/gcc/testsuite/gcc.dg/binop-notand6a.c
@@ -8,4 +8,3 @@ foo (unsigned long a, long b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notor1.c b/gcc/testsuite/gcc.dg/binop-notor1.c
index a2cb6a3277f..0f2dc38d277 100644
--- a/gcc/testsuite/gcc.dg/binop-notor1.c
+++ b/gcc/testsuite/gcc.dg/binop-notor1.c
@@ -8,4 +8,3 @@ foo (_Bool a, _Bool b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notor2.c b/gcc/testsuite/gcc.dg/binop-notor2.c
index ab8d70e4b5a..7dacfa07f84 100644
--- a/gcc/testsuite/gcc.dg/binop-notor2.c
+++ b/gcc/testsuite/gcc.dg/binop-notor2.c
@@ -8,4 +8,3 @@ foo (_Bool a, _Bool b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notxor1.c b/gcc/testsuite/gcc.dg/binop-notxor1.c
index 39c258dcd75..f0ff203ad48 100644
--- a/gcc/testsuite/gcc.dg/binop-notxor1.c
+++ b/gcc/testsuite/gcc.dg/binop-notxor1.c
@@ -8,4 +8,3 @@ foo (_Bool a, _Bool b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-notxor2.c b/gcc/testsuite/gcc.dg/binop-notxor2.c
index 9f34cf284f4..4a8d5869224 100644
--- a/gcc/testsuite/gcc.dg/binop-notxor2.c
+++ b/gcc/testsuite/gcc.dg/binop-notxor2.c
@@ -8,4 +8,3 @@ foo (_Bool a, _Bool b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-xor1.c b/gcc/testsuite/gcc.dg/binop-xor1.c
index c6a19cf01d3..e2ea938dd91 100644
--- a/gcc/testsuite/gcc.dg/binop-xor1.c
+++ b/gcc/testsuite/gcc.dg/binop-xor1.c
@@ -8,4 +8,3 @@ foo (int a, int b, int c)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\^" 1 "optimized" { xfail logical_op_short_circuit } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-xor2.c b/gcc/testsuite/gcc.dg/binop-xor2.c
index 51b41dd7ff6..1da1a26aa87 100644
--- a/gcc/testsuite/gcc.dg/binop-xor2.c
+++ b/gcc/testsuite/gcc.dg/binop-xor2.c
@@ -11,4 +11,3 @@ foo (int a, int b)
    it in the real test.  */
 /* { dg-final { scan-tree-dump-times "<bb\[^>\]*>" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\\\^" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-xor3.c b/gcc/testsuite/gcc.dg/binop-xor3.c
index 4c2694a77d7..82a17b89fbe 100644
--- a/gcc/testsuite/gcc.dg/binop-xor3.c
+++ b/gcc/testsuite/gcc.dg/binop-xor3.c
@@ -8,4 +8,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\^" 1 "optimized" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-xor4.c b/gcc/testsuite/gcc.dg/binop-xor4.c
index f87950a3335..bafa4bb32ac 100644
--- a/gcc/testsuite/gcc.dg/binop-xor4.c
+++ b/gcc/testsuite/gcc.dg/binop-xor4.c
@@ -11,4 +11,3 @@ foo (int a, int b, int c)
    it in the real test.  */
 /* { dg-final { scan-tree-dump-times "<bb\[^>\]*>" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\\\^" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/binop-xor5.c b/gcc/testsuite/gcc.dg/binop-xor5.c
index 256c4bfa82a..55d59450a76 100644
--- a/gcc/testsuite/gcc.dg/binop-xor5.c
+++ b/gcc/testsuite/gcc.dg/binop-xor5.c
@@ -12,4 +12,3 @@ foo (int a, int b, int c)
 /* { dg-final { scan-tree-dump-times "<bb\[^>\]*>" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\\\^" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\&" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-arith-overflow-1.c b/gcc/testsuite/gcc.dg/builtin-arith-overflow-1.c
index 4f4afd503fe..5db9368927e 100644
--- a/gcc/testsuite/gcc.dg/builtin-arith-overflow-1.c
+++ b/gcc/testsuite/gcc.dg/builtin-arith-overflow-1.c
@@ -129,4 +129,3 @@ main ()
 /* { dg-final { scan-tree-dump-not "ADD_OVERFLOW" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "SUB_OVERFLOW" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "MUL_OVERFLOW" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-arith-overflow-2.c b/gcc/testsuite/gcc.dg/builtin-arith-overflow-2.c
index e64a400d389..1a9e66637a5 100644
--- a/gcc/testsuite/gcc.dg/builtin-arith-overflow-2.c
+++ b/gcc/testsuite/gcc.dg/builtin-arith-overflow-2.c
@@ -107,4 +107,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "ADD_OVERFLOW" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "SUB_OVERFLOW" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "MUL_OVERFLOW" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-assume-aligned-1.c b/gcc/testsuite/gcc.dg/builtin-assume-aligned-1.c
index 46b65a76877..a74eccee4ab 100644
--- a/gcc/testsuite/gcc.dg/builtin-assume-aligned-1.c
+++ b/gcc/testsuite/gcc.dg/builtin-assume-aligned-1.c
@@ -38,4 +38,3 @@ test2 (double *out1, double *out2, double *out3, double *in1,
 }
 
 /* { dg-final { scan-tree-dump-not "__builtin_assume_aligned" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-6.c b/gcc/testsuite/gcc.dg/builtin-bswap-6.c
index efda8706e63..152b7a6b9a9 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-6.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-6.c
@@ -39,4 +39,3 @@ int foo4 (uint32_t a, uint32_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapsi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-6a.c b/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
index f93bcde1027..a8b953122b0 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-6a.c
@@ -41,4 +41,3 @@ int foo4 (uint32_t a, uint32_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapsi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-7.c b/gcc/testsuite/gcc.dg/builtin-bswap-7.c
index 4a42bfc65c9..3e1718d906d 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-7.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-7.c
@@ -40,4 +40,3 @@ int foo4 (uint64_t a, uint64_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapdi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-7a.c b/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
index 5712e219961..92b48cc4168 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-7a.c
@@ -41,4 +41,3 @@ int foo4 (uint64_t a, uint64_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapdi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-8.c b/gcc/testsuite/gcc.dg/builtin-bswap-8.c
index 38c00a31420..3dbde6ba0ab 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-8.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-8.c
@@ -43,4 +43,3 @@ uint32_t foo7 (uint32_t a, uint32_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapsi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-9.c b/gcc/testsuite/gcc.dg/builtin-bswap-9.c
index 4a2cf7de10e..4cf28e94fd8 100644
--- a/gcc/testsuite/gcc.dg/builtin-bswap-9.c
+++ b/gcc/testsuite/gcc.dg/builtin-bswap-9.c
@@ -43,4 +43,3 @@ uint64_t foo7 (uint64_t a, uint64_t b)
 }
 
 /* { dg-final { scan-rtl-dump-not "bswapdi" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-10.c b/gcc/testsuite/gcc.dg/builtin-object-size-10.c
index 956d4a860e3..8d6fd974be0 100644
--- a/gcc/testsuite/gcc.dg/builtin-object-size-10.c
+++ b/gcc/testsuite/gcc.dg/builtin-object-size-10.c
@@ -24,4 +24,3 @@ foo(char *x)
 
 /* { dg-final { scan-tree-dump "maximum object size 21" "objsz1" } } */
 /* { dg-final { scan-tree-dump "maximum subobject size 16" "objsz1" } } */
-/* { dg-final { cleanup-tree-dump "objsz1" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-unreachable-2.c b/gcc/testsuite/gcc.dg/builtin-unreachable-2.c
index 13bdb9f7395..f6c5ab709d7 100644
--- a/gcc/testsuite/gcc.dg/builtin-unreachable-2.c
+++ b/gcc/testsuite/gcc.dg/builtin-unreachable-2.c
@@ -16,5 +16,3 @@ f (int i)
 }
 /* { dg-final { scan-tree-dump-not "foo" "optimized" } } */
 /* { dg-final { scan-rtl-dump-not "\\(if_then_else" "cse1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
-/* { dg-final { cleanup-rtl-dump "cse1" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-unreachable-5.c b/gcc/testsuite/gcc.dg/builtin-unreachable-5.c
index 904a474a57f..ba87bdd735e 100644
--- a/gcc/testsuite/gcc.dg/builtin-unreachable-5.c
+++ b/gcc/testsuite/gcc.dg/builtin-unreachable-5.c
@@ -20,4 +20,3 @@ foo (int a)
 /* { dg-final { scan-tree-dump-times "goto" 0 "fab1" } } */
 /* { dg-final { scan-tree-dump-times "L1:" 0 "fab1" } } */
 /* { dg-final { scan-tree-dump-times "__builtin_unreachable" 0 "fab1" } } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/builtin-unreachable-6.c b/gcc/testsuite/gcc.dg/builtin-unreachable-6.c
index 2fe06ac7a07..2f8ca369546 100644
--- a/gcc/testsuite/gcc.dg/builtin-unreachable-6.c
+++ b/gcc/testsuite/gcc.dg/builtin-unreachable-6.c
@@ -18,4 +18,3 @@ lab2:
 
 /* { dg-final { scan-tree-dump-times "lab:" 1 "fab1" } } */
 /* { dg-final { scan-tree-dump-times "__builtin_unreachable" 1 "fab1" } } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-43.c b/gcc/testsuite/gcc.dg/builtins-43.c
index 85d96b6cb0c..f7c318edf08 100644
--- a/gcc/testsuite/gcc.dg/builtins-43.c
+++ b/gcc/testsuite/gcc.dg/builtins-43.c
@@ -52,8 +52,6 @@ main ()
 
 /* Check that all instances of __builtin_isnan were folded.  */
 /* { dg-final { scan-tree-dump-times "isnan" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
 /* Check that all instances of link_error were subject to DCE.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-44.c b/gcc/testsuite/gcc.dg/builtins-44.c
index 1f1eaf0f6a5..12676239b06 100644
--- a/gcc/testsuite/gcc.dg/builtins-44.c
+++ b/gcc/testsuite/gcc.dg/builtins-44.c
@@ -55,4 +55,3 @@ main ()
 
 /* Check that all instances of link_error were subject to DCE.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-45.c b/gcc/testsuite/gcc.dg/builtins-45.c
index 15ec33af677..4e354a180e2 100644
--- a/gcc/testsuite/gcc.dg/builtins-45.c
+++ b/gcc/testsuite/gcc.dg/builtins-45.c
@@ -54,4 +54,3 @@ main ()
 
 /* Check that all instances of link_error were subject to DCE.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-47.c b/gcc/testsuite/gcc.dg/builtins-47.c
index 9513483cf30..024d7eec80c 100644
--- a/gcc/testsuite/gcc.dg/builtins-47.c
+++ b/gcc/testsuite/gcc.dg/builtins-47.c
@@ -17,4 +17,3 @@ int main ()
 
 /* { dg-final { scan-tree-dump-times "sqrt" 0 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "pow" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-59.c b/gcc/testsuite/gcc.dg/builtins-59.c
index f5c1803d5df..c9b685c83ed 100644
--- a/gcc/testsuite/gcc.dg/builtins-59.c
+++ b/gcc/testsuite/gcc.dg/builtins-59.c
@@ -12,4 +12,3 @@ double test (double x)
 
 /* { dg-final { scan-tree-dump "__builtin_cexpi" "gimple" } } */
 /* { dg-final { scan-tree-dump-not "sincos" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-60.c b/gcc/testsuite/gcc.dg/builtins-60.c
index b57679f36eb..72684197bc7 100644
--- a/gcc/testsuite/gcc.dg/builtins-60.c
+++ b/gcc/testsuite/gcc.dg/builtins-60.c
@@ -13,4 +13,3 @@ double test2 (double x)
 
 /* { dg-final { scan-tree-dump "cos" "gimple" } } */
 /* { dg-final { scan-tree-dump "sin" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-61.c b/gcc/testsuite/gcc.dg/builtins-61.c
index a3310afbac2..d7813409a66 100644
--- a/gcc/testsuite/gcc.dg/builtins-61.c
+++ b/gcc/testsuite/gcc.dg/builtins-61.c
@@ -30,4 +30,3 @@ double test4(double x, double y)
 /* { dg-final { scan-tree-dump "sin" "optimized" } } */
 /* { dg-final { scan-tree-dump "cos" "optimized" } } */
 /* { dg-final { scan-tree-dump "return 0.0" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/builtins-62.c b/gcc/testsuite/gcc.dg/builtins-62.c
index db62696938e..e0420cea688 100644
--- a/gcc/testsuite/gcc.dg/builtins-62.c
+++ b/gcc/testsuite/gcc.dg/builtins-62.c
@@ -38,4 +38,3 @@ double test4 (double x)
 }
 
 /* { dg-final { scan-tree-dump-times "cexpi" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/cdce1.c b/gcc/testsuite/gcc.dg/cdce1.c
index 2123f7fd8e9..02b47c0f9bf 100644
--- a/gcc/testsuite/gcc.dg/cdce1.c
+++ b/gcc/testsuite/gcc.dg/cdce1.c
@@ -1,8 +1,7 @@
 /* { dg-do  run  } */
 /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details  -lm" } */
 /* { dg-require-effective-target int32plus } */
-/* { dg-final { scan-tree-dump  "cdce1.c:17: note: function call is shrink-wrapped into error conditions\."  "cdce" } } */
-/* { dg-final { cleanup-tree-dump "cdce" } } */
+/* { dg-final { scan-tree-dump  "cdce1.c:16: note: function call is shrink-wrapped into error conditions\."  "cdce" } } */
 /* { dg-require-effective-target large_double } */
 
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/cdce2.c b/gcc/testsuite/gcc.dg/cdce2.c
index a461ce7ac30..55030f1841d 100644
--- a/gcc/testsuite/gcc.dg/cdce2.c
+++ b/gcc/testsuite/gcc.dg/cdce2.c
@@ -1,8 +1,7 @@
 /* { dg-do  run  } */
 /* { dg-skip-if "doubles are floats" { "avr-*-*" } { "*" } { "" } } */
 /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details  -lm" } */
-/* { dg-final { scan-tree-dump  "cdce2.c:16: note: function call is shrink-wrapped into error conditions\." "cdce" } }*/
-/* { dg-final { cleanup-tree-dump "cdce" } } */
+/* { dg-final { scan-tree-dump  "cdce2.c:15: note: function call is shrink-wrapped into error conditions\." "cdce" } } */
  
 #include <stdlib.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.dg/combine-clobber.c b/gcc/testsuite/gcc.dg/combine-clobber.c
index bf0d88cc756..09e800067b9 100644
--- a/gcc/testsuite/gcc.dg/combine-clobber.c
+++ b/gcc/testsuite/gcc.dg/combine-clobber.c
@@ -19,4 +19,3 @@ int f(int a, int b) { return -(a == b); }
 
 /* This regexp works for reg parameters as well as mem parameters.  */
 /* { dg-final { scan-rtl-dump {neg:SI[^:]*eq:SI[^:]*:SI} "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c b/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
index 162015c964c..f4e53c83d67 100644
--- a/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
+++ b/gcc/testsuite/gcc.dg/combine_ashiftrt_1.c
@@ -18,4 +18,3 @@ foo (int64_t a)
    the *attempt* to match this RTL pattern, regardless of whether an
    actual insn may be found on the platform.  */
 /* { dg-final { scan-rtl-dump "\\(neg:DI \\(ge:DI" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/combine_ashiftrt_2.c b/gcc/testsuite/gcc.dg/combine_ashiftrt_2.c
index 7d6721dd56a..b499544658f 100644
--- a/gcc/testsuite/gcc.dg/combine_ashiftrt_2.c
+++ b/gcc/testsuite/gcc.dg/combine_ashiftrt_2.c
@@ -18,4 +18,3 @@ foo (int32_t a)
    the *attempt* to match this RTL pattern, regardless of whether an
    actual insn may be found on the platform.  */
 /* { dg-final { scan-rtl-dump "\\(neg:SI \\(ge:SI" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
diff --git a/gcc/testsuite/gcc.dg/const-uniq-1.c b/gcc/testsuite/gcc.dg/const-uniq-1.c
index 497efed8a4f..2cb4f8a56cd 100644
--- a/gcc/testsuite/gcc.dg/const-uniq-1.c
+++ b/gcc/testsuite/gcc.dg/const-uniq-1.c
@@ -21,4 +21,3 @@ int lookup2 (int i)
 }
 
 /* { dg-final { scan-tree-dump-times "L\\\$?C\\\.*0" 2 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2s.c b/gcc/testsuite/gcc.dg/cpp/direct2s.c
index 59232141944..f73e75d57b3 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2s.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2s.c
@@ -41,4 +41,3 @@ void f ()
   int j = Y;    /* { dg-error "undeclared|for each" "no macro Y" } */
 }
 
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/paste4.c b/gcc/testsuite/gcc.dg/cpp/paste4.c
index dfc455ded70..a32c52918f2 100644
--- a/gcc/testsuite/gcc.dg/cpp/paste4.c
+++ b/gcc/testsuite/gcc.dg/cpp/paste4.c
@@ -15,4 +15,3 @@ int main ()
   return 0;
 }
 
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/separate-1.c b/gcc/testsuite/gcc.dg/cpp/separate-1.c
index 33d910b3c00..99a2587ce6f 100644
--- a/gcc/testsuite/gcc.dg/cpp/separate-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/separate-1.c
@@ -14,4 +14,3 @@ int FOO(
 int baz FOO /* { dg-error "parse error|syntax error|expected" "error on this line" } */
 ;
 
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
index 4e856ec0946..fe82585864a 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-1.c
@@ -15,4 +15,3 @@ int varj;
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"varh\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0x)?8\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"vari\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xc|12)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"varj\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xd|13)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
index 46f57e6708f..5c4d3b8ecc7 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-3.c
@@ -15,4 +15,3 @@ int varj;
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"varh\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0x)?8\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"vari\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xc|12)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"varj\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xd|13)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
index de5a1cc13dc..d646f5983b3 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41445-5.c
@@ -14,4 +14,3 @@ int A(B) ;
 
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"vari\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xa|10)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
 /* { dg-final { scan-assembler "DW_TAG_variable\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\"varj\[^\\r\\n\]*DW_AT_name(\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_)*\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*\[^0-9a-fA-FxX](0xa|10)\[^0-9a-fA-FxX]\[^\\r\\n\]*DW_AT_decl_line" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41543.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41543.c
index 872ed7da618..6b3234be5b9 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr41543.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr41543.c
@@ -11,4 +11,3 @@ foo (va_list ap)
 }
 
 /* { dg-final { scan-assembler-not "DW_AT_decl_file\[^\\r\\n\]*\(pr41543\.i\)" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
index a859ac91a5d..3dc8e6719bb 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
@@ -5,4 +5,3 @@ typedef struct _Harry { int dummy; } Harry_t;
 Harry_t harry;
 
 /* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
index dfbfa2fed1d..abc1dc1e6c1 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
@@ -5,4 +5,3 @@ typedef const struct _Harry { int dummy; } Harry_t;
 Harry_t harry;
 
 /* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
index c8039ef6d41..78234e93d65 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
@@ -5,4 +5,3 @@ typedef struct _Harry { int dummy; } Harry_t;
 const Harry_t harry[5];
 
 /* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
index bd2351bd907..89a048df4a3 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
@@ -5,4 +5,3 @@ typedef const struct _Harry { int dummy; } Harry_t;
 Harry_t harry[10];
 
 /* { dg-final { scan-assembler "DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name: \"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/dse.c b/gcc/testsuite/gcc.dg/dse.c
index 4a859ae03e7..6281214b0ab 100644
--- a/gcc/testsuite/gcc.dg/dse.c
+++ b/gcc/testsuite/gcc.dg/dse.c
@@ -28,5 +28,4 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse*" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-abs-3.c b/gcc/testsuite/gcc.dg/fold-abs-3.c
index d151a8d7aec..fcbcb4bde08 100644
--- a/gcc/testsuite/gcc.dg/fold-abs-3.c
+++ b/gcc/testsuite/gcc.dg/fold-abs-3.c
@@ -6,4 +6,3 @@ int f (int a) {
 }
 
 /* { dg-final { scan-tree-dump-times "ABS" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-abs-4.c b/gcc/testsuite/gcc.dg/fold-abs-4.c
index 8bf02a808b0..38a7d9dabb6 100644
--- a/gcc/testsuite/gcc.dg/fold-abs-4.c
+++ b/gcc/testsuite/gcc.dg/fold-abs-4.c
@@ -12,4 +12,3 @@ int g (_Complex float a) {
 }
 
 /* { dg-final { scan-tree-dump-times "ABS" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-abs-5.c b/gcc/testsuite/gcc.dg/fold-abs-5.c
index dba4e4bf89a..4a892afe8ea 100644
--- a/gcc/testsuite/gcc.dg/fold-abs-5.c
+++ b/gcc/testsuite/gcc.dg/fold-abs-5.c
@@ -8,4 +8,3 @@ int test (int a, int b, int sum)
 }
 
 /* { dg-final { scan-tree-dump "ABS" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-addr-1.c b/gcc/testsuite/gcc.dg/fold-addr-1.c
index 7323ffdabf7..a0597813ad5 100644
--- a/gcc/testsuite/gcc.dg/fold-addr-1.c
+++ b/gcc/testsuite/gcc.dg/fold-addr-1.c
@@ -7,4 +7,3 @@ int bar(char p1, char p2)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-alloca-1.c b/gcc/testsuite/gcc.dg/fold-alloca-1.c
index 93f28cfa1ae..9cace17c500 100644
--- a/gcc/testsuite/gcc.dg/fold-alloca-1.c
+++ b/gcc/testsuite/gcc.dg/fold-alloca-1.c
@@ -11,4 +11,3 @@ int main (int argc, char *argv[]) {
 	return 0;
 }
 /* { dg-final { scan-tree-dump-times "link_error" 0 "cfg" } } */
-/* { dg-final { cleanup-tree-dump "cfg" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-andxor-1.c b/gcc/testsuite/gcc.dg/fold-andxor-1.c
index cc46577148a..dcef3f8377b 100644
--- a/gcc/testsuite/gcc.dg/fold-andxor-1.c
+++ b/gcc/testsuite/gcc.dg/fold-andxor-1.c
@@ -25,5 +25,4 @@ int test4(int g, int h)
 /* { dg-final { scan-tree-dump-times "~c \& d" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "~f \& e" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "~h \& g" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-bitand-1.c b/gcc/testsuite/gcc.dg/fold-bitand-1.c
index f490b153b2d..68a7c27a6bb 100644
--- a/gcc/testsuite/gcc.dg/fold-bitand-1.c
+++ b/gcc/testsuite/gcc.dg/fold-bitand-1.c
@@ -30,4 +30,3 @@ unsigned f4(void)
 /* { dg-final { scan-tree-dump-times "\&c4 \& 3" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "\&c8 \& 3" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-bitand-2.c b/gcc/testsuite/gcc.dg/fold-bitand-2.c
index de2e67449b1..5809965c598 100644
--- a/gcc/testsuite/gcc.dg/fold-bitand-2.c
+++ b/gcc/testsuite/gcc.dg/fold-bitand-2.c
@@ -39,4 +39,3 @@ unsigned f5 (void)
 /* { dg-final { scan-tree-dump-times "return 1" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 2" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 3" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-bitand-3.c b/gcc/testsuite/gcc.dg/fold-bitand-3.c
index 43d765bbf2e..c0fe87d3647 100644
--- a/gcc/testsuite/gcc.dg/fold-bitand-3.c
+++ b/gcc/testsuite/gcc.dg/fold-bitand-3.c
@@ -22,4 +22,3 @@ int f2 (void)
 
 /* { dg-final { scan-tree-dump-times "\& 3" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 1" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-bitand-4.c b/gcc/testsuite/gcc.dg/fold-bitand-4.c
index dba83615dfe..9ca2842fc57 100644
--- a/gcc/testsuite/gcc.dg/fold-bitand-4.c
+++ b/gcc/testsuite/gcc.dg/fold-bitand-4.c
@@ -13,4 +13,3 @@ unsigned bar (unsigned i)
 
 /* { dg-final { scan-tree-dump-times "\\\&" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\\& 4;" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-compare-1.c b/gcc/testsuite/gcc.dg/fold-compare-1.c
index 8d53acd87b3..8ab21c05b9d 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-1.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-1.c
@@ -49,5 +49,4 @@ int test8(int l)
 /* { dg-final { scan-tree-dump-times "j >= i" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "k >= -3" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "l < -2" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-compare-2.c b/gcc/testsuite/gcc.dg/fold-compare-2.c
index 15ea462d440..f94fe042717 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-2.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-2.c
@@ -16,5 +16,4 @@ main(void)
 }
 
 /* { dg-final { scan-tree-dump-times "Removing basic block" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-compare-3.c b/gcc/testsuite/gcc.dg/fold-compare-3.c
index d38a945aeec..f8a38b0994b 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-3.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-3.c
@@ -156,4 +156,3 @@ void bla4ge (int var)
 /* { dg-final { scan-tree-dump-times "this_comparison_is_not_decidable" 12 "cfg" } } */
 /* { dg-final { scan-tree-dump-times "if " 12 "cfg" } } */
 
-/* { dg-final { cleanup-tree-dump "cfg" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-compare-4.c b/gcc/testsuite/gcc.dg/fold-compare-4.c
index d4bb64ad2bd..b7ccc303f55 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-4.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-4.c
@@ -20,4 +20,3 @@ int test4 (int a)
 
 /* { dg-final { scan-tree-dump-times "b == 0" 2 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-compare-5.c b/gcc/testsuite/gcc.dg/fold-compare-5.c
index 9ec8c33f63e..7d9343ef78c 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-5.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-5.c
@@ -17,4 +17,3 @@ int test3 (int a)
 /* { dg-final { scan-tree-dump-times "return 2 - a == a" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return 1" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-compare-6.c b/gcc/testsuite/gcc.dg/fold-compare-6.c
index 7ddf6b44dab..0c4c657d947 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-6.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-6.c
@@ -9,4 +9,3 @@ int foo (void)
 }
 
 /* { dg-final { scan-tree-dump "xlcbug = 1;" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-compare-8.c b/gcc/testsuite/gcc.dg/fold-compare-8.c
index 2fb5fe9d1d4..45456f40382 100644
--- a/gcc/testsuite/gcc.dg/fold-compare-8.c
+++ b/gcc/testsuite/gcc.dg/fold-compare-8.c
@@ -8,4 +8,3 @@ foo (int x, int y)
 }
 
 /* { dg-final { scan-tree-dump "x < y" "original"  { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-complex-1.c b/gcc/testsuite/gcc.dg/fold-complex-1.c
index a9ba0fd59c4..cf07cef07ed 100644
--- a/gcc/testsuite/gcc.dg/fold-complex-1.c
+++ b/gcc/testsuite/gcc.dg/fold-complex-1.c
@@ -8,4 +8,3 @@ foo (_Complex float x)
 }
 
 /* { dg-final { scan-tree-dump-times "COMPLEX_EXPR" 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-cond-1.c b/gcc/testsuite/gcc.dg/fold-cond-1.c
index b6e8a0ec355..18ddc357a02 100644
--- a/gcc/testsuite/gcc.dg/fold-cond-1.c
+++ b/gcc/testsuite/gcc.dg/fold-cond-1.c
@@ -26,4 +26,3 @@ _Bool test4(int g, int h)
 /* { dg-final { scan-tree-dump-times "e == 0 \&\& f != 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "g == 0 \\? h != 0 : 1" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "g != 0 \\? 1 : h != 0" 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-convnotconv-1.c b/gcc/testsuite/gcc.dg/fold-convnotconv-1.c
index fc07903c515..decfbc71e31 100644
--- a/gcc/testsuite/gcc.dg/fold-convnotconv-1.c
+++ b/gcc/testsuite/gcc.dg/fold-convnotconv-1.c
@@ -13,5 +13,4 @@ unsigned int test2(unsigned int b)
 
 /* { dg-final { scan-tree-dump-times "~a" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "~b" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-convround-1.c b/gcc/testsuite/gcc.dg/fold-convround-1.c
index 86612aa81b3..4d8bc61d550 100644
--- a/gcc/testsuite/gcc.dg/fold-convround-1.c
+++ b/gcc/testsuite/gcc.dg/fold-convround-1.c
@@ -26,5 +26,4 @@ unsigned long long test3(double x)
 /* { dg-final { scan-tree-dump-times "__builtin_llfloor" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "__builtin_lceil" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "__builtin_llceil" 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-cstvecshift.c b/gcc/testsuite/gcc.dg/fold-cstvecshift.c
index 51f42d42bc1..1307d059a50 100644
--- a/gcc/testsuite/gcc.dg/fold-cstvecshift.c
+++ b/gcc/testsuite/gcc.dg/fold-cstvecshift.c
@@ -10,4 +10,3 @@ void f (vec *r)
 }
 
 /* { dg-final { scan-tree-dump "{ 4, 6, 8, 10 }" "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-div-1.c b/gcc/testsuite/gcc.dg/fold-div-1.c
index 533908c300c..c1c7250f882 100644
--- a/gcc/testsuite/gcc.dg/fold-div-1.c
+++ b/gcc/testsuite/gcc.dg/fold-div-1.c
@@ -26,5 +26,4 @@ float i(float x)
 
 /* { dg-final { scan-tree-dump-times " \\* " 2 "gimple" } } */
 /* { dg-final { scan-tree-dump-times " / " 2 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-div-2.c b/gcc/testsuite/gcc.dg/fold-div-2.c
index bfd07d1c482..5432c81354e 100644
--- a/gcc/testsuite/gcc.dg/fold-div-2.c
+++ b/gcc/testsuite/gcc.dg/fold-div-2.c
@@ -9,5 +9,4 @@ double f(double x)
 /* Division should be turned into 1.0.  */
 
 /* { dg-final { scan-tree-dump-not " / " "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-div-3.c b/gcc/testsuite/gcc.dg/fold-div-3.c
index 2e78757fa72..4a6420e724b 100644
--- a/gcc/testsuite/gcc.dg/fold-div-3.c
+++ b/gcc/testsuite/gcc.dg/fold-div-3.c
@@ -12,4 +12,3 @@ apply_frontend_param (unsigned int spi_bias)
 /* Make sure we perform the division in the narrower type.  */
 
 /* { dg-final { scan-tree-dump "spi_bias = spi_bias / 1008;" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqand-1.c b/gcc/testsuite/gcc.dg/fold-eqand-1.c
index 6ed5b6db0e2..ab9dae01676 100644
--- a/gcc/testsuite/gcc.dg/fold-eqand-1.c
+++ b/gcc/testsuite/gcc.dg/fold-eqand-1.c
@@ -14,4 +14,3 @@ unsigned bar (unsigned c, unsigned d)
 
 /* { dg-final { scan-tree-dump-times "a \\^ b" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "c \\^ d" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqandnot-1.c b/gcc/testsuite/gcc.dg/fold-eqandnot-1.c
index 5ed65e8933b..972c20329ac 100644
--- a/gcc/testsuite/gcc.dg/fold-eqandnot-1.c
+++ b/gcc/testsuite/gcc.dg/fold-eqandnot-1.c
@@ -30,4 +30,3 @@ int test5(int e)
 /* { dg-final { scan-tree-dump-times "\\(c \& 4\\) == 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(d \& 4\\) == 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(e \& 4\\) == 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqandshift-1.c b/gcc/testsuite/gcc.dg/fold-eqandshift-1.c
index 055f398af0b..d2154c88aa1 100644
--- a/gcc/testsuite/gcc.dg/fold-eqandshift-1.c
+++ b/gcc/testsuite/gcc.dg/fold-eqandshift-1.c
@@ -53,4 +53,3 @@ void test6(unsigned int f)
 /* { dg-final { scan-tree-dump-times "d >> 3 \& 4" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "e < 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "if \\(0\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqandshift-2.c b/gcc/testsuite/gcc.dg/fold-eqandshift-2.c
index 14ffb852dd4..936b89f2917 100644
--- a/gcc/testsuite/gcc.dg/fold-eqandshift-2.c
+++ b/gcc/testsuite/gcc.dg/fold-eqandshift-2.c
@@ -18,5 +18,4 @@ void baz (unsigned int b)
 
 /* { dg-final { scan-tree-dump-times "\\(a \& 4\\) != 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(b \& 4\\) == 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-eqandshift-3.c b/gcc/testsuite/gcc.dg/fold-eqandshift-3.c
index 5ed744ab536..50978b5b6dc 100644
--- a/gcc/testsuite/gcc.dg/fold-eqandshift-3.c
+++ b/gcc/testsuite/gcc.dg/fold-eqandshift-3.c
@@ -26,4 +26,3 @@ int test2 (unsigned long b)
 
 /* { dg-final { scan-tree-dump-times "\\(a \& 1073741824\\) != 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(b \& 1073741824\\) != 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqcmplx-1.c b/gcc/testsuite/gcc.dg/fold-eqcmplx-1.c
index 32f4396ba90..6c8e05f2589 100644
--- a/gcc/testsuite/gcc.dg/fold-eqcmplx-1.c
+++ b/gcc/testsuite/gcc.dg/fold-eqcmplx-1.c
@@ -7,4 +7,3 @@ int foo(float x, float y)
 }
 
 /* { dg-final { scan-tree-dump-times "x == y" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqxor-1.c b/gcc/testsuite/gcc.dg/fold-eqxor-1.c
index d220e42bbfa..5ded86a1d95 100644
--- a/gcc/testsuite/gcc.dg/fold-eqxor-1.c
+++ b/gcc/testsuite/gcc.dg/fold-eqxor-1.c
@@ -25,4 +25,3 @@ unsigned int test4(unsigned int g, unsigned int h)
 /* { dg-final { scan-tree-dump-times "c != d" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "e == f" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "g != h" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqxor-2.c b/gcc/testsuite/gcc.dg/fold-eqxor-2.c
index ee5ec9fa5ae..02eef394877 100644
--- a/gcc/testsuite/gcc.dg/fold-eqxor-2.c
+++ b/gcc/testsuite/gcc.dg/fold-eqxor-2.c
@@ -25,4 +25,3 @@ int test4(int g, int h)
 /* { dg-final { scan-tree-dump-times "d != 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "e == 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "g != 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqxor-3.c b/gcc/testsuite/gcc.dg/fold-eqxor-3.c
index a087375aee9..d9cfb800774 100644
--- a/gcc/testsuite/gcc.dg/fold-eqxor-3.c
+++ b/gcc/testsuite/gcc.dg/fold-eqxor-3.c
@@ -25,4 +25,3 @@ int test4(int g, int h)
 /* { dg-final { scan-tree-dump-times "c != 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "e == 4" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "g != 2" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-eqxor-4.c b/gcc/testsuite/gcc.dg/fold-eqxor-4.c
index bdf31bc8850..7144fea04b1 100644
--- a/gcc/testsuite/gcc.dg/fold-eqxor-4.c
+++ b/gcc/testsuite/gcc.dg/fold-eqxor-4.c
@@ -19,4 +19,3 @@ int test3(int e, int f)
 /* { dg-final { scan-tree-dump-times "a == 4" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "b == c" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "e \\^ 2" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-even-1.c b/gcc/testsuite/gcc.dg/fold-even-1.c
index 8e6539c924d..94711ab1499 100644
--- a/gcc/testsuite/gcc.dg/fold-even-1.c
+++ b/gcc/testsuite/gcc.dg/fold-even-1.c
@@ -30,4 +30,3 @@ int test5(int e)
 /* { dg-final { scan-tree-dump-times "\\(c \& 1\\) == 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(d \& 1\\) == 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\(e \& 1\\) == 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-minus-1.c b/gcc/testsuite/gcc.dg/fold-minus-1.c
index c0fb89a01ae..b3f096afc04 100644
--- a/gcc/testsuite/gcc.dg/fold-minus-1.c
+++ b/gcc/testsuite/gcc.dg/fold-minus-1.c
@@ -17,4 +17,3 @@ void g(vec*x,vec*y,vec*z){
 /* { dg-final { scan-tree-dump-not "/" "gimple"} } */
 /* { dg-final { scan-tree-dump-not "\\\+" "gimple"} } */
 /* { dg-final { scan-tree-dump "{ -13, -13 }" "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-mod-1.c b/gcc/testsuite/gcc.dg/fold-mod-1.c
index bd4322e2a80..4ceb90d4eda 100644
--- a/gcc/testsuite/gcc.dg/fold-mod-1.c
+++ b/gcc/testsuite/gcc.dg/fold-mod-1.c
@@ -23,4 +23,3 @@ unsigned int k (unsigned int d) {
 
 /* { dg-final { scan-tree-dump "a % (4294967288|0x0fffffff8)" "gimple" } } */
 /* { dg-final { scan-tree-dump-times " & 7" 3 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-mulconj-1.c b/gcc/testsuite/gcc.dg/fold-mulconj-1.c
index 0e04653e393..27b526f9115 100644
--- a/gcc/testsuite/gcc.dg/fold-mulconj-1.c
+++ b/gcc/testsuite/gcc.dg/fold-mulconj-1.c
@@ -13,4 +13,3 @@ _Complex int bar(_Complex int z)
 }
 
 /* { dg-final { scan-tree-dump-times "CONJ_EXPR" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-notunord.c b/gcc/testsuite/gcc.dg/fold-notunord.c
index edfe3cd0292..ca345154ac2 100644
--- a/gcc/testsuite/gcc.dg/fold-notunord.c
+++ b/gcc/testsuite/gcc.dg/fold-notunord.c
@@ -7,4 +7,3 @@ int f (double d)
 }
 
 /* { dg-final { scan-tree-dump " ord " "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-perm.c b/gcc/testsuite/gcc.dg/fold-perm.c
index 2270c7b0f54..9cfc2db36aa 100644
--- a/gcc/testsuite/gcc.dg/fold-perm.c
+++ b/gcc/testsuite/gcc.dg/fold-perm.c
@@ -17,4 +17,3 @@ void fun (veci *f, veci *g, veci *h, veci *i)
 /* { dg-final { scan-tree-dump "VEC_PERM_EXPR.*{ 3, 3, 0, 2 }" "ccp1" } } */
 /* { dg-final { scan-tree-dump "VEC_PERM_EXPR.*{ 1, 1, 3, 2 }" "ccp1" } } */
 /* { dg-final { scan-tree-dump-times "VEC_PERM_EXPR" 2 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-plusmult-2.c b/gcc/testsuite/gcc.dg/fold-plusmult-2.c
index fd5376220a5..82f9898ba8a 100644
--- a/gcc/testsuite/gcc.dg/fold-plusmult-2.c
+++ b/gcc/testsuite/gcc.dg/fold-plusmult-2.c
@@ -17,4 +17,3 @@ int bar (int i)
 
 /* { dg-final { scan-tree-dump "i \\\* 4 \\\+ 2" "original" } } */
 /* { dg-final { scan-tree-dump "\\\(i \\\+ 2\\\) \\\* 2" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-plusmult.c b/gcc/testsuite/gcc.dg/fold-plusmult.c
index d584b958874..1781552081a 100644
--- a/gcc/testsuite/gcc.dg/fold-plusmult.c
+++ b/gcc/testsuite/gcc.dg/fold-plusmult.c
@@ -12,4 +12,3 @@ int test2 (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "<a> \\\* 4" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-plusnot-1.c b/gcc/testsuite/gcc.dg/fold-plusnot-1.c
index 81ddf46d6d0..3fc22363b3a 100644
--- a/gcc/testsuite/gcc.dg/fold-plusnot-1.c
+++ b/gcc/testsuite/gcc.dg/fold-plusnot-1.c
@@ -26,5 +26,4 @@ unsigned int test4(unsigned int d)
 /* { dg-final { scan-tree-dump-times "\\+ b" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\+ c" 0 "original" } } */
 /* { dg-final { scan-tree-dump-times "\\+ d" 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-reassoc-1.c b/gcc/testsuite/gcc.dg/fold-reassoc-1.c
index 88d5dd89cd7..46ef07118ad 100644
--- a/gcc/testsuite/gcc.dg/fold-reassoc-1.c
+++ b/gcc/testsuite/gcc.dg/fold-reassoc-1.c
@@ -7,4 +7,3 @@ double foo (double x)
 }
 
 /* { dg-final { scan-tree-dump "return 0.0;" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-reassoc-2.c b/gcc/testsuite/gcc.dg/fold-reassoc-2.c
index e2dd100b71e..98890b10be3 100644
--- a/gcc/testsuite/gcc.dg/fold-reassoc-2.c
+++ b/gcc/testsuite/gcc.dg/fold-reassoc-2.c
@@ -11,4 +11,3 @@ int bar (int i)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-reassoc-3.c b/gcc/testsuite/gcc.dg/fold-reassoc-3.c
index be645278628..174b35bab1a 100644
--- a/gcc/testsuite/gcc.dg/fold-reassoc-3.c
+++ b/gcc/testsuite/gcc.dg/fold-reassoc-3.c
@@ -14,4 +14,3 @@ foo (void)
 
 /* { dg-final { scan-tree-dump-not " - " "original" } } */
 /* { dg-final { scan-tree-dump-not " \\+ " "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-rotate-1.c b/gcc/testsuite/gcc.dg/fold-rotate-1.c
index c04447fb3cf..19384f64d9e 100644
--- a/gcc/testsuite/gcc.dg/fold-rotate-1.c
+++ b/gcc/testsuite/gcc.dg/fold-rotate-1.c
@@ -71,4 +71,3 @@ g3 (unsigned int a)
 int i;
 
 /* { dg-final { scan-tree-dump-times "&" 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-sub.c b/gcc/testsuite/gcc.dg/fold-sub.c
index 28a8dd51fda..f47f124df61 100644
--- a/gcc/testsuite/gcc.dg/fold-sub.c
+++ b/gcc/testsuite/gcc.dg/fold-sub.c
@@ -9,4 +9,3 @@ float f(float x)
 /* Substraction should be turned into 0.  */
 
 /* { dg-final { scan-tree-dump-not " - " "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-xor-1.c b/gcc/testsuite/gcc.dg/fold-xor-1.c
index 52b1ac4670e..a7d05524cf6 100644
--- a/gcc/testsuite/gcc.dg/fold-xor-1.c
+++ b/gcc/testsuite/gcc.dg/fold-xor-1.c
@@ -9,4 +9,3 @@ unsigned int g (unsigned int a, unsigned int b) {
   return ~a ^ ~b;
 }
 /* { dg-final { scan-tree-dump-times "a \\^ b" 2 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-xor-2.c b/gcc/testsuite/gcc.dg/fold-xor-2.c
index 35337c9c9e8..64a4e42e706 100644
--- a/gcc/testsuite/gcc.dg/fold-xor-2.c
+++ b/gcc/testsuite/gcc.dg/fold-xor-2.c
@@ -13,4 +13,3 @@ unsigned int h (unsigned int a, unsigned int b) {
 }
 
 /* { dg-final { scan-tree-dump-times "b \\^ a" 3 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/fold-xorand-1.c b/gcc/testsuite/gcc.dg/fold-xorand-1.c
index 8d4265417c9..3909de7a8ce 100644
--- a/gcc/testsuite/gcc.dg/fold-xorand-1.c
+++ b/gcc/testsuite/gcc.dg/fold-xorand-1.c
@@ -25,5 +25,4 @@ int test4(int g, int h)
 /* { dg-final { scan-tree-dump-times "~c \& d" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "~f \& e" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "~h \& g" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/fold-xornot-1.c b/gcc/testsuite/gcc.dg/fold-xornot-1.c
index c92095d081f..167cc1f34c1 100644
--- a/gcc/testsuite/gcc.dg/fold-xornot-1.c
+++ b/gcc/testsuite/gcc.dg/fold-xornot-1.c
@@ -13,4 +13,3 @@ int bar(int y)
 
 /* { dg-final { scan-tree-dump-times "x \\^ -5" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "y \\^ -5" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
index d0dbc82670b..daf6bb33ffa 100644
--- a/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
+++ b/gcc/testsuite/gcc.dg/goacc/acc_on_device-1.c
@@ -17,4 +17,3 @@ f (void)
 /* Unsuitable to be handled as a builtin, so we're expecting four calls.
    { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 4 "expand" } } */
 
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/barrier-1.c b/gcc/testsuite/gcc.dg/gomp/barrier-1.c
index ef7c9afb18b..42c70e91163 100644
--- a/gcc/testsuite/gcc.dg/gomp/barrier-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/barrier-1.c
@@ -15,4 +15,3 @@ void f2(_Bool p)
 }
 
 /* { dg-final { scan-tree-dump-times "GOMP_barrier" 2 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/combined-1.c b/gcc/testsuite/gcc.dg/gomp/combined-1.c
index 7e23c3256cb..0c0848c5e7c 100644
--- a/gcc/testsuite/gcc.dg/gomp/combined-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/combined-1.c
@@ -21,4 +21,3 @@ int foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_loop_runtime" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/critical-1.c b/gcc/testsuite/gcc.dg/gomp/critical-1.c
index 6f3348c8884..8eca119bd6e 100644
--- a/gcc/testsuite/gcc.dg/gomp/critical-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/critical-1.c
@@ -25,4 +25,3 @@ void foo (void)
 /* { dg-final { scan-tree-dump-times "GOMP_critical_end" 2 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_critical_name_start" 2 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_critical_name_end" 2 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/critical-3.c b/gcc/testsuite/gcc.dg/gomp/critical-3.c
index c0046f57139..6726e6a03d4 100644
--- a/gcc/testsuite/gcc.dg/gomp/critical-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/critical-3.c
@@ -9,4 +9,3 @@ void foo(void)
 }
 
 // { dg-final { scan-tree-dump-times "\\&\\.gomp_critical_user_xyzzy" 2 "ompexp" } }
-// { dg-final { cleanup-tree-dump "ompexp" } }
diff --git a/gcc/testsuite/gcc.dg/gomp/empty.c b/gcc/testsuite/gcc.dg/gomp/empty.c
index c7aba8ffbae..b26664a9fa0 100644
--- a/gcc/testsuite/gcc.dg/gomp/empty.c
+++ b/gcc/testsuite/gcc.dg/gomp/empty.c
@@ -10,4 +10,3 @@ main()
 
 /* There should not be a GOMP_parallel_start call.  */
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_start" 0 "ompexp"} } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/flush-1.c b/gcc/testsuite/gcc.dg/gomp/flush-1.c
index d1a4d4a5bfb..74a24a86105 100644
--- a/gcc/testsuite/gcc.dg/gomp/flush-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/flush-1.c
@@ -21,4 +21,3 @@ void f2(_Bool p)
 }
 
 /* { dg-final { scan-tree-dump-times "__sync_synchronize" 3 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-10.c b/gcc/testsuite/gcc.dg/gomp/for-10.c
index f21404249c7..a93c34fd4f9 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-10.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-10.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-13.c b/gcc/testsuite/gcc.dg/gomp/for-13.c
index 607de49c749..225a23ad23d 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-13.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-13.c
@@ -15,4 +15,3 @@ void foo(void)
 }
 
 // { dg-final { scan-tree-dump-times "omp_data_o" 0 "ompexp" } }
-// { dg-final { cleanup-tree-dump "ompexp" } }
diff --git a/gcc/testsuite/gcc.dg/gomp/for-18.c b/gcc/testsuite/gcc.dg/gomp/for-18.c
index 545f271c80b..3b7f3f76dc0 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-18.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-18.c
@@ -39,4 +39,3 @@ bar (int *a, int i)
 
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_loop_dynamic_start" 4 "ompexp" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_loop_guided_start" 4 "ompexp" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-19.c b/gcc/testsuite/gcc.dg/gomp/for-19.c
index a202ba4799f..ea408e6c10b 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-19.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-19.c
@@ -18,4 +18,3 @@ void foo (int *a, int i, int j, int k, int l, int m)
 /* { dg-final { scan-tree-dump-times "shared\\(k\\)" 0 "gimple" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "shared\\(l\\)" 0 "gimple" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "shared\\(m\\)" 0 "gimple" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-4.c b/gcc/testsuite/gcc.dg/gomp/for-4.c
index fb6994ea20b..989d4b2a8f3 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-4.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-4.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-5.c b/gcc/testsuite/gcc.dg/gomp/for-5.c
index 5912a4e5561..fca2697c9a4 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-5.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-5.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_guided_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_guided_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-6.c b/gcc/testsuite/gcc.dg/gomp/for-6.c
index 100ee2c8c21..9f9db4102fd 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-6.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-6.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-7.c b/gcc/testsuite/gcc.dg/gomp/for-7.c
index 10763dc596c..e93f785dfd1 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-7.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-7.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-8.c b/gcc/testsuite/gcc.dg/gomp/for-8.c
index 1bc66c49a0d..c3b53661c87 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-8.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-8.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/for-9.c b/gcc/testsuite/gcc.dg/gomp/for-9.c
index af99e216e79..8e53d9877e0 100644
--- a/gcc/testsuite/gcc.dg/gomp/for-9.c
+++ b/gcc/testsuite/gcc.dg/gomp/for-9.c
@@ -14,4 +14,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_start" 1 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_next" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/macro-3.c b/gcc/testsuite/gcc.dg/gomp/macro-3.c
index 233d2edcdc9..dc4fe091b31 100644
--- a/gcc/testsuite/gcc.dg/gomp/macro-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/macro-3.c
@@ -23,4 +23,3 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma omp parallel" 4 "omplower" } } */
-/* { dg-final { cleanup-tree-dump "omplower" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/master-3.c b/gcc/testsuite/gcc.dg/gomp/master-3.c
index fee09ddd798..3cdadc83aa4 100644
--- a/gcc/testsuite/gcc.dg/gomp/master-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/master-3.c
@@ -10,4 +10,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "omp_get_thread_num" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/openmp-simd-1.c b/gcc/testsuite/gcc.dg/gomp/openmp-simd-1.c
index e8e057a6166..fedb186fedf 100644
--- a/gcc/testsuite/gcc.dg/gomp/openmp-simd-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/openmp-simd-1.c
@@ -44,4 +44,3 @@ void foo(int n, float *a, float *b)
 /* { dg-final { scan-tree-dump-not "omp teams" "original" } } */
 /* { dg-final { scan-tree-dump-not "omp target" "original" } } */
 /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/openmp-simd-2.c b/gcc/testsuite/gcc.dg/gomp/openmp-simd-2.c
index 94afced248f..e66806845b7 100644
--- a/gcc/testsuite/gcc.dg/gomp/openmp-simd-2.c
+++ b/gcc/testsuite/gcc.dg/gomp/openmp-simd-2.c
@@ -40,4 +40,3 @@ void bar(int n, float *a, float *b)
 /* { dg-final { scan-tree-dump-times "pragma omp simd safelen\\(64\\)" 1 "original" } } */
 /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */
 /* { dg-final { scan-tree-dump-not "omp for" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/openmp-simd-3.c b/gcc/testsuite/gcc.dg/gomp/openmp-simd-3.c
index eba9de27d98..fdff83ce66f 100644
--- a/gcc/testsuite/gcc.dg/gomp/openmp-simd-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/openmp-simd-3.c
@@ -12,4 +12,3 @@ int main() {
 }
 
 /* { dg-final { scan-tree-dump-not "omp" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/ordered-1.c b/gcc/testsuite/gcc.dg/gomp/ordered-1.c
index de5e116ebd2..0b02aa8a526 100644
--- a/gcc/testsuite/gcc.dg/gomp/ordered-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/ordered-1.c
@@ -17,4 +17,3 @@ void foo (void)
 
 /* { dg-final { scan-tree-dump-times "GOMP_ordered_start" 2 "ompexp" } } */
 /* { dg-final { scan-tree-dump-times "GOMP_ordered_end" 2 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr27388-1.c b/gcc/testsuite/gcc.dg/gomp/pr27388-1.c
index f315b8bd380..0dda0f1b50d 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr27388-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr27388-1.c
@@ -20,4 +20,3 @@ foo (void)
 
 /* { dg-final { scan-tree-dump-times "shared\\\(i\\\)" 0 "omplower" } } */
 /* { dg-final { scan-tree-dump-times "private\\\(i\\\)" 1 "omplower" } } */
-/* { dg-final { cleanup-tree-dump "omplower" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr27388-2.c b/gcc/testsuite/gcc.dg/gomp/pr27388-2.c
index da8a48d7ef0..7eae2eae636 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr27388-2.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr27388-2.c
@@ -32,4 +32,3 @@ bar (void)
 /* { dg-final { scan-tree-dump-times "shared\\\(j\\\)\[^\\n\]*private\\\(j\\\)" 0 "omplower" } } */
 /* { dg-final { scan-tree-dump-times "private\\\(j\\\)\[^\\n\]*shared\\\(j\\\)" 0 "omplower" } } */
 /* { dg-final { scan-tree-dump-times "omp for\[^\\n\]*private\\\(j\\\)" 1 "omplower" } } */
-/* { dg-final { cleanup-tree-dump "omplower" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr27388-3.c b/gcc/testsuite/gcc.dg/gomp/pr27388-3.c
index 2cddb23c7d8..ba7065bbf2c 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr27388-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr27388-3.c
@@ -20,4 +20,3 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "omp for\[^\\n\]*private" 2 "omplower" } } */
-/* { dg-final { cleanup-tree-dump "omplower" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr32468-1.c b/gcc/testsuite/gcc.dg/gomp/pr32468-1.c
index 43724135720..1eb264e53de 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr32468-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr32468-1.c
@@ -97,4 +97,3 @@ f6 (void)
 /* There should not be a GOMP_parallel_{loop,sections}* call.  */
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_loop" 0 "ompexp"} } */
 /* { dg-final { scan-tree-dump-times "GOMP_parallel_sections" 0 "ompexp"} } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr34692.c b/gcc/testsuite/gcc.dg/gomp/pr34692.c
index cc93914b6c1..a8a977d4ed6 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr34692.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr34692.c
@@ -25,4 +25,3 @@ cde f g h);
   }
 }
 
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/simd-clones-1.c b/gcc/testsuite/gcc.dg/gomp/simd-clones-1.c
index 486b67a637a..4875bdd5701 100644
--- a/gcc/testsuite/gcc.dg/gomp/simd-clones-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/simd-clones-1.c
@@ -30,4 +30,3 @@ void fillit(int *tot)
 }
 
 /* { dg-final { scan-tree-dump-not "special_add.constprop" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/simd-clones-2.c b/gcc/testsuite/gcc.dg/gomp/simd-clones-2.c
index 030ae6cb19b..4fb9c40d1a6 100644
--- a/gcc/testsuite/gcc.dg/gomp/simd-clones-2.c
+++ b/gcc/testsuite/gcc.dg/gomp/simd-clones-2.c
@@ -23,4 +23,3 @@ float setArray(float *a, float x, int k)
 /* { dg-final { scan-tree-dump "_ZGVdN8ua32vl_setArray" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump "_ZGVdN8vvva32_addit" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump "_ZGVdM8vl66u_addit" "optimized" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/gomp/simd-clones-3.c b/gcc/testsuite/gcc.dg/gomp/simd-clones-3.c
index 98e767c3ae3..622b80145bd 100644
--- a/gcc/testsuite/gcc.dg/gomp/simd-clones-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/simd-clones-3.c
@@ -15,4 +15,3 @@ int addit(int a, int b, int c)
 /* { dg-final { scan-tree-dump "_ZGVcM4vvv_addit" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump "_ZGVdN8vvv_addit" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump "_ZGVdM8vvv_addit" "optimized" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-0.c b/gcc/testsuite/gcc.dg/graphite/block-0.c
index 9bf97126df8..45a1d17eac2 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-0.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-0.c
@@ -43,4 +43,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-not "will be loop blocked" "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-1.c b/gcc/testsuite/gcc.dg/graphite/block-1.c
index d335345a699..a73c20fd616 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-1.c
@@ -46,4 +46,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 3 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-3.c b/gcc/testsuite/gcc.dg/graphite/block-3.c
index 3b9db31fa79..d4fd62db7eb 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-3.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-3.c
@@ -59,4 +59,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-4.c b/gcc/testsuite/gcc.dg/graphite/block-4.c
index c206bf824b8..e383a66e582 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-4.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-4.c
@@ -58,4 +58,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-5.c b/gcc/testsuite/gcc.dg/graphite/block-5.c
index b577958c57d..60b7d0968c1 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-5.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-5.c
@@ -54,4 +54,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-6.c b/gcc/testsuite/gcc.dg/graphite/block-6.c
index 8f250db5152..47fee896095 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-6.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-6.c
@@ -49,4 +49,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 0 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-7.c b/gcc/testsuite/gcc.dg/graphite/block-7.c
index bf9c60f415c..c07bae0652d 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-7.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-7.c
@@ -55,4 +55,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-8.c b/gcc/testsuite/gcc.dg/graphite/block-8.c
index 4e2f358fca7..0e9b02c52ae 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-8.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-8.c
@@ -56,4 +56,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/block-pr47654.c b/gcc/testsuite/gcc.dg/graphite/block-pr47654.c
index 9cdeb0c3579..358c49a64d0 100644
--- a/gcc/testsuite/gcc.dg/graphite/block-pr47654.c
+++ b/gcc/testsuite/gcc.dg/graphite/block-pr47654.c
@@ -22,4 +22,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-not "will be loop blocked" "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-0.c b/gcc/testsuite/gcc.dg/graphite/interchange-0.c
index 8bc6e132664..5d0406853fb 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-0.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-0.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-1.c b/gcc/testsuite/gcc.dg/graphite/interchange-1.c
index b4559d13214..c480e83c3a3 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-1.c
@@ -50,4 +50,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-10.c b/gcc/testsuite/gcc.dg/graphite/interchange-10.c
index 51a46d62394..cbb15bde65b 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-10.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-10.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 2 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-11.c b/gcc/testsuite/gcc.dg/graphite/interchange-11.c
index 491fda15c5f..f779fbdfd80 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-11.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-11.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-12.c b/gcc/testsuite/gcc.dg/graphite/interchange-12.c
index fc27b4c5358..41a8882fbfb 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-12.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-12.c
@@ -54,4 +54,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-13.c b/gcc/testsuite/gcc.dg/graphite/interchange-13.c
index a8bf23be5a1..69f6b60e3e0 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-13.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-13.c
@@ -51,4 +51,3 @@ main (void)
 
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-14.c b/gcc/testsuite/gcc.dg/graphite/interchange-14.c
index b0d93a18c66..36990ab40fd 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-14.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-14.c
@@ -56,4 +56,3 @@ main (void)
 
 /* PRE destroys the perfect nest and we can't cope with that yet.  */
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-15.c b/gcc/testsuite/gcc.dg/graphite/interchange-15.c
index d154b743f89..3ddb74f0407 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-15.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-15.c
@@ -50,5 +50,4 @@ main (void)
 
 /* PRE destroys the perfect nest and we can't cope with that yet.  */
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-16.c b/gcc/testsuite/gcc.dg/graphite/interchange-16.c
index 0d07d8118bf..b4d79ae4d11 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-16.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-16.c
@@ -19,4 +19,3 @@ void spread_i1 (int *rptr, int *sptr, int ncopies, int *extent, int rdelta, int
 
 int main() { return 0; }
 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-2.c b/gcc/testsuite/gcc.dg/graphite/interchange-2.c
index 2609a10eb0b..936ee0048c0 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-2.c
@@ -53,4 +53,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-3.c b/gcc/testsuite/gcc.dg/graphite/interchange-3.c
index 1419749243a..33320889af8 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-3.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-3.c
@@ -48,4 +48,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-4.c b/gcc/testsuite/gcc.dg/graphite/interchange-4.c
index f86391c7f7c..678c0ed2bde 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-4.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-4.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-5.c b/gcc/testsuite/gcc.dg/graphite/interchange-5.c
index 1fbc8e6ecb6..16cadc83b2c 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-5.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-5.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-6.c b/gcc/testsuite/gcc.dg/graphite/interchange-6.c
index 9e189050e6f..708c739aaeb 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-6.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-6.c
@@ -48,4 +48,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-7.c b/gcc/testsuite/gcc.dg/graphite/interchange-7.c
index b3710ad4c9d..3281e7e83bf 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-7.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-7.c
@@ -47,4 +47,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-8.c b/gcc/testsuite/gcc.dg/graphite/interchange-8.c
index ca99dbc13a1..49cfbc88e58 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-8.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-8.c
@@ -83,4 +83,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 2 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-9.c b/gcc/testsuite/gcc.dg/graphite/interchange-9.c
index 3f8e843ea3b..cfec1100eee 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-9.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-9.c
@@ -45,4 +45,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-mvt.c b/gcc/testsuite/gcc.dg/graphite/interchange-mvt.c
index f446dbe622f..4b8f2646bef 100644
--- a/gcc/testsuite/gcc.dg/graphite/interchange-mvt.c
+++ b/gcc/testsuite/gcc.dg/graphite/interchange-mvt.c
@@ -60,5 +60,4 @@ main (void)
 
 /* PRE destroys the perfect nest and we can't cope with that yet.  */
 /* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/isl-codegen-loop-dumping.c b/gcc/testsuite/gcc.dg/graphite/isl-codegen-loop-dumping.c
index a2e0aede6ef..cb5d802db8e 100644
--- a/gcc/testsuite/gcc.dg/graphite/isl-codegen-loop-dumping.c
+++ b/gcc/testsuite/gcc.dg/graphite/isl-codegen-loop-dumping.c
@@ -13,4 +13,3 @@ main (int n, int *a)
 }
 
 /* { dg-final { scan-tree-dump-times "ISL AST generated by ISL: \nfor \\(int c1 = 0; c1 < n - 1; c1 \\+= 1\\)\n  for \\(int c3 = 0; c3 < n; c3 \\+= 1\\)\n    S_4\\(c1, c3\\);" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr35356-1.c b/gcc/testsuite/gcc.dg/graphite/pr35356-1.c
index 2ba0c1b0f5e..10aa49337b7 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr35356-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr35356-1.c
@@ -23,4 +23,3 @@ foo (int bar, int n, int k)
 */
 
 /* { dg-final { scan-tree-dump-times "loop_1" 0 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr35356-2.c b/gcc/testsuite/gcc.dg/graphite/pr35356-2.c
index 1ac0dc1fc88..957fb91791f 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr35356-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr35356-2.c
@@ -39,4 +39,3 @@ foo (int bar, int n, int k)
 */
 
 /* { dg-final { scan-tree-dump-times "for\[^\n\]+\n\[^\n\]+if" 0 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr35356-3.c b/gcc/testsuite/gcc.dg/graphite/pr35356-3.c
index 55a771aff94..a9dd3361f01 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr35356-3.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr35356-3.c
@@ -37,4 +37,3 @@ match (void)
    for such cases.  */
 
 /* { dg-final { scan-tree-dump-times "loop_1" 0 "graphite" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr37485.c b/gcc/testsuite/gcc.dg/graphite/pr37485.c
index 09a2b66cc15..9543ce4fd54 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr37485.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr37485.c
@@ -31,4 +31,3 @@ void fallbackSort ( UInt32* fmap,
    AssertH ( j < 256, 1005 );
 }
 /* { dg-final { scan-tree-dump-times "Loop blocked" 1 "graphite" { xfail *-*-* }} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr37684.c b/gcc/testsuite/gcc.dg/graphite/pr37684.c
index ab5a6853316..659f16204d8 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr37684.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr37684.c
@@ -64,4 +64,3 @@ int BZ2_bzCompressInit
    prepare_new_block ( s );
 }
 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/pr37943.c b/gcc/testsuite/gcc.dg/graphite/pr37943.c
index 4513d12c0b7..7a42cc119ab 100644
--- a/gcc/testsuite/gcc.dg/graphite/pr37943.c
+++ b/gcc/testsuite/gcc.dg/graphite/pr37943.c
@@ -29,5 +29,4 @@ unsigned char compress(test *in)
    }
    return p_in || p_out;
 }
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-0.c b/gcc/testsuite/gcc.dg/graphite/scop-0.c
index 958285f8ac6..9cfd5dd14dc 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-0.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-0.c
@@ -18,5 +18,4 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-1.c b/gcc/testsuite/gcc.dg/graphite/scop-1.c
index 0fa51493e15..16070d425b8 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-1.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-1.c
@@ -28,4 +28,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-10.c b/gcc/testsuite/gcc.dg/graphite/scop-10.c
index 139f4c11494..f14aabce4c3 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-10.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-10.c
@@ -28,4 +28,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-11.c b/gcc/testsuite/gcc.dg/graphite/scop-11.c
index 544b36bd744..4a7286993c5 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-11.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-11.c
@@ -29,4 +29,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-12.c b/gcc/testsuite/gcc.dg/graphite/scop-12.c
index 71d34b1db07..221d987bfba 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-12.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-12.c
@@ -33,4 +33,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 5" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-13.c b/gcc/testsuite/gcc.dg/graphite/scop-13.c
index b2ca5b4008f..195b7569389 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-13.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-13.c
@@ -38,4 +38,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-14.c b/gcc/testsuite/gcc.dg/graphite/scop-14.c
index 867e293d649..9ffc7c6538f 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-14.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-14.c
@@ -22,4 +22,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 0" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-15.c b/gcc/testsuite/gcc.dg/graphite/scop-15.c
index 6b2c2bdc88f..c95e09e7cc0 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-15.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-15.c
@@ -48,4 +48,3 @@ int longest_match(IPos cur_match)
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 0" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-16.c b/gcc/testsuite/gcc.dg/graphite/scop-16.c
index 83cbb969866..cacd564e9e5 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-16.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-16.c
@@ -22,4 +22,3 @@ int test ()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-17.c b/gcc/testsuite/gcc.dg/graphite/scop-17.c
index a7dff5f6c02..2252766b796 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-17.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-17.c
@@ -21,4 +21,3 @@ int test ()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-18.c b/gcc/testsuite/gcc.dg/graphite/scop-18.c
index 4c2a8cdf644..6e1080bc701 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-18.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-18.c
@@ -23,4 +23,3 @@ void test (void)
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-19.c b/gcc/testsuite/gcc.dg/graphite/scop-19.c
index ab23bb4d4d1..c89717bf465 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-19.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-19.c
@@ -33,5 +33,4 @@ d_growable_string_append_buffer (struct d_growable_string *dgs,
 }
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 0" 2 "graphite" { target nonpic } } } */
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 0" 1 "graphite" { target { ! nonpic } } } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-2.c b/gcc/testsuite/gcc.dg/graphite/scop-2.c
index 8378361c68a..a16717c600a 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-2.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-2.c
@@ -36,4 +36,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 4" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-20.c b/gcc/testsuite/gcc.dg/graphite/scop-20.c
index f90b1746b4e..2116f9db445 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-20.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-20.c
@@ -24,4 +24,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-21.c b/gcc/testsuite/gcc.dg/graphite/scop-21.c
index 1cbad5d8cd1..48a6d2ff5a8 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-21.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-21.c
@@ -28,4 +28,3 @@ int test ()
   return a[20];
 }
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-22.c b/gcc/testsuite/gcc.dg/graphite/scop-22.c
index b77be22b14d..c936428b7bb 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-22.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-22.c
@@ -18,4 +18,3 @@ void foo(int N, int *res)
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-3.c b/gcc/testsuite/gcc.dg/graphite/scop-3.c
index 18917c0edcc..96e663930d2 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-3.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-3.c
@@ -25,4 +25,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-4.c b/gcc/testsuite/gcc.dg/graphite/scop-4.c
index 4ab2d07f48d..c6d719e2dd0 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-4.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-4.c
@@ -26,4 +26,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-5.c b/gcc/testsuite/gcc.dg/graphite/scop-5.c
index 4f4b45b4914..fa1c64a0ca8 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-5.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-5.c
@@ -32,4 +32,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-6.c b/gcc/testsuite/gcc.dg/graphite/scop-6.c
index df208acb201..2a45d6ee559 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-6.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-6.c
@@ -28,4 +28,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-7.c b/gcc/testsuite/gcc.dg/graphite/scop-7.c
index c02748fa71a..5866ca736f6 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-7.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-7.c
@@ -28,4 +28,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 3" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-8.c b/gcc/testsuite/gcc.dg/graphite/scop-8.c
index 3f14e347a51..9cdc69f670d 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-8.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-8.c
@@ -28,4 +28,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-9.c b/gcc/testsuite/gcc.dg/graphite/scop-9.c
index a803d921790..d879d9afda3 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-9.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-9.c
@@ -24,4 +24,3 @@ int toto()
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-dsyr2k.c b/gcc/testsuite/gcc.dg/graphite/scop-dsyr2k.c
index f5d1df1ea03..d09c13059bd 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-dsyr2k.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-dsyr2k.c
@@ -17,5 +17,4 @@ void dsyr2k(long N) {
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite"} } */ 
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-dsyrk.c b/gcc/testsuite/gcc.dg/graphite/scop-dsyrk.c
index a7bc5c49815..2f8919d3ebb 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-dsyrk.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-dsyrk.c
@@ -19,4 +19,3 @@ void dsyrk(long N)
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-matmult.c b/gcc/testsuite/gcc.dg/graphite/scop-matmult.c
index 018de2c4e0d..4cb7c0f70c6 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-matmult.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-matmult.c
@@ -17,4 +17,3 @@ void matmult (int n)
 /* This one fails because the number of iterations cannot be
    determined anymore for the outermost loop.  */
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-mvt.c b/gcc/testsuite/gcc.dg/graphite/scop-mvt.c
index 1181cdad02e..5d3d19f7413 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-mvt.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-mvt.c
@@ -20,5 +20,4 @@ void mvt(long N) {
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
 
diff --git a/gcc/testsuite/gcc.dg/graphite/scop-sor.c b/gcc/testsuite/gcc.dg/graphite/scop-sor.c
index 32c12073163..ad5278ac95c 100644
--- a/gcc/testsuite/gcc.dg/graphite/scop-sor.c
+++ b/gcc/testsuite/gcc.dg/graphite/scop-sor.c
@@ -15,4 +15,3 @@ void sor(int N1, int N2){
 }
 
 /* { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" } } */
-/* { dg-final { cleanup-tree-dump "graphite" } } */
diff --git a/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c b/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
index 177017f7c7c..238e16ad614 100644
--- a/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
+++ b/gcc/testsuite/gcc.dg/graphite/vect-pr43423.c
@@ -16,4 +16,3 @@ void foo(int n, int mid)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/hoist-register-pressure-1.c b/gcc/testsuite/gcc.dg/hoist-register-pressure-1.c
index 995711a67c0..ac8f5f99a49 100644
--- a/gcc/testsuite/gcc.dg/hoist-register-pressure-1.c
+++ b/gcc/testsuite/gcc.dg/hoist-register-pressure-1.c
@@ -4,7 +4,6 @@
    requires a load address instruction which is fine on 64 bit but
    cannot be used on 31 bit since it does a 31 bit add only.  */
 /* { dg-final { scan-rtl-dump "PRE/HOIST: end of bb .* copying expression" "hoist" { target { { !s390*-*-* || lp64 } && nonpic } } } } */
-/* { dg-final { cleanup-rtl-dump "hoist" } } */
 
 #define BUF 100
 long a[BUF];
diff --git a/gcc/testsuite/gcc.dg/hoist-register-pressure-2.c b/gcc/testsuite/gcc.dg/hoist-register-pressure-2.c
index b5a4a9929c6..9d2678cf0d8 100644
--- a/gcc/testsuite/gcc.dg/hoist-register-pressure-2.c
+++ b/gcc/testsuite/gcc.dg/hoist-register-pressure-2.c
@@ -4,7 +4,6 @@
    requires a load address instruction which is fine on 64 bit but
    cannot be used on 31 bit since it does a 31 bit add only.  */
 /* { dg-final { scan-rtl-dump "PRE/HOIST: end of bb .* copying expression" "hoist" { target { !s390*-*-* || lp64 } } } } */
-/* { dg-final { cleanup-rtl-dump "hoist" } } */
 
 #define BUF 100
 long a[BUF];
diff --git a/gcc/testsuite/gcc.dg/hoist-register-pressure-3.c b/gcc/testsuite/gcc.dg/hoist-register-pressure-3.c
index 6237dc674f8..45cae8692fc 100644
--- a/gcc/testsuite/gcc.dg/hoist-register-pressure-3.c
+++ b/gcc/testsuite/gcc.dg/hoist-register-pressure-3.c
@@ -4,7 +4,6 @@
    requires a load address instruction which is fine on 64 bit but
    cannot be used on 31 bit since it does a 31 bit add only.  */
 /* { dg-final { scan-rtl-dump "PRE/HOIST: end of bb .* copying expression" "hoist" { target { !s390*-*-* || lp64 } } } } */
-/* { dg-final { cleanup-rtl-dump "hoist" } } */
 
 #define BUF 100
 long a[BUF];
diff --git a/gcc/testsuite/gcc.dg/inline-33.c b/gcc/testsuite/gcc.dg/inline-33.c
index a05130e6cde..6ce3a5326b8 100644
--- a/gcc/testsuite/gcc.dg/inline-33.c
+++ b/gcc/testsuite/gcc.dg/inline-33.c
@@ -20,4 +20,3 @@ int foo (i)
 }
 
 /* { dg-final { scan-tree-dump-times "bar"  2 "optimized"  } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/inline-36.c b/gcc/testsuite/gcc.dg/inline-36.c
index 030138171f6..4494f6fb309 100644
--- a/gcc/testsuite/gcc.dg/inline-36.c
+++ b/gcc/testsuite/gcc.dg/inline-36.c
@@ -19,4 +19,3 @@ int foo2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/inline-37.c b/gcc/testsuite/gcc.dg/inline-37.c
index e3b1df44661..f96ed7972bd 100644
--- a/gcc/testsuite/gcc.dg/inline-37.c
+++ b/gcc/testsuite/gcc.dg/inline-37.c
@@ -19,4 +19,3 @@ int foo2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/inline-38.c b/gcc/testsuite/gcc.dg/inline-38.c
index 773c301a41a..82306c6a870 100644
--- a/gcc/testsuite/gcc.dg/inline-38.c
+++ b/gcc/testsuite/gcc.dg/inline-38.c
@@ -19,4 +19,3 @@ int foo2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "bar" 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/inline-39.c b/gcc/testsuite/gcc.dg/inline-39.c
index ebd57e980fd..52ab5729291 100644
--- a/gcc/testsuite/gcc.dg/inline-39.c
+++ b/gcc/testsuite/gcc.dg/inline-39.c
@@ -20,4 +20,3 @@ int foo2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "bar" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/PR64550.c b/gcc/testsuite/gcc.dg/ipa/PR64550.c
index f3583cc9136..d0d7d9c02b3 100644
--- a/gcc/testsuite/gcc.dg/ipa/PR64550.c
+++ b/gcc/testsuite/gcc.dg/ipa/PR64550.c
@@ -72,4 +72,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/PR65282.c b/gcc/testsuite/gcc.dg/ipa/PR65282.c
index 58e1c55237b..a52bec655eb 100644
--- a/gcc/testsuite/gcc.dg/ipa/PR65282.c
+++ b/gcc/testsuite/gcc.dg/ipa/PR65282.c
@@ -17,4 +17,3 @@ main ()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ctor-empty-1.c b/gcc/testsuite/gcc.dg/ipa/ctor-empty-1.c
index e678c6d0315..e9e8b12a5ea 100644
--- a/gcc/testsuite/gcc.dg/ipa/ctor-empty-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ctor-empty-1.c
@@ -5,4 +5,3 @@ void empty_constructor()
 {
 }
 /* { dg-final { scan-ipa-dump "Reclaiming functions: empty_constructor"  "free-inline-summary"  } } */
-/* { dg-final { cleanup-ipa-dump "free-inline-summary" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-1.c b/gcc/testsuite/gcc.dg/ipa/iinline-1.c
index 860b3e57204..c8d403840b9 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-1.c
@@ -24,4 +24,3 @@ int test (void)
 
 /* { dg-final { scan-ipa-dump "indirect_call"  "inline"  } } */
 /* { dg-final { scan-ipa-dump "hooray\[^\\n\]*inline copy in test"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-2.c b/gcc/testsuite/gcc.dg/ipa/iinline-2.c
index 117818d1645..cb86ac344cb 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-2.c
@@ -38,4 +38,3 @@ int main (int argc, int *argv[])
 
 /* { dg-final { scan-ipa-dump "hooray\[^\\n\]*inline copy in main" "inline"  } } */
 /* { dg-final { scan-ipa-dump "hip2\[^\\n\]*inline copy in main" "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-4.c b/gcc/testsuite/gcc.dg/ipa/iinline-4.c
index 3f295df7dd0..f50ffa58221 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-4.c
@@ -218,4 +218,3 @@ int test7 (void)
 /* { dg-final { scan-ipa-dump "hooray5\[^\\n\]*inline copy in test5"  "inline"  } } */
 /* { dg-final { scan-ipa-dump "hooray6\[^\\n\]*inline copy in test6"  "inline"  } } */
 /* { dg-final { scan-ipa-dump "hooray7\[^\\n\]*inline copy in test7"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-5.c b/gcc/testsuite/gcc.dg/ipa/iinline-5.c
index b83b8c25a92..ed297c6862d 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-5.c
@@ -121,4 +121,3 @@ int main (int argc, char **argv)
 
 
 /* { dg-final { scan-ipa-dump-not "wrong_target\[^\\n\]*inline copy in" "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-6.c b/gcc/testsuite/gcc.dg/ipa/iinline-6.c
index 5a9b759d883..cddd1bbc40c 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-6.c
@@ -69,4 +69,3 @@ int main (int argc, char **argv)
 
 
 /* { dg-final { scan-ipa-dump-not "wrong_target\[^\\n\]*inline copy in" "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-7.c b/gcc/testsuite/gcc.dg/ipa/iinline-7.c
index 61e8d0b958e..1724dc93dc4 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-7.c
@@ -154,4 +154,3 @@ int main (int argc, char **argv)
 
 
 /* { dg-final { scan-ipa-dump-not "wrong_target\[^\\n\]*inline copy in" "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/iinline-attr.c b/gcc/testsuite/gcc.dg/ipa/iinline-attr.c
index 119d61f43d4..1055434eaa1 100644
--- a/gcc/testsuite/gcc.dg/ipa/iinline-attr.c
+++ b/gcc/testsuite/gcc.dg/ipa/iinline-attr.c
@@ -24,4 +24,3 @@ int test (void)
 }
 
 /* { dg-final { scan-ipa-dump "hooray\[^\\n\]*inline copy in test"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-1.c b/gcc/testsuite/gcc.dg/ipa/inline-1.c
index c662682a3f7..f30a6b0b03c 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-1.c
@@ -34,4 +34,3 @@ void foo (int invariant, struct bah invariant2)
 /* op7 change.  */
 /* { dg-final { scan-ipa-dump-not "op7 is compile time invariant"  "inline"  } } */
 /* { dg-final { scan-ipa-dump-not "op7 change"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-2.c b/gcc/testsuite/gcc.dg/ipa/inline-2.c
index aa8eea3fa94..28ecb707219 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-2.c
@@ -31,4 +31,3 @@ void foo (int invariant)
 /* { dg-final { scan-ipa-dump "op2 change 10.000000. of time"  "inline"  } } */
 /* After inlining bar into foo, op3 is invariant within both loops.  */
 /* { dg-final { scan-ipa-dump "op3 change 1.000000. of time"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-3.c b/gcc/testsuite/gcc.dg/ipa/inline-3.c
index d97f0c65444..ea6d4d62812 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-3.c
@@ -22,4 +22,3 @@ int foo (int invariant)
 
 
 /* { dg-final { scan-ipa-dump "Scaling time by probability:0.100000"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-4.c b/gcc/testsuite/gcc.dg/ipa/inline-4.c
index 6df541add54..fdb44653e88 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-4.c
@@ -29,4 +29,3 @@ int foo (int invariant)
 /* { dg-final { scan-ipa-dump "Inlined 1 calls, eliminated 0 functions"  "inline"  } } */
 /* Call to work_hard should be detected as optimized out.  */
 /* { dg-final { scan-ipa-dump-times "predicate: .false." 8 "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-5.c b/gcc/testsuite/gcc.dg/ipa/inline-5.c
index f0ee25adcbf..06156ce4907 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-5.c
@@ -36,4 +36,3 @@ accessreference (struct a *a)
 
 /* { dg-final { scan-ipa-dump-times "Will be eliminated" 4 "inline" { xfail { { hppa*-*-* } && { ! lp64 } } } } } */
 /* { dg-final { scan-ipa-dump-times "50. will be eliminated" 1 "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-6.c b/gcc/testsuite/gcc.dg/ipa/inline-6.c
index 5fb40842789..3cc8642c2ed 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-6.c
@@ -45,4 +45,3 @@ main()
 } 
 /* Even if function is huge, inlining it will save code.  */
 /* { dg-final { scan-ipa-dump-times "Inlined into" 2 "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inline-7.c b/gcc/testsuite/gcc.dg/ipa/inline-7.c
index b31af6c5262..5002aa098f3 100644
--- a/gcc/testsuite/gcc.dg/ipa/inline-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/inline-7.c
@@ -22,4 +22,3 @@ m()
  a(0);
 }
 /* { dg-final { scan-tree-dump-times "Inlining a into m" 1 "einline"  } } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inlinehint-1.c b/gcc/testsuite/gcc.dg/ipa/inlinehint-1.c
index c1688f18ed1..38721d79430 100644
--- a/gcc/testsuite/gcc.dg/ipa/inlinehint-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/inlinehint-1.c
@@ -18,4 +18,3 @@ m()
   test (10);
 }
 /* { dg-final { scan-ipa-dump "loop_iterations"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inlinehint-2.c b/gcc/testsuite/gcc.dg/ipa/inlinehint-2.c
index d1119a56f91..cfdcb24bcd5 100644
--- a/gcc/testsuite/gcc.dg/ipa/inlinehint-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/inlinehint-2.c
@@ -14,4 +14,3 @@ m(void **p)
   t (10, p);
 }
 /* { dg-final { scan-ipa-dump "loop_stride"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inlinehint-3.c b/gcc/testsuite/gcc.dg/ipa/inlinehint-3.c
index 6a424ff1672..38d50042b23 100644
--- a/gcc/testsuite/gcc.dg/ipa/inlinehint-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/inlinehint-3.c
@@ -38,4 +38,3 @@ main()
 /* { dg-final { scan-ipa-dump "same_scc"  "inline"  } } */
 /* Main is not in scc, the two functions are.  */
 /* { dg-final { scan-ipa-dump-times "In SCC" 2 "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/inlinehint-4.c b/gcc/testsuite/gcc.dg/ipa/inlinehint-4.c
index 52d2f1a6763..1939bb68f83 100644
--- a/gcc/testsuite/gcc.dg/ipa/inlinehint-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/inlinehint-4.c
@@ -37,4 +37,3 @@ test (int i)
 /* { dg-final { scan-ipa-dump "Wrapper penalty"  "inline"  } } */
 /* { dg-final { scan-ipa-dump-not "Inlining lookup_slow to lookup"  "inline"  } } */
 /* { dg-final { scan-ipa-dump "Inlining lookup to test"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-1.c
index 3cc32da1c98..dfa04e79ed7 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-1.c
@@ -26,6 +26,5 @@ int main ()
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of f" "cp" } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 7" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-2.c b/gcc/testsuite/gcc.dg/ipa/ipa-2.c
index 7f14d42a03a..7d3c2d834fb 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-2.c
@@ -24,4 +24,3 @@ int main ()
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of f" "cp" } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 7" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-3.c
index 36fd5067892..9799b484132 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-3.c
@@ -33,4 +33,3 @@ int main ()
 /* { dg-final { scan-ipa-dump "Creating a specialized node of g" "cp" } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 b with const 7" "cp"  } } */
 /* { dg-final { scan-ipa-dump "replacing param .1 c with const 3" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-4.c
index 566b3297136..20b448ea773 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-4.c
@@ -27,4 +27,3 @@ int main ()
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of f" "cp"  } } */
 /* { dg-final { scan-ipa-dump-times "replacing param .0 a with const 7" 1 "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-5.c
index daa64fada6f..e4f77a96768 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-5.c
@@ -30,4 +30,3 @@ int main ()
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node" 3 "cp"  } } */
 /* { dg-final { scan-ipa-dump "replacing param .1 c with const 3" "cp"  } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 7" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-7.c b/gcc/testsuite/gcc.dg/ipa/ipa-7.c
index 271a34a3d60..646278b8d73 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-7.c
@@ -28,6 +28,5 @@ int main ()
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of f" "cp" } } */
 /* { dg-final { scan-ipa-dump-times "replacing param .. . with const 7" 1 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-8.c b/gcc/testsuite/gcc.dg/ipa/ipa-8.c
index d138cf26330..e0da7e8552b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-8.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-8.c
@@ -26,6 +26,5 @@ int main ()
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 7" "cp"  } } */
 /* { dg-final { scan-ipa-dump "Creating a specialized node of g" "cp" } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 b with const 7" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-clone-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-clone-1.c
index 5ee816657b1..0b0f6213172 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-clone-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-clone-1.c
@@ -17,4 +17,3 @@ bar (int arg)
 
 /* { dg-final { scan-assembler "test_section" } } */
 /* { dg-final { scan-ipa-dump "Creating a specialized node of foo" "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-1.c
index aeee356d6c9..af86b9b8d50 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-1.c
@@ -58,4 +58,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:x2->x1" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-10.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-10.c
index b9bca608c8a..6a2dd008849 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-10.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-10.c
@@ -31,4 +31,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:funkce->ferda" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-11.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-11.c
index 2eb90dac22b..33b62ca6eb7 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-11.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-11.c
@@ -26,4 +26,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f1->f0" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-12.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-12.c
index d4b7c38d77f..8c03a47431b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-12.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-12.c
@@ -75,4 +75,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:nsd->gcd" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-13.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-13.c
index e409ee496b1..dd3f262146f 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-13.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-13.c
@@ -191,4 +191,3 @@ int main(int argc, char **argv)
 /* { dg-final { scan-ipa-dump "Semantic equality hit:nsd_different_result2->nsd_different_result" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:nsd->gcd" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 3" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-14.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-14.c
index cae02fbd4a6..7de823fe2b2 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-14.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-14.c
@@ -44,4 +44,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-15.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-15.c
index 04c2320759c..2ed66f7706b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-15.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-15.c
@@ -43,4 +43,3 @@ int main(int argc, char **argv)
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-16.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-16.c
index fb0b116f736..6f038f13cf9 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-16.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-16.c
@@ -24,4 +24,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-17.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-17.c
index 7c9172da3fa..4b828c003a2 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-17.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-17.c
@@ -34,4 +34,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-18.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-18.c
index 9dc39791e57..a8e28c1ff3a 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-18.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-18.c
@@ -34,4 +34,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-19.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-19.c
index 7a29cf3b877..540280ed0b1 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-19.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-19.c
@@ -34,4 +34,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-2.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-2.c
index 385db0c1b21..4d3cbafff4a 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-2.c
@@ -66,4 +66,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f2->f1" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-20.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-20.c
index 9912a9a5c69..470e466ba23 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-20.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-20.c
@@ -25,4 +25,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-21.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-21.c
index 68aabc5fdd0..447fd7bad51 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-21.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-21.c
@@ -24,4 +24,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-22.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-22.c
index 95610260849..d7f507d0b83 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-22.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-22.c
@@ -34,4 +34,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-23.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-23.c
index 7e81ae21ae6..7787f06938e 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-23.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-23.c
@@ -26,4 +26,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-24.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-24.c
index 3cd476ffc5d..b74acb840c7 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-24.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-24.c
@@ -33,4 +33,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-25.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-25.c
index 89f5a80f98f..7e42052fe20 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-25.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-25.c
@@ -49,4 +49,3 @@ int main()
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:zap->zip" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 2" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-26.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-26.c
index f48c04098ab..f3bb675d82a 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-26.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-26.c
@@ -40,4 +40,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:remove->destroy" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-27.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-27.c
index fab2e41e910..7265ee4035e 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-27.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-27.c
@@ -27,4 +27,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:remove->destroy" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-28.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-28.c
index 56ea1b825ee..216e2559e28 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-28.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-28.c
@@ -21,4 +21,3 @@ int main()
 }
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
 /* { dg-final { scan-ipa-dump "different decl attributes" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-29.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-29.c
index 75839953534..870035c1a9b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-29.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-29.c
@@ -27,4 +27,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-3.c
index e4e2eb628b9..6418acea19c 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-3.c
@@ -33,4 +33,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:bar->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-30.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-30.c
index 75c284f27e0..043522d3af0 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-30.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-30.c
@@ -27,4 +27,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
index 55ab086cd50..9f42918b067 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-32.c
@@ -21,4 +21,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "optimization flags are different" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-33.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-33.c
index 7b6a8ae51d9..61d4e2647be 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-33.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-33.c
@@ -23,4 +23,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-34.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-34.c
index 9d1ef6278d1..3755e3fd9bc 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-34.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-34.c
@@ -26,4 +26,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c
index f91cdd78483..ace6ae2b353 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-35.c
@@ -28,4 +28,3 @@ int main()
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f2->f1" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:d->c" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:b->a" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-36.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-36.c
index 70eec1566d7..d8cd5c8567e 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-36.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-36.c
@@ -34,4 +34,3 @@ int t(int tt)
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f->e" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:h->g" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:k->i" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-37.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-37.c
index a67f1ec2b23..7314697e887 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-37.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-37.c
@@ -34,4 +34,3 @@ int t(int tt)
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f->e" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:h->g" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Semantic equality hit:j->i" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-4.c
index 9434fb05adf..3e0bb243587 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-4.c
@@ -29,4 +29,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
index 849f72e2964..bef80f27f65 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-5.c
@@ -53,4 +53,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:f2->f1" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-6.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-6.c
index 6e6758e9bd3..322b3b56ddf 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-6.c
@@ -33,4 +33,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
index 70234137796..862dd70d50c 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-7.c
@@ -70,4 +70,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:foo2->foo" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-8.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-8.c
index d35df907005..32eed406d53 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-8.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-8.c
@@ -42,4 +42,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:fce2->fce1" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-9.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-9.c
index 9d04dd1633c..7742d74ce01 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-9.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-9.c
@@ -30,4 +30,3 @@ int main(int argc, char **argv)
 
 /* { dg-final { scan-ipa-dump-not "Semantic equality hit:" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-1.c
index a56e71a4ade..234f2b8a192 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-1.c
@@ -47,4 +47,3 @@ int main()
 /* { dg-final { scan-ipa-dump "bar.arg1 = { a }" "pta" } } */
 /* { dg-final { scan-ipa-dump "foo.arg0 = { a }" "pta" } } */
 /* { dg-final { scan-ipa-dump "foo.arg1 = { a }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-10.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-10.c
index 81a3c53bdfd..0a6c1663b66 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-10.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-10.c
@@ -27,4 +27,3 @@ int main()
    stuff through it.  */
 
 /* { dg-final { scan-ipa-dump "ESCAPED = { (ESCAPED )?(NONLOCAL )?}" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-11.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-11.c
index dadb166767c..84dd2542c42 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-11.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-11.c
@@ -33,4 +33,3 @@ int main()
    we should have i, r and s in ESCAPED as well.  */
 
 /* { dg-final { scan-ipa-dump "ESCAPED = { ESCAPED NONLOCAL l k }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c
index f7f95f4c64a..f558df305d0 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-13.c
@@ -58,5 +58,3 @@ int main()
   return x;
 }
 
-/* { dg-final { cleanup-ipa-dump "pta" } } */
-/* { dg-final { cleanup-tree-dump "fre2" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-14.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-14.c
index 091a375ebd0..e3333fae9fa 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-14.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-14.c
@@ -29,4 +29,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-16.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-16.c
index ef41826322d..5bd6596ef31 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-16.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-16.c
@@ -30,4 +30,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "y.\[0-9\]*\\\+\[0-9\]* = { i }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-2.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-2.c
index a6c7e4b4786..b77864d0b0c 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-2.c
@@ -22,4 +22,3 @@ int main()
    are properly adjusted.  */
 
 /* { dg-final { scan-ipa-dump "foo.arg0 = { ESCAPED NONLOCAL }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c
index 47900809b9f..ff6fa57628b 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-3.c
@@ -24,5 +24,3 @@ int main()
 /* { dg-final { scan-ipa-dump "foo.arg0 = &a" "pta" } } */
 /* { dg-final { scan-ipa-dump "foo.arg1 = &b" "pta" } } */
 /* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre2" } } */
-/* { dg-final { cleanup-tree-dump "fre2" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c
index bf6fa281d5a..106e325f202 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-4.c
@@ -29,5 +29,3 @@ int main()
 /* { dg-final { scan-ipa-dump "foo.arg0 = &a" "pta" } } */
 /* { dg-final { scan-ipa-dump "foo.arg1 = &b" "pta" } } */
 /* { dg-final { scan-tree-dump "Replaced \\\*p_2\\\(D\\\) with 1" "fre2" } } */
-/* { dg-final { cleanup-tree-dump "fre2" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-5.c
index 3359c534aab..625291b4de8 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-5.c
@@ -23,4 +23,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-pta-6.c b/gcc/testsuite/gcc.dg/ipa/ipa-pta-6.c
index aaa6090ddd7..c1c82456479 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-pta-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-pta-6.c
@@ -22,4 +22,3 @@ int main()
    still properly account for the store via *p in foo.  */
 
 /* { dg-final { scan-ipa-dump "ESCAPED = { }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c
index 2c05347c641..4db904b419e 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-1.c
@@ -37,4 +37,3 @@ main (int argc, char *argv[])
 }
 
 /* { dg-final { scan-tree-dump-times "About to replace expr" 2 "eipa_sra" } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-2.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-2.c
index 3437a81aa2c..a31945c9c52 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-2.c
@@ -49,4 +49,3 @@ int main (int argc, char *argv[])
 /* { dg-final { scan-tree-dump "About to replace expr cow_.*D.->green with ISRA" "eipa_sra"  } } */
 /* { dg-final { scan-tree-dump "About to replace expr calf_.*D.->red with \\*ISRA" "eipa_sra"  } } */
 /* { dg-final { scan-tree-dump "About to replace expr calf_.*D.->green with ISRA" "eipa_sra"  } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-3.c
index ac078c22d97..23dec2a661e 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-3.c
@@ -36,4 +36,3 @@ void caller (void)
 
 /* { dg-final { scan-tree-dump "base: z, remove_param" "eipa_sra"  } } */
 /* { dg-final { scan-tree-dump "base: calf, remove_param" "eipa_sra"  } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-4.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-4.c
index f07706b925c..50ac179b225 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-4.c
@@ -65,4 +65,3 @@ void caller (void)
 /* { dg-final { scan-tree-dump "About to replace expr \\*l_.*D. with ISRA" "eipa_sra"  } } */
 /* { dg-final { scan-tree-dump-times "About to replace expr \*j_.*D. with ISRA" 0 "eipa_sra"  } } */
 /* { dg-final { scan-tree-dump-times "About to replace expr \*k_.*D. with ISRA" 0 "eipa_sra"  } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-5.c
index 2fe4ee741a3..3310a6df2e7 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-5.c
@@ -17,4 +17,3 @@ int *caller (void)
   return ox (&a, &b);
 }
 /* { dg-final { scan-tree-dump-times "base: j, remove_param" 0 "eipa_sra"  } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-sra-6.c b/gcc/testsuite/gcc.dg/ipa/ipa-sra-6.c
index 487e72ef4ca..89909f03307 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipa-sra-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipa-sra-6.c
@@ -31,4 +31,3 @@ int main (int argc, char *argv[])
 }
 
 /* { dg-final { scan-tree-dump-times "foo " 1 "eipa_sra"  } } */
-/* { dg-final { cleanup-tree-dump "eipa_sra" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipacost-1.c b/gcc/testsuite/gcc.dg/ipa/ipacost-1.c
index dc6b8f66983..eb9bbac1306 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipacost-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipacost-1.c
@@ -58,5 +58,3 @@ main()
 /* { dg-final { scan-ipa-dump-not "Creating a specialized node of i_can_not_be_propagated_fully/" "cp"  } } */
 /* { dg-final { scan-tree-dump-not "i_can_be_propagated_fully " "optimized"  } } */
 /* { dg-final { scan-tree-dump-not "i_can_be_propagated_fully2 " "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipacost-2.c b/gcc/testsuite/gcc.dg/ipa/ipacost-2.c
index 49b75c05cf5..43f01147091 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipacost-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipacost-2.c
@@ -77,5 +77,3 @@ main()
 /* { dg-final { scan-ipa-dump-not "Creating a specialized node of i_can_not_be_propagated_fully/" "cp"  } } */
 /* { dg-final { scan-tree-dump-not "i_can_be_propagated_fully \\(" "optimized"  } } */
 /* { dg-final { scan-tree-dump-not "i_can_be_propagated_fully2 \\(" "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-1.c b/gcc/testsuite/gcc.dg/ipa/ipcp-1.c
index a2ffd420203..9591c5e2ba1 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-1.c
@@ -47,6 +47,5 @@ main (int argc, char *argv[])
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of f.*for all known contexts" "cp" } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 7" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-2.c b/gcc/testsuite/gcc.dg/ipa/ipcp-2.c
index 62f564f216a..ca816a3380c 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-2.c
@@ -96,4 +96,3 @@ top2 (int q)
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of foo" 1 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "replacing param .. p with const 0" 3 "cp"  } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 s with const 4" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-3.c b/gcc/testsuite/gcc.dg/ipa/ipcp-3.c
index af4f50b2739..48b4c96f7b6 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-3.c
@@ -66,5 +66,4 @@ int main()
 
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of mark_cell" "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-4.c b/gcc/testsuite/gcc.dg/ipa/ipcp-4.c
index 462cade498e..980299b682d 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-4.c
@@ -63,6 +63,5 @@ main (int argc, char *argv[])
 /* { dg-final { scan-ipa-dump-not "Creating a specialized node of h.*for all known contexts" "cp" } } */
 /* { dg-final { scan-ipa-dump-times "replacing param .0 a with const 7" 2 "cp"  } } */
 /* { dg-final { scan-ipa-dump "replacing param .0 a with const 11" "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-1.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-1.c
index b2e04f87242..8cfc18799fa 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-1.c
@@ -32,6 +32,4 @@ entry (void)
 
 /* { dg-final { scan-ipa-dump "Creating a specialized node of foo.*for all known contexts" "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements:" 2 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-2.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-2.c
index 7edfa408a50..d142e2a95d3 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-2.c
@@ -38,6 +38,4 @@ entry (int c)
 }
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of foo/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements:" 4 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-3.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-3.c
index 4c0a3e7c54a..98e0ee03ff6 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-3.c
@@ -39,6 +39,4 @@ entry (int c)
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of foo/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements: 1" 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements: 0" 2 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-4.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-4.c
index 1c1da4d6847..5b0d6916654 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-4.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-4.c
@@ -57,6 +57,4 @@ entry2 (int c)
 
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of foo/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements:" 4 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-5.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-5.c
index 9f6ee5beea1..a1176cffc84 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-5.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-5.c
@@ -63,6 +63,4 @@ entry2 (int c)
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of foo/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of bar/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements:" 8 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-6.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-6.c
index 5d6425b5d2f..f8e5cd630f6 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-6.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-6.c
@@ -70,6 +70,4 @@ entry2 (int c)
 /* { dg-final { scan-ipa-dump-times "Creating a specialized node of bar/\[0-9\]*\\." 2 "cp" } } */
 /* { dg-final { scan-ipa-dump "Creating a specialized node of bar_2.*for all known contexts" "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Aggregate replacements:" 10 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-7.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-7.c
index e85ca1a9d09..285eb2be02c 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-7.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-7.c
@@ -49,6 +49,4 @@ entry (int c)
 }
 /* { dg-final { scan-ipa-dump-times "Clone of bar" 1 "cp" } } */
 /* { dg-final { scan-ipa-dump-times "Clone of foo" 1 "cp" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
 /* { dg-final { scan-tree-dump-not "->c;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-8.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-8.c
index 5014ffd3b76..a2a870d2e1a 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-8.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-8.c
@@ -49,4 +49,3 @@ entry (int c)
     }
 }
 /* { dg-final { scan-tree-dump "->b;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-9.c b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-9.c
index e6b4b965faa..2005a10dc15 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-agg-9.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-agg-9.c
@@ -41,5 +41,3 @@ int test1 (void)
 
 /* { dg-final { scan-ipa-dump "ipa-prop: Discovered an indirect call to a known target"  "cp"  } } */
 /* { dg-final { scan-ipa-dump "hooray1\[^\\n\]*inline copy in hiphip1"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/ipcp-ii-1.c b/gcc/testsuite/gcc.dg/ipa/ipcp-ii-1.c
index 9caa54beb79..c4202d1741d 100644
--- a/gcc/testsuite/gcc.dg/ipa/ipcp-ii-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/ipcp-ii-1.c
@@ -31,4 +31,3 @@ int main (int argc, int *argv[])
 }
 
 /* { dg-final { scan-ipa-dump "hooray\[^\\n\]*inline copy in hiphip.constprop"  "inline"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/noclone-1.c b/gcc/testsuite/gcc.dg/ipa/noclone-1.c
index 118df3a0096..c405e61b732 100644
--- a/gcc/testsuite/gcc.dg/ipa/noclone-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/noclone-1.c
@@ -26,4 +26,3 @@ int main ()
 
 
 /* { dg-final { scan-ipa-dump-times "versioned function" 0 "cp"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr63569.c b/gcc/testsuite/gcc.dg/ipa/pr63569.c
index 73b5a22bec8..56c76d17afa 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr63569.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr63569.c
@@ -28,4 +28,3 @@ int h(int t, int *a)
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr63595.c b/gcc/testsuite/gcc.dg/ipa/pr63595.c
index 52851fb18d9..d656de5748e 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr63595.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr63595.c
@@ -62,4 +62,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
 /* { dg-final { scan-ipa-dump "PHI results are different" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr63747.c b/gcc/testsuite/gcc.dg/ipa/pr63747.c
index 7b5df4baaf4..3e9fac7ee30 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr63747.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr63747.c
@@ -37,4 +37,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr64307.c b/gcc/testsuite/gcc.dg/ipa/pr64307.c
index 62caef09ff9..87537c6113f 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr64307.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr64307.c
@@ -29,4 +29,3 @@ int main()
 
 /* { dg-final { scan-ipa-dump "Semantic equality hit:real_part_2->real_part" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 1" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pr65318.c b/gcc/testsuite/gcc.dg/ipa/pr65318.c
index f23b3a2c36f..0ea2714fd07 100644
--- a/gcc/testsuite/gcc.dg/ipa/pr65318.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr65318.c
@@ -15,4 +15,3 @@ main ()
 }
 
 /* { dg-final { scan-ipa-dump "Equal symbols: 0" "icf"  } } */
-/* { dg-final { cleanup-ipa-dump "icf" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/propalign-1.c b/gcc/testsuite/gcc.dg/ipa/propalign-1.c
index 4997c994fa4..fe12682cec7 100644
--- a/gcc/testsuite/gcc.dg/ipa/propalign-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/propalign-1.c
@@ -28,5 +28,3 @@ bar (void)
 
 /* { dg-final { scan-ipa-dump "Adjusting alignment of param" "cp" } } */
 /* { dg-final { scan-tree-dump-not "fail_the_test" "optimized" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/propalign-2.c b/gcc/testsuite/gcc.dg/ipa/propalign-2.c
index 5a52648832f..ee2c71da21f 100644
--- a/gcc/testsuite/gcc.dg/ipa/propalign-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/propalign-2.c
@@ -54,5 +54,3 @@ bar2 (void)
 
 /* { dg-final { scan-ipa-dump "Adjusting alignment of param" "cp" } } */
 /* { dg-final { scan-tree-dump-not "fail_the_test" "optimized" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/propalign-3.c b/gcc/testsuite/gcc.dg/ipa/propalign-3.c
index e647cb17bef..a7b3fe2b611 100644
--- a/gcc/testsuite/gcc.dg/ipa/propalign-3.c
+++ b/gcc/testsuite/gcc.dg/ipa/propalign-3.c
@@ -54,5 +54,3 @@ bar2 (void)
 
 /* { dg-final { scan-ipa-dump-not "Adjusting alignment of param" "cp" } } */
 /* { dg-final { scan-tree-dump "fail_the_test" "optimized" } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/pure-const-1.c b/gcc/testsuite/gcc.dg/ipa/pure-const-1.c
index 3f04c861bbc..06b415e0c3c 100644
--- a/gcc/testsuite/gcc.dg/ipa/pure-const-1.c
+++ b/gcc/testsuite/gcc.dg/ipa/pure-const-1.c
@@ -75,7 +75,4 @@ test()
 /* { dg-final { scan-tree-dump "found to be looping pure: i_am_pure4" "local-pure-const1"} } */
 /* { dg-final { scan-ipa-dump "found to be const: i_am_const2" "pure-const"} } */
 /* { dg-final { scan-ipa-dump "found to be const: i_am_const3" "pure-const"} } */
-/* { dg-final { cleanup-tree-dump "local-pure-const1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
-/* { dg-final { cleanup-ipa-dump "pure-const" } } */
 
diff --git a/gcc/testsuite/gcc.dg/ipa/pure-const-2.c b/gcc/testsuite/gcc.dg/ipa/pure-const-2.c
index 2dcca18c09f..51d779776bc 100644
--- a/gcc/testsuite/gcc.dg/ipa/pure-const-2.c
+++ b/gcc/testsuite/gcc.dg/ipa/pure-const-2.c
@@ -26,5 +26,3 @@ main(void)
 }
 /* { dg-final { scan-tree-dump "found to be pure: i_am_pure" "local-pure-const1"} } */
 /* { dg-final { scan-tree-dump-not "i_am_pure" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "local-pure-const1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/remref-0.c b/gcc/testsuite/gcc.dg/ipa/remref-0.c
index a9e434a86d3..6073c028a98 100644
--- a/gcc/testsuite/gcc.dg/ipa/remref-0.c
+++ b/gcc/testsuite/gcc.dg/ipa/remref-0.c
@@ -26,5 +26,3 @@ int main (void)
 
 /* { dg-final { scan-ipa-dump "ipa-prop: Removed a reference"  "inline"  } } */
 /* { dg-final { scan-tree-dump-not "hooray"  "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/remref-1a.c b/gcc/testsuite/gcc.dg/ipa/remref-1a.c
index 9db2bd61927..4e48f628509 100644
--- a/gcc/testsuite/gcc.dg/ipa/remref-1a.c
+++ b/gcc/testsuite/gcc.dg/ipa/remref-1a.c
@@ -30,5 +30,3 @@ int main (void)
 
 /* { dg-final { scan-ipa-dump "ipa-prop: Removed a reference"  "inline"  } } */
 /* { dg-final { scan-tree-dump-not "hooray"  "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/remref-1b.c b/gcc/testsuite/gcc.dg/ipa/remref-1b.c
index a17cf4828a9..dfde800cfe7 100644
--- a/gcc/testsuite/gcc.dg/ipa/remref-1b.c
+++ b/gcc/testsuite/gcc.dg/ipa/remref-1b.c
@@ -32,6 +32,3 @@ int main (void)
 /* { dg-final { scan-ipa-dump "removing its cloning-created reference"  "cp"  } } */
 /* { dg-final { scan-ipa-dump "ipa-prop: Removed a reference"  "inline"  } } */
 /* { dg-final { scan-tree-dump-not "hooray"  "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/remref-2a.c b/gcc/testsuite/gcc.dg/ipa/remref-2a.c
index 4697a18abc5..34a6188249f 100644
--- a/gcc/testsuite/gcc.dg/ipa/remref-2a.c
+++ b/gcc/testsuite/gcc.dg/ipa/remref-2a.c
@@ -86,5 +86,3 @@ main (int argc, int *argv[])
 
 /* { dg-final { scan-ipa-dump-times "ipa-prop: Removed a reference" 2 "inline"  } } */
 /* { dg-final { scan-tree-dump-not "hooray"  "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ipa/remref-2b.c b/gcc/testsuite/gcc.dg/ipa/remref-2b.c
index 7799033d34e..698e74964e5 100644
--- a/gcc/testsuite/gcc.dg/ipa/remref-2b.c
+++ b/gcc/testsuite/gcc.dg/ipa/remref-2b.c
@@ -89,6 +89,3 @@ main (int argc, int *argv[])
 /* { dg-final { scan-ipa-dump "ipa-prop: Removed a reference"  "inline"  } } */
 /* { dg-final { scan-ipa-dump-times "ipa-prop: Removing cloning-created reference" 2 "inline"  } } */
 /* { dg-final { scan-tree-dump-not "hooray"  "optimized"  } } */
-/* { dg-final { cleanup-ipa-dump "cp" } } */
-/* { dg-final { cleanup-ipa-dump "inline" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ira-loop-pressure.c b/gcc/testsuite/gcc.dg/ira-loop-pressure.c
index 28ce6cde9b7..cf06c27031c 100644
--- a/gcc/testsuite/gcc.dg/ira-loop-pressure.c
+++ b/gcc/testsuite/gcc.dg/ira-loop-pressure.c
@@ -28,5 +28,4 @@ int foo (int a, int b, int c, int d)
 }
 
 /* { dg-final { scan-rtl-dump "Decided to move invariant" "loop2_invariant"  } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
 
diff --git a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
index 3cc96ab87f3..24ea45fe40e 100644
--- a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
+++ b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-1.c
@@ -27,5 +27,3 @@ bar (long a)
 /* { dg-final { scan-rtl-dump "Will split live ranges of parameters" "ira"  } } */
 /* { dg-final { scan-rtl-dump "Split live-range of register" "ira"  } } */
 /* { dg-final { scan-rtl-dump "Performing shrink-wrapping" "pro_and_epilogue"  } } */
-/* { dg-final { cleanup-rtl-dump "ira" } } */
-/* { dg-final { cleanup-rtl-dump "pro_and_epilogue" } } */
diff --git a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
index 253f47700ae..a7f846a1dcd 100644
--- a/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
+++ b/gcc/testsuite/gcc.dg/ira-shrinkwrap-prep-2.c
@@ -32,5 +32,3 @@ bar (long a)
 /* { dg-final { scan-rtl-dump "Will split live ranges of parameters" "ira"  } } */
 /* { dg-final { scan-rtl-dump "Split live-range of register" "ira"  } } */
 /* { dg-final { scan-rtl-dump "Performing shrink-wrapping" "pro_and_epilogue"  } } */
-/* { dg-final { cleanup-rtl-dump "ira" } } */
-/* { dg-final { cleanup-rtl-dump "pro_and_epilogue" } } */
diff --git a/gcc/testsuite/gcc.dg/loop-7.c b/gcc/testsuite/gcc.dg/loop-7.c
index 0457add9c79..9f7196f49a1 100644
--- a/gcc/testsuite/gcc.dg/loop-7.c
+++ b/gcc/testsuite/gcc.dg/loop-7.c
@@ -12,5 +12,4 @@ void f(int *a)
 
 /* Load of 0 is moved out of the loop.  */
 /* { dg-final { scan-rtl-dump-times "Decided" 1 "loop2_invariant" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
 
diff --git a/gcc/testsuite/gcc.dg/loop-8.c b/gcc/testsuite/gcc.dg/loop-8.c
index 592e54cf417..bedfa5d1ac4 100644
--- a/gcc/testsuite/gcc.dg/loop-8.c
+++ b/gcc/testsuite/gcc.dg/loop-8.c
@@ -20,5 +20,4 @@ f (int *a, int *b)
 /* Load of 42 is moved out of the loop, introducing a new pseudo register.  */
 /* { dg-final { scan-rtl-dump-times "Decided" 1 "loop2_invariant" } } */
 /* { dg-final { scan-rtl-dump-not "without introducing a new temporary register" "loop2_invariant" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
 
diff --git a/gcc/testsuite/gcc.dg/loop-9.c b/gcc/testsuite/gcc.dg/loop-9.c
index 96412ed2d07..12f790a45ba 100644
--- a/gcc/testsuite/gcc.dg/loop-9.c
+++ b/gcc/testsuite/gcc.dg/loop-9.c
@@ -12,5 +12,4 @@ f (double *a)
 /* Load of x is moved out of the loop.  */
 /* { dg-final { scan-rtl-dump "Decided" "loop2_invariant" } } */
 /* { dg-final { scan-rtl-dump "without introducing a new temporary register" "loop2_invariant" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
 
diff --git a/gcc/testsuite/gcc.dg/loop-invariant.c b/gcc/testsuite/gcc.dg/loop-invariant.c
index 9571269084f..fe66bb9aaf0 100644
--- a/gcc/testsuite/gcc.dg/loop-invariant.c
+++ b/gcc/testsuite/gcc.dg/loop-invariant.c
@@ -40,4 +40,3 @@ loop_invar (struct test_node *node)
 }
 
 /* { dg-final { scan-rtl-dump "Decided to move invariant" "loop2_invariant" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
diff --git a/gcc/testsuite/gcc.dg/lower-subreg-1.c b/gcc/testsuite/gcc.dg/lower-subreg-1.c
index 102ba22b431..6362d37a878 100644
--- a/gcc/testsuite/gcc.dg/lower-subreg-1.c
+++ b/gcc/testsuite/gcc.dg/lower-subreg-1.c
@@ -6,4 +6,3 @@
 long long test (long long a, long long b) { return a | b; }
 
 /* { dg-final { scan-rtl-dump "Splitting reg" "subreg1" } } */
-/* { dg-final { cleanup-rtl-dump "subreg1" } } */
diff --git a/gcc/testsuite/gcc.dg/macro-fusion-1.c b/gcc/testsuite/gcc.dg/macro-fusion-1.c
index b2d11423acf..92f82b25171 100644
--- a/gcc/testsuite/gcc.dg/macro-fusion-1.c
+++ b/gcc/testsuite/gcc.dg/macro-fusion-1.c
@@ -12,4 +12,3 @@ double bar (double sum)
 }
 
 /* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
-/* { dg-final { cleanup-rtl-dump "sched2" } } */
diff --git a/gcc/testsuite/gcc.dg/macro-fusion-2.c b/gcc/testsuite/gcc.dg/macro-fusion-2.c
index ad7489a73ad..6dc1e27e3c4 100644
--- a/gcc/testsuite/gcc.dg/macro-fusion-2.c
+++ b/gcc/testsuite/gcc.dg/macro-fusion-2.c
@@ -15,4 +15,3 @@ double bar (double sum)
 }
 
 /* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
-/* { dg-final { cleanup-rtl-dump "sched2" } } */
diff --git a/gcc/testsuite/gcc.dg/memcpy-1.c b/gcc/testsuite/gcc.dg/memcpy-1.c
index 0952a261ad0..7c0f9449ce8 100644
--- a/gcc/testsuite/gcc.dg/memcpy-1.c
+++ b/gcc/testsuite/gcc.dg/memcpy-1.c
@@ -2,7 +2,6 @@
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 /* PR36598 AVR fail maybe due to cost metrics */
 /* { dg-final { scan-tree-dump-times "nasty_local\\." 0 "optimized" { xfail { "avr-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 struct a {int a,b,c;} a;
 int test(struct a a)
 {
diff --git a/gcc/testsuite/gcc.dg/memcpy-3.c b/gcc/testsuite/gcc.dg/memcpy-3.c
index 3b5693b13ef..686668de10f 100644
--- a/gcc/testsuite/gcc.dg/memcpy-3.c
+++ b/gcc/testsuite/gcc.dg/memcpy-3.c
@@ -11,4 +11,3 @@ int get_int(const void *p)
 
 /* { dg-final { scan-tree-dump-not "memcpy" "optimized" } } */
 /* { dg-final { scan-tree-dump-times "MEM" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/memcpy-4.c b/gcc/testsuite/gcc.dg/memcpy-4.c
index cff477a981e..4c726f0ad74 100644
--- a/gcc/testsuite/gcc.dg/memcpy-4.c
+++ b/gcc/testsuite/gcc.dg/memcpy-4.c
@@ -11,4 +11,3 @@ f1 (char *p)
 }
 
 /* { dg-final { scan-rtl-dump "mem/u.*mem/u" "expand" { target mips*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/memcpy-5.c b/gcc/testsuite/gcc.dg/memcpy-5.c
index 9f98bbabd61..92788a59693 100644
--- a/gcc/testsuite/gcc.dg/memcpy-5.c
+++ b/gcc/testsuite/gcc.dg/memcpy-5.c
@@ -25,4 +25,3 @@ TEST (d64d, double __attribute__((vector_size (64))));
 TEST (d128d, double __attribute__((vector_size (128))));
 
 /* { dg-final { scan-tree-dump-not "memcpy" "optimized" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/memmove-1.c b/gcc/testsuite/gcc.dg/memmove-1.c
index 498cf60c598..e22a8076091 100644
--- a/gcc/testsuite/gcc.dg/memmove-1.c
+++ b/gcc/testsuite/gcc.dg/memmove-1.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-times "memmove" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 static const char a[100]={1,2,3,4};
 char b[1000];
 int i,i1;
diff --git a/gcc/testsuite/gcc.dg/memmove-2.c b/gcc/testsuite/gcc.dg/memmove-2.c
index 9c691ef01c3..9d9c8c91fb4 100644
--- a/gcc/testsuite/gcc.dg/memmove-2.c
+++ b/gcc/testsuite/gcc.dg/memmove-2.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-times "memmove" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 char a[40];
 extern void bar (char *);
diff --git a/gcc/testsuite/gcc.dg/memmove-3.c b/gcc/testsuite/gcc.dg/memmove-3.c
index 98493b3d42c..6c786edb95b 100644
--- a/gcc/testsuite/gcc.dg/memmove-3.c
+++ b/gcc/testsuite/gcc.dg/memmove-3.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-times "memmove" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 char a[40];
 struct A { char a[30]; };
diff --git a/gcc/testsuite/gcc.dg/memmove-4.c b/gcc/testsuite/gcc.dg/memmove-4.c
index 120a4db219e..5949aaa30c5 100644
--- a/gcc/testsuite/gcc.dg/memmove-4.c
+++ b/gcc/testsuite/gcc.dg/memmove-4.c
@@ -9,4 +9,3 @@ void b(char *a, char *b, int i)
 }
 
 /* { dg-final { scan-tree-dump-not "memmove" "optimized" { xfail { ! non_strict_align } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/minmax-1.c b/gcc/testsuite/gcc.dg/minmax-1.c
index e279c0e20fe..6c02ed8eddb 100644
--- a/gcc/testsuite/gcc.dg/minmax-1.c
+++ b/gcc/testsuite/gcc.dg/minmax-1.c
@@ -80,4 +80,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "MIN_EXPR" 0 "original"} } */
 /* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "original"} } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/modmod.c b/gcc/testsuite/gcc.dg/modmod.c
index 577d0aa5462..e09a20beb37 100644
--- a/gcc/testsuite/gcc.dg/modmod.c
+++ b/gcc/testsuite/gcc.dg/modmod.c
@@ -10,4 +10,3 @@ int g(unsigned a, unsigned b){
 }
 
 /* { dg-final { scan-tree-dump-times "trunc_mod_expr" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/nand.c b/gcc/testsuite/gcc.dg/nand.c
index 28df5819ee0..ebb6c39e3f1 100644
--- a/gcc/testsuite/gcc.dg/nand.c
+++ b/gcc/testsuite/gcc.dg/nand.c
@@ -9,4 +9,3 @@ unsigned g(unsigned x, unsigned y){
 }
 
 /* { dg-final { scan-tree-dump-times "return ~x & y;" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/nested-func-7.c b/gcc/testsuite/gcc.dg/nested-func-7.c
index 764beb45373..44c0945e1a4 100644
--- a/gcc/testsuite/gcc.dg/nested-func-7.c
+++ b/gcc/testsuite/gcc.dg/nested-func-7.c
@@ -12,4 +12,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-not "bar" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-1.c b/gcc/testsuite/gcc.dg/no-strict-overflow-1.c
index b83b3ae80d3..f3c2dda296e 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-1.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-1.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "-[ ]*5" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-2.c b/gcc/testsuite/gcc.dg/no-strict-overflow-2.c
index aec8960ad52..4cfd9295b80 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-2.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-2.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "100" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-3.c b/gcc/testsuite/gcc.dg/no-strict-overflow-3.c
index e34e9183c0c..fd4defbd447 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-3.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-3.c
@@ -13,4 +13,3 @@ foo (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump "1000" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-4.c b/gcc/testsuite/gcc.dg/no-strict-overflow-4.c
index c3b57bba022..b6d3da3f831 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-4.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-4.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "\[^ \]*_.(\\\(D\\\))? (>|<) \[^ \]*_." "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-5.c b/gcc/testsuite/gcc.dg/no-strict-overflow-5.c
index a63bf342b56..aaeb45aedb2 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-5.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-5.c
@@ -17,4 +17,3 @@ int foo (int i)
 }
 
 /* { dg-final { scan-tree-dump-times "r = 3" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-6.c b/gcc/testsuite/gcc.dg/no-strict-overflow-6.c
index 43200bb20bc..c69e9689581 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-6.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-6.c
@@ -18,4 +18,3 @@ foo ()
 }
 
 /* { dg-final { scan-tree-dump "return bits" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-7.c b/gcc/testsuite/gcc.dg/no-strict-overflow-7.c
index c237af98407..19e1b55bb12 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-7.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-7.c
@@ -13,4 +13,3 @@ foo (char* p)
 }
 
 /* { dg-final { scan-tree-dump "\[+\]\[ \]*1000" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/no-strict-overflow-8.c b/gcc/testsuite/gcc.dg/no-strict-overflow-8.c
index 11ef9358d5a..51df1c4470c 100644
--- a/gcc/testsuite/gcc.dg/no-strict-overflow-8.c
+++ b/gcc/testsuite/gcc.dg/no-strict-overflow-8.c
@@ -22,4 +22,3 @@ foo (struct c *p)
 }
 
 /* { dg-final { scan-tree-dump "i_.* > 0" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/nrv3.c b/gcc/testsuite/gcc.dg/nrv3.c
index c28b8ec570d..9723712f7d0 100644
--- a/gcc/testsuite/gcc.dg/nrv3.c
+++ b/gcc/testsuite/gcc.dg/nrv3.c
@@ -32,4 +32,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "return slot optimization" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/nrv4.c b/gcc/testsuite/gcc.dg/nrv4.c
index e213d860e27..ff83d0c0300 100644
--- a/gcc/testsuite/gcc.dg/nrv4.c
+++ b/gcc/testsuite/gcc.dg/nrv4.c
@@ -29,5 +29,4 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "return slot optimization" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/nrv5.c b/gcc/testsuite/gcc.dg/nrv5.c
index 629b0f329e8..371e713aca7 100644
--- a/gcc/testsuite/gcc.dg/nrv5.c
+++ b/gcc/testsuite/gcc.dg/nrv5.c
@@ -25,4 +25,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "return slot optimization" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c b/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
index 6142e55c51d..0b5fe29687a 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
@@ -58,4 +58,3 @@ swap64_c (uint64_t x)
 
 
 /* { dg-final { scan-tree-dump-times "64 bit bswap implementation found at" 3 "bswap" } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapdi-2.c b/gcc/testsuite/gcc.dg/optimize-bswapdi-2.c
index b8ad2c13c40..7ac0323825a 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapdi-2.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapdi-2.c
@@ -23,4 +23,3 @@ swap64_c (uint64_t x)
 
 
 /* { dg-final { scan-tree-dump-times "64 bit bswap implementation found at" 1 "bswap" } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapdi-3.c b/gcc/testsuite/gcc.dg/optimize-bswapdi-3.c
index d96d7e51025..3c66505a64f 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapdi-3.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapdi-3.c
@@ -61,4 +61,3 @@ uint64_t read_be64_3 (unsigned char *data)
 
 /* { dg-final { scan-tree-dump-times "64 bit load in target endianness found at" 3 "bswap" } } */
 /* { dg-final { scan-tree-dump-times "64 bit bswap implementation found at" 3 "bswap" { xfail alpha*-*-* arm*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswaphi-1.c b/gcc/testsuite/gcc.dg/optimize-bswaphi-1.c
index 692fceb951f..c18ca6174d1 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswaphi-1.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswaphi-1.c
@@ -57,4 +57,3 @@ swap16 (HItype in)
 /* { dg-final { scan-tree-dump-times "16 bit load in target endianness found at" 3 "bswap" } } */
 /* { dg-final { scan-tree-dump-times "16 bit bswap implementation found at" 1 "bswap" { target alpha*-*-* arm*-*-* } } } */
 /* { dg-final { scan-tree-dump-times "16 bit bswap implementation found at" 4 "bswap" { xfail alpha*-*-* arm*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
index ad3ede49255..fb1d884c0fb 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
@@ -90,4 +90,3 @@ swap32_f (unsigned in)
 }
 
 /* { dg-final { scan-tree-dump-times "32 bit bswap implementation found at" 6 "bswap" } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
index de6e6971478..dfa37634226 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-2.c
@@ -46,4 +46,3 @@ uint32_t read_be32_3 (unsigned char *data)
 
 /* { dg-final { scan-tree-dump-times "32 bit load in target endianness found at" 3 "bswap" } } */
 /* { dg-final { scan-tree-dump-times "32 bit bswap implementation found at" 3 "bswap" { xfail alpha*-*-* arm*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-3.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-3.c
index 79f2147e3a2..0306455030d 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswapsi-3.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-3.c
@@ -21,4 +21,3 @@ swap32 (SItype in)
 }
 
 /* { dg-final { scan-tree-dump-not "32 bit bswap implementation found at" "bswap" } } */
-/* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/opts-4.c b/gcc/testsuite/gcc.dg/opts-4.c
index 11bfbed8a6a..b549ec623d5 100644
--- a/gcc/testsuite/gcc.dg/opts-4.c
+++ b/gcc/testsuite/gcc.dg/opts-4.c
@@ -6,4 +6,3 @@ void f (void)
 {
 }
 
-/* { dg-final { cleanup-rtl-dump "*" } } */
diff --git a/gcc/testsuite/gcc.dg/pch/save-temps-1.c b/gcc/testsuite/gcc.dg/pch/save-temps-1.c
index 9a5e7223c73..345b4a6d227 100644
--- a/gcc/testsuite/gcc.dg/pch/save-temps-1.c
+++ b/gcc/testsuite/gcc.dg/pch/save-temps-1.c
@@ -5,5 +5,4 @@
 #endif
 #include <stddef.h>
 int x;
-
-/* { dg-final { cleanup-saved-temps ".s" } } */
+/* { dg-keep-saved-temps ".s" } */
diff --git a/gcc/testsuite/gcc.dg/pointer-arith-10.c b/gcc/testsuite/gcc.dg/pointer-arith-10.c
index 52b1989ef93..00e75973e17 100644
--- a/gcc/testsuite/gcc.dg/pointer-arith-10.c
+++ b/gcc/testsuite/gcc.dg/pointer-arith-10.c
@@ -7,4 +7,3 @@ char *foo(char *p, __UINTPTR_TYPE__ i)
 }
 
 /* { dg-final { scan-tree-dump "p +" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pow-sqrt-synth-1.c b/gcc/testsuite/gcc.dg/pow-sqrt-synth-1.c
index d55b6263438..4a94325cdb3 100644
--- a/gcc/testsuite/gcc.dg/pow-sqrt-synth-1.c
+++ b/gcc/testsuite/gcc.dg/pow-sqrt-synth-1.c
@@ -35,4 +35,3 @@ vecfoo (double *a)
 }
 
 /* { dg-final { scan-tree-dump-times "synthesizing" 7 "sincos" } } */
-/* { dg-final { cleanup-tree-dump "sincos" } } */
diff --git a/gcc/testsuite/gcc.dg/pr10474.c b/gcc/testsuite/gcc.dg/pr10474.c
index 726ff4e516c..ee9edd442c9 100644
--- a/gcc/testsuite/gcc.dg/pr10474.c
+++ b/gcc/testsuite/gcc.dg/pr10474.c
@@ -13,4 +13,3 @@ void f(int *i)
 }
 
 /* { dg-final { scan-rtl-dump "Performing shrink-wrapping" "pro_and_epilogue"  } } */
-/* { dg-final { cleanup-rtl-dump "pro_and_epilogue" } } */
diff --git a/gcc/testsuite/gcc.dg/pr14796-1.c b/gcc/testsuite/gcc.dg/pr14796-1.c
index 7ddc4fe3467..69328a91bb7 100644
--- a/gcc/testsuite/gcc.dg/pr14796-1.c
+++ b/gcc/testsuite/gcc.dg/pr14796-1.c
@@ -21,4 +21,3 @@ int l (int d) {
 /* { dg-final { scan-tree-dump "b & -32" "gimple" } } */
 /* { dg-final { scan-tree-dump "c & 15" "gimple" } } */
 /* { dg-final { scan-tree-dump "d << 6" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr14796-2.c b/gcc/testsuite/gcc.dg/pr14796-2.c
index c0a91dc955b..d9dc4c8daea 100644
--- a/gcc/testsuite/gcc.dg/pr14796-2.c
+++ b/gcc/testsuite/gcc.dg/pr14796-2.c
@@ -20,4 +20,3 @@ long long j (long long c) {
 /* { dg-final { scan-tree-dump-times "= 0" 2 "gimple" } } */
 /* { dg-final { scan-tree-dump "b >> 31" "gimple" } } */
 /* { dg-final { scan-tree-dump "c & -(34359738368|0x800000000)" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr15784-1.c b/gcc/testsuite/gcc.dg/pr15784-1.c
index 77e398e1da8..38c569d186f 100644
--- a/gcc/testsuite/gcc.dg/pr15784-1.c
+++ b/gcc/testsuite/gcc.dg/pr15784-1.c
@@ -40,4 +40,3 @@ int i (float x) {
 	return fabs(x) == -0.0;
 }
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr15784-2.c b/gcc/testsuite/gcc.dg/pr15784-2.c
index eb1608c64ed..471b6044b05 100644
--- a/gcc/testsuite/gcc.dg/pr15784-2.c
+++ b/gcc/testsuite/gcc.dg/pr15784-2.c
@@ -9,4 +9,3 @@ int a (float x) {
 }
 
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr15784-3.c b/gcc/testsuite/gcc.dg/pr15784-3.c
index 746f9660e48..c17d9e04336 100644
--- a/gcc/testsuite/gcc.dg/pr15784-3.c
+++ b/gcc/testsuite/gcc.dg/pr15784-3.c
@@ -11,4 +11,3 @@ int a (float x) {
 }
 
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr15784-4.c b/gcc/testsuite/gcc.dg/pr15784-4.c
index 6549c720555..64ee719eb59 100644
--- a/gcc/testsuite/gcc.dg/pr15784-4.c
+++ b/gcc/testsuite/gcc.dg/pr15784-4.c
@@ -10,4 +10,3 @@ int b (int x) {
 
 /* { dg-final { scan-tree-dump "~x_..D.;" "optimized" } } */
 /* { dg-final { scan-tree-dump "-x_..D.;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr19105.c b/gcc/testsuite/gcc.dg/pr19105.c
index 499aa895651..75db50759f2 100644
--- a/gcc/testsuite/gcc.dg/pr19105.c
+++ b/gcc/testsuite/gcc.dg/pr19105.c
@@ -18,5 +18,4 @@ int range2 (enum e v, int x)
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing range tests v_\[0-9\]*.D. -.2, 2. and -.3, 4.\[\n\r\]* into|Optimizing range tests v_\[0-9\]*.D. -.2, 2. and -.3, 3. and -.4, 4.\[\n\r\]* into" 1 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/pr19988.c b/gcc/testsuite/gcc.dg/pr19988.c
index aa2fed13961..c6fb52f08fa 100644
--- a/gcc/testsuite/gcc.dg/pr19988.c
+++ b/gcc/testsuite/gcc.dg/pr19988.c
@@ -10,5 +10,3 @@ double foo(double x, double y)
 /* { dg-final { scan-tree-dump-times " 1.23" 2 "original" } } */
 /* CSE one multiplication.  */
 /* { dg-final { scan-tree-dump-times " \\\* " 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20115-1.c b/gcc/testsuite/gcc.dg/pr20115-1.c
index 60313cd53d0..d1c4066729f 100644
--- a/gcc/testsuite/gcc.dg/pr20115-1.c
+++ b/gcc/testsuite/gcc.dg/pr20115-1.c
@@ -12,4 +12,3 @@ int bar()
 
 /* Check that we only have one call to foo.  */
 /* { dg-final { scan-tree-dump-times "foo" 1 "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20130-1.c b/gcc/testsuite/gcc.dg/pr20130-1.c
index 9763725602c..43ba57b62cc 100644
--- a/gcc/testsuite/gcc.dg/pr20130-1.c
+++ b/gcc/testsuite/gcc.dg/pr20130-1.c
@@ -12,4 +12,3 @@ int y (int a) {
 	return -(-1 * -a);
 }
 /* { dg-final { scan-tree-dump-times "-a" 3 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-1.c b/gcc/testsuite/gcc.dg/pr20922-1.c
index cfa8a29ef7e..61a63a07daf 100644
--- a/gcc/testsuite/gcc.dg/pr20922-1.c
+++ b/gcc/testsuite/gcc.dg/pr20922-1.c
@@ -35,4 +35,3 @@ int z(double i)
   return (i + (-2.0)) > i;
 }
 /* { dg-final { scan-tree-dump-times " = 0" 7 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-2.c b/gcc/testsuite/gcc.dg/pr20922-2.c
index 4bbebfd5f17..88f285d0050 100644
--- a/gcc/testsuite/gcc.dg/pr20922-2.c
+++ b/gcc/testsuite/gcc.dg/pr20922-2.c
@@ -15,4 +15,3 @@ int h (double i)
   return (i + 2.0) <= i;
 }
 /* { dg-final { scan-tree-dump-times " = 0" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-3.c b/gcc/testsuite/gcc.dg/pr20922-3.c
index 84ecafef968..349e60ca42b 100644
--- a/gcc/testsuite/gcc.dg/pr20922-3.c
+++ b/gcc/testsuite/gcc.dg/pr20922-3.c
@@ -30,4 +30,3 @@ int z(double i)
   return (i + (-2.0)) <= i;
 }
 /* { dg-final { scan-tree-dump-times " = 1" 6 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-4.c b/gcc/testsuite/gcc.dg/pr20922-4.c
index 0240435fad2..0c9a7fc8330 100644
--- a/gcc/testsuite/gcc.dg/pr20922-4.c
+++ b/gcc/testsuite/gcc.dg/pr20922-4.c
@@ -35,4 +35,3 @@ int z(double i)
   return i < (i + (-2.0));
 }
 /* { dg-final { scan-tree-dump-times " = 0" 7 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-5.c b/gcc/testsuite/gcc.dg/pr20922-5.c
index db94c7ba032..ee3d4ef5dc2 100644
--- a/gcc/testsuite/gcc.dg/pr20922-5.c
+++ b/gcc/testsuite/gcc.dg/pr20922-5.c
@@ -20,4 +20,3 @@ int j (double i)
   return i > i + 2.0;
 }
 /* { dg-final { scan-tree-dump-times " = 0" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr20922-6.c b/gcc/testsuite/gcc.dg/pr20922-6.c
index 65a8f1d5681..bef485ead6f 100644
--- a/gcc/testsuite/gcc.dg/pr20922-6.c
+++ b/gcc/testsuite/gcc.dg/pr20922-6.c
@@ -30,4 +30,3 @@ int z(double i)
   return i >= (i + (-2.0));
 }
 /* { dg-final { scan-tree-dump-times " = 1" 6 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr21032.c b/gcc/testsuite/gcc.dg/pr21032.c
index 839a180cead..4093d53e3d1 100644
--- a/gcc/testsuite/gcc.dg/pr21032.c
+++ b/gcc/testsuite/gcc.dg/pr21032.c
@@ -8,4 +8,3 @@ void foo(double x)
 }
 
 /* { dg-final { scan-tree-dump-not "-\\(float\\)" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr21643.c b/gcc/testsuite/gcc.dg/pr21643.c
index be5a15e98d2..bd76aa8091b 100644
--- a/gcc/testsuite/gcc.dg/pr21643.c
+++ b/gcc/testsuite/gcc.dg/pr21643.c
@@ -87,4 +87,3 @@ f9 (unsigned char c)
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing range tests c_\[0-9\]*.D. -.0, 31. and -.32, 32.\[\n\r\]* into" 6 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr23295.c b/gcc/testsuite/gcc.dg/pr23295.c
index 0418964a709..1a7c97cac7a 100644
--- a/gcc/testsuite/gcc.dg/pr23295.c
+++ b/gcc/testsuite/gcc.dg/pr23295.c
@@ -7,4 +7,3 @@ int foo(int i)
 }
 
 /* { dg-final { scan-tree-dump "-5 - i" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr23470-1.c b/gcc/testsuite/gcc.dg/pr23470-1.c
index 130a3dd3c97..2c35036d147 100644
--- a/gcc/testsuite/gcc.dg/pr23470-1.c
+++ b/gcc/testsuite/gcc.dg/pr23470-1.c
@@ -11,4 +11,3 @@ int f(double a, double b)
 }
 
 /* { dg-final { scan-tree-dump-times "if \\(0\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr23584.c b/gcc/testsuite/gcc.dg/pr23584.c
index 691a11956ba..0ac388997aa 100644
--- a/gcc/testsuite/gcc.dg/pr23584.c
+++ b/gcc/testsuite/gcc.dg/pr23584.c
@@ -18,4 +18,3 @@ int test2 (void)
 
 /* { dg-final { scan-ipa-dump-not "found to be pure: test1" "pure-const" } } */
 /* { dg-final { scan-ipa-dump-not "found to be pure: test2" "pure-const" } } */
-/* { dg-final { cleanup-ipa-dump "pure-const" } } */
diff --git a/gcc/testsuite/gcc.dg/pr23623.c b/gcc/testsuite/gcc.dg/pr23623.c
index e076b600335..a0a92e0618d 100644
--- a/gcc/testsuite/gcc.dg/pr23623.c
+++ b/gcc/testsuite/gcc.dg/pr23623.c
@@ -45,4 +45,3 @@ void readb(void)
    the parenthesized subexpression in the regexp introduces an extra match
    variable, we need to give a count of 12 instead of 6 here.  */
 /* { dg-final { scan-rtl-dump-times "mem/v(/.)*:SI" 12 "final" } } */
-/* { dg-final { cleanup-rtl-dump "final" } } */
diff --git a/gcc/testsuite/gcc.dg/pr23911.c b/gcc/testsuite/gcc.dg/pr23911.c
index b77dbaab910..2c2739712c5 100644
--- a/gcc/testsuite/gcc.dg/pr23911.c
+++ b/gcc/testsuite/gcc.dg/pr23911.c
@@ -18,4 +18,3 @@ test (void)
    constant folded.  There should be no loads from b left.  */
 /* { dg-final { scan-tree-dump-times "__complex__ \\\(1.0e\\\+0, 0.0\\\)" 2 "dce2" } } */
 /* { dg-final { scan-tree-dump-times "= b" 0 "dce2" } } */
-/* { dg-final { cleanup-tree-dump "dce2" } } */
diff --git a/gcc/testsuite/gcc.dg/pr27132.c b/gcc/testsuite/gcc.dg/pr27132.c
index 272862a2d84..25998bcf017 100644
--- a/gcc/testsuite/gcc.dg/pr27132.c
+++ b/gcc/testsuite/gcc.dg/pr27132.c
@@ -7,4 +7,3 @@ int foo(int i)
 }
 
 /* { dg-final { scan-tree-dump "i \\+ 1" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr28685-1.c b/gcc/testsuite/gcc.dg/pr28685-1.c
index 1eb8c2d457b..6b7b9175c79 100644
--- a/gcc/testsuite/gcc.dg/pr28685-1.c
+++ b/gcc/testsuite/gcc.dg/pr28685-1.c
@@ -47,4 +47,3 @@ int test5 (int a, int b)
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-not " < " "optimized" } } */
 /* { dg-final { scan-tree-dump-not " == " "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr29215.c b/gcc/testsuite/gcc.dg/pr29215.c
index 9869c85d430..fc1a0af87a9 100644
--- a/gcc/testsuite/gcc.dg/pr29215.c
+++ b/gcc/testsuite/gcc.dg/pr29215.c
@@ -30,4 +30,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-not "memcpy" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr29801.c b/gcc/testsuite/gcc.dg/pr29801.c
index b61ae51425d..367b561e7a2 100644
--- a/gcc/testsuite/gcc.dg/pr29801.c
+++ b/gcc/testsuite/gcc.dg/pr29801.c
@@ -21,4 +21,3 @@ int test (int param)
 /* { dg-final { scan-tree-dump-times "return 2" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 5" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr30137-1.c b/gcc/testsuite/gcc.dg/pr30137-1.c
index cf1b4063496..4e32ce29849 100644
--- a/gcc/testsuite/gcc.dg/pr30137-1.c
+++ b/gcc/testsuite/gcc.dg/pr30137-1.c
@@ -20,4 +20,3 @@ int foo13 (void) { return *p != &p; }
 
 /* { dg-final { scan-tree-dump-not "= 0;" "gimple" } } */
 /* { dg-final { scan-tree-dump-not "= 1;" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr30137-2.c b/gcc/testsuite/gcc.dg/pr30137-2.c
index 53be1633b7b..ce029b60694 100644
--- a/gcc/testsuite/gcc.dg/pr30137-2.c
+++ b/gcc/testsuite/gcc.dg/pr30137-2.c
@@ -17,4 +17,3 @@ int foo8 (void) { return &x.u.i == &x.u.s; }
 
 /* { dg-final { scan-tree-dump-times "= 0" 1 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "= 1" 7 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr30172-1.c b/gcc/testsuite/gcc.dg/pr30172-1.c
index 2388a091ce8..015b558d067 100644
--- a/gcc/testsuite/gcc.dg/pr30172-1.c
+++ b/gcc/testsuite/gcc.dg/pr30172-1.c
@@ -12,4 +12,3 @@ _Complex double test5 (double x, double y) { return (x + y * 1.i) * -1.i; }
 /* { dg-final { scan-tree-dump "COMPLEX_EXPR <x, y>" "gimple" } } */
 /* { dg-final { scan-tree-dump "D.* = -y;\n.*COMPLEX_EXPR <D.*, x>" "gimple" } } */
 /* { dg-final { scan-tree-dump "D.* = -x;\n.*COMPLEX_EXPR <y, D.*>" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr30904.c b/gcc/testsuite/gcc.dg/pr30904.c
index 244ee51f290..940ddf39913 100644
--- a/gcc/testsuite/gcc.dg/pr30904.c
+++ b/gcc/testsuite/gcc.dg/pr30904.c
@@ -15,4 +15,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"  } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr30957-1.c b/gcc/testsuite/gcc.dg/pr30957-1.c
index f34c6e53703..6a0ed2045c1 100644
--- a/gcc/testsuite/gcc.dg/pr30957-1.c
+++ b/gcc/testsuite/gcc.dg/pr30957-1.c
@@ -34,4 +34,3 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump "Expanding Accumulator" "loop2_unroll" } } */
-/* { dg-final { cleanup-rtl-dump "loop*" } } */
diff --git a/gcc/testsuite/gcc.dg/pr31847.c b/gcc/testsuite/gcc.dg/pr31847.c
index 4b945a994aa..cf8e04dba84 100644
--- a/gcc/testsuite/gcc.dg/pr31847.c
+++ b/gcc/testsuite/gcc.dg/pr31847.c
@@ -12,4 +12,3 @@ int foo()
 }
 
 /* { dg-final { scan-tree-dump-not "Created value  for " "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr32328.c b/gcc/testsuite/gcc.dg/pr32328.c
index 69b08fc4fdf..7aa709f8923 100644
--- a/gcc/testsuite/gcc.dg/pr32328.c
+++ b/gcc/testsuite/gcc.dg/pr32328.c
@@ -14,4 +14,3 @@ void baz()
 }
 
 /* { dg-final { scan-tree-dump "Everything OK" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr32721.c b/gcc/testsuite/gcc.dg/pr32721.c
index b62272b56ff..c9526f67a9b 100644
--- a/gcc/testsuite/gcc.dg/pr32721.c
+++ b/gcc/testsuite/gcc.dg/pr32721.c
@@ -16,4 +16,3 @@ spinlock1 = &spinlock[1];
 
 /* { dg-final { scan-tree-dump "={v} .*spinlock" "optimized" } } */
 /* { dg-final { scan-tree-dump "spinlock.* ={v}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr32912-3.c b/gcc/testsuite/gcc.dg/pr32912-3.c
index 407ac524f2d..04d9e2dd8ff 100644
--- a/gcc/testsuite/gcc.dg/pr32912-3.c
+++ b/gcc/testsuite/gcc.dg/pr32912-3.c
@@ -11,4 +11,3 @@ bar (void)
 }
 
 /* { dg-final { scan-tree-dump-not "~\{" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr33653.c b/gcc/testsuite/gcc.dg/pr33653.c
index 91274c27e66..966efecd89b 100644
--- a/gcc/testsuite/gcc.dg/pr33653.c
+++ b/gcc/testsuite/gcc.dg/pr33653.c
@@ -7,4 +7,3 @@ void f (volatile char *p)
 }
 
 /* { dg-final { scan-rtl-dump "mem/v" "shorten" } } */
-/* { dg-final { cleanup-rtl-dump "shorten" } } */
diff --git a/gcc/testsuite/gcc.dg/pr33826.c b/gcc/testsuite/gcc.dg/pr33826.c
index 8d40d752f78..df839151661 100644
--- a/gcc/testsuite/gcc.dg/pr33826.c
+++ b/gcc/testsuite/gcc.dg/pr33826.c
@@ -48,5 +48,3 @@ int norecurse1b (int i)
 /* { dg-final { scan-ipa-dump-not "found to be const: recurse1" "pure-const" } } */
 /* { dg-final { scan-ipa-dump-not "found to be const: recurse2a" "pure-const" } } */
 /* { dg-final { scan-ipa-dump-not "found to be const: recurse2b" "pure-const" } } */
-/* { dg-final { cleanup-ipa-dump "pure-const" } } */
-/* { dg-final { cleanup-tree-dump "local-pure-const1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr34027-1.c b/gcc/testsuite/gcc.dg/pr34027-1.c
index 8e8872a5133..b1163ce7720 100644
--- a/gcc/testsuite/gcc.dg/pr34027-1.c
+++ b/gcc/testsuite/gcc.dg/pr34027-1.c
@@ -13,4 +13,3 @@ unsigned long foobar(unsigned long ns)
    that anymore.  */
 /* { dg-final { scan-tree-dump-times "%" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "/" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr34027-2.c b/gcc/testsuite/gcc.dg/pr34027-2.c
index 70c4561d0f1..94e4ae57b2c 100644
--- a/gcc/testsuite/gcc.dg/pr34027-2.c
+++ b/gcc/testsuite/gcc.dg/pr34027-2.c
@@ -7,4 +7,3 @@ long foo(long n, long m)
 }
 
 /* { dg-final { scan-tree-dump "n % m" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/pr34263.c b/gcc/testsuite/gcc.dg/pr34263.c
index 57b8f8a1429..be1b3ba31ae 100644
--- a/gcc/testsuite/gcc.dg/pr34263.c
+++ b/gcc/testsuite/gcc.dg/pr34263.c
@@ -56,5 +56,4 @@ int look( struct s *p, struct s **pp )
 }
 
 /* { dg-final { scan-tree-dump "Cleaned-up latch block of loop with single BB" "optimized" { xfail { *-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/pr35729.c b/gcc/testsuite/gcc.dg/pr35729.c
index a9cf2e1057b..fadb8a3168f 100644
--- a/gcc/testsuite/gcc.dg/pr35729.c
+++ b/gcc/testsuite/gcc.dg/pr35729.c
@@ -15,4 +15,3 @@ void func_1 (void)
 }
 
 /* { dg-final { scan-rtl-dump-times "Decided to move invariant" 0 "loop2_invariant" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_invariant" } } */
diff --git a/gcc/testsuite/gcc.dg/pr37171.c b/gcc/testsuite/gcc.dg/pr37171.c
index 9be44dfaffd..623089934c9 100644
--- a/gcc/testsuite/gcc.dg/pr37171.c
+++ b/gcc/testsuite/gcc.dg/pr37171.c
@@ -16,4 +16,3 @@ unsigned int f4 (void)
 /* { dg-final { scan-tree-dump-times "= f1 \\(\\)" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= f2 \\(\\)" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= f3 \\(\\)" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr37261.c b/gcc/testsuite/gcc.dg/pr37261.c
index a05ada148c1..f226da06841 100644
--- a/gcc/testsuite/gcc.dg/pr37261.c
+++ b/gcc/testsuite/gcc.dg/pr37261.c
@@ -12,4 +12,3 @@ foo (int x)
 }
 
 /* { dg-final { scan-tree-dump "return 0" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr37289.c b/gcc/testsuite/gcc.dg/pr37289.c
index 61513c94ee2..0d2d220cd84 100644
--- a/gcc/testsuite/gcc.dg/pr37289.c
+++ b/gcc/testsuite/gcc.dg/pr37289.c
@@ -11,4 +11,3 @@ void g(long x)
 /* Make sure we do not lose the conversion.  */
 
 /* { dg-final { scan-tree-dump "-\\\(long unsigned int\\\) x" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr37858.c b/gcc/testsuite/gcc.dg/pr37858.c
index 577b661503a..8a81f16129a 100644
--- a/gcc/testsuite/gcc.dg/pr37858.c
+++ b/gcc/testsuite/gcc.dg/pr37858.c
@@ -9,4 +9,3 @@ main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "build_ssa_passes" } } */
diff --git a/gcc/testsuite/gcc.dg/pr38245-1.c b/gcc/testsuite/gcc.dg/pr38245-1.c
index 17b969c7de0..1978d8dc8d5 100644
--- a/gcc/testsuite/gcc.dg/pr38245-1.c
+++ b/gcc/testsuite/gcc.dg/pr38245-1.c
@@ -33,4 +33,3 @@ main (void)
 
 /* { dg-final { scan-tree-dump-not "% 2123" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "0 / " "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr38245-2.c b/gcc/testsuite/gcc.dg/pr38245-2.c
index 2998299375d..bb2679c697c 100644
--- a/gcc/testsuite/gcc.dg/pr38245-2.c
+++ b/gcc/testsuite/gcc.dg/pr38245-2.c
@@ -107,4 +107,3 @@ f13 (unsigned int a, unsigned int b)
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr38645.c b/gcc/testsuite/gcc.dg/pr38645.c
index 3268f2ac673..6877a75eade 100644
--- a/gcc/testsuite/gcc.dg/pr38645.c
+++ b/gcc/testsuite/gcc.dg/pr38645.c
@@ -14,4 +14,3 @@ int foo()
 }
 
 /* { dg-final { scan-tree-dump "a.0. ={v} 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr38984.c b/gcc/testsuite/gcc.dg/pr38984.c
index 3ccb0e492fc..5e68e8858bc 100644
--- a/gcc/testsuite/gcc.dg/pr38984.c
+++ b/gcc/testsuite/gcc.dg/pr38984.c
@@ -12,6 +12,5 @@ int f(int *p)
 
 /* { dg-final { scan-tree-dump-times "\\\*p" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "return 1" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/pr39874.c b/gcc/testsuite/gcc.dg/pr39874.c
index ca452831016..2db83670662 100644
--- a/gcc/testsuite/gcc.dg/pr39874.c
+++ b/gcc/testsuite/gcc.dg/pr39874.c
@@ -24,6 +24,5 @@ void test2(char *signature)
 
 /* { dg-final { scan-tree-dump-times " == 15" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-not " == 3" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/pr41488.c b/gcc/testsuite/gcc.dg/pr41488.c
index c4bc42832b3..b9bc718758b 100644
--- a/gcc/testsuite/gcc.dg/pr41488.c
+++ b/gcc/testsuite/gcc.dg/pr41488.c
@@ -15,4 +15,3 @@ void foo (struct struct_t* sp, int start, int end)
 }
 
 /* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */
-/* { dg-final { cleanup-tree-dump "sccp" } } */
diff --git a/gcc/testsuite/gcc.dg/pr41574.c b/gcc/testsuite/gcc.dg/pr41574.c
index f5ddcb2fcc8..062c0044532 100644
--- a/gcc/testsuite/gcc.dg/pr41574.c
+++ b/gcc/testsuite/gcc.dg/pr41574.c
@@ -12,4 +12,3 @@ f(double x)
 }
 
 /* { dg-final { scan-rtl-dump-not "\\(plus:DF \\(mult:DF" "combine" } } */
-/* { dg-final { cleanup-rtl-dump "combine*" } } */
diff --git a/gcc/testsuite/gcc.dg/pr41783.c b/gcc/testsuite/gcc.dg/pr41783.c
index cae066be6f4..3d8006c579d 100644
--- a/gcc/testsuite/gcc.dg/pr41783.c
+++ b/gcc/testsuite/gcc.dg/pr41783.c
@@ -17,4 +17,3 @@ int main()
    and we want that load to be into a PRE temporary.  */
 /* { dg-final { scan-tree-dump-times "= a_global_var;" 1 "pre" } } */
 /* { dg-final { scan-tree-dump "pretmp\[^\\n\]* = a_global_var;" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr42963.c b/gcc/testsuite/gcc.dg/pr42963.c
index 8664b0d847c..b84ea6cb398 100644
--- a/gcc/testsuite/gcc.dg/pr42963.c
+++ b/gcc/testsuite/gcc.dg/pr42963.c
@@ -25,4 +25,3 @@ bar (void)
     }
 }
 /* { dg-final { scan-tree-dump-times "case 1:" 0 "cfg" } } */
-/* { dg-final { cleanup-tree-dump "cfg" } } */
diff --git a/gcc/testsuite/gcc.dg/pr43513.c b/gcc/testsuite/gcc.dg/pr43513.c
index 78a037b5985..9383a802c8a 100644
--- a/gcc/testsuite/gcc.dg/pr43513.c
+++ b/gcc/testsuite/gcc.dg/pr43513.c
@@ -16,4 +16,3 @@ foo3 ()
 }
 
 /* { dg-final { scan-tree-dump-times "alloca" 0 "ccp2"} } */
-/* { dg-final { cleanup-tree-dump "ccp2" } } */
diff --git a/gcc/testsuite/gcc.dg/pr43864-2.c b/gcc/testsuite/gcc.dg/pr43864-2.c
index c576dbd1e41..6393144ccf7 100644
--- a/gcc/testsuite/gcc.dg/pr43864-2.c
+++ b/gcc/testsuite/gcc.dg/pr43864-2.c
@@ -20,4 +20,3 @@ f (int c, int b, int d)
 /* { dg-final { scan-tree-dump-times "if " 0 "pre"} } */
 /* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr43864-3.c b/gcc/testsuite/gcc.dg/pr43864-3.c
index 7956450105e..24b59a14b96 100644
--- a/gcc/testsuite/gcc.dg/pr43864-3.c
+++ b/gcc/testsuite/gcc.dg/pr43864-3.c
@@ -21,4 +21,3 @@ int f(int c, int b, int d)
 /* { dg-final { scan-tree-dump-times "if " 0 "pre"} } */
 /* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr43864-4.c b/gcc/testsuite/gcc.dg/pr43864-4.c
index 7353b3d5606..3c6cc50c5b8 100644
--- a/gcc/testsuite/gcc.dg/pr43864-4.c
+++ b/gcc/testsuite/gcc.dg/pr43864-4.c
@@ -26,4 +26,3 @@ int f(int c, int b, int d)
 /* { dg-final { scan-tree-dump-times "(?n)_.*\\+.*_" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-times "(?n)_.*-.*_" 2 "pre"} } */
 /* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr43864.c b/gcc/testsuite/gcc.dg/pr43864.c
index a644e21f8fc..ed69a737d3f 100644
--- a/gcc/testsuite/gcc.dg/pr43864.c
+++ b/gcc/testsuite/gcc.dg/pr43864.c
@@ -33,4 +33,3 @@ hprofStartupp (char *outputFileName, char *ctx)
 
 /* { dg-final { scan-tree-dump-times "myfree \\(" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-not "Invalid sum" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44024.c b/gcc/testsuite/gcc.dg/pr44024.c
index 30eb9d1bf80..8791a29f420 100644
--- a/gcc/testsuite/gcc.dg/pr44024.c
+++ b/gcc/testsuite/gcc.dg/pr44024.c
@@ -12,4 +12,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-not "if \\(foo" "ccp1" { target { ! avr*-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44194-1.c b/gcc/testsuite/gcc.dg/pr44194-1.c
index e4ed2497d73..20b74a5aa12 100644
--- a/gcc/testsuite/gcc.dg/pr44194-1.c
+++ b/gcc/testsuite/gcc.dg/pr44194-1.c
@@ -13,11 +13,9 @@ void func() {
 }
 
 /* { dg-final { scan-rtl-dump "global deletions = (2|3)" "dse1" } } */
-/* { dg-final { cleanup-rtl-dump "dse1" } } */
 
 /* Here we want to ignore frame-related instructions, marked as insn/f,
    that do things like store the link register to the stack.  We also want
    to treat insns the same regardless of whether they have a scheduling
    :TI marker, so match both "insn " and "insn:".  */
 /* { dg-final { scan-rtl-dump-not "insn\[: \]\[^\n\]*set \\(mem(?!\[^\n\]*scratch)" "final" } } */
-/* { dg-final { cleanup-rtl-dump "final" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44194-2.c b/gcc/testsuite/gcc.dg/pr44194-2.c
index b127e1b3374..23735bd85d6 100644
--- a/gcc/testsuite/gcc.dg/pr44194-2.c
+++ b/gcc/testsuite/gcc.dg/pr44194-2.c
@@ -9,4 +9,3 @@ void func() {
   bar(s.a, s.b);
 }
 /* { dg-final { scan-rtl-dump "global deletions = 0"  "dse1" } } */
-/* { dg-final { cleanup-rtl-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44214-1.c b/gcc/testsuite/gcc.dg/pr44214-1.c
index 28194e48fc4..a5377b9e62c 100644
--- a/gcc/testsuite/gcc.dg/pr44214-1.c
+++ b/gcc/testsuite/gcc.dg/pr44214-1.c
@@ -15,4 +15,3 @@ void do_div (v2df *a, v2df *b)
 
 /* { dg-final { scan-tree-dump-times " \\\* " 3 "ccp1" } } */
 /* { dg-final { scan-tree-dump-times " / " 0 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44214-2.c b/gcc/testsuite/gcc.dg/pr44214-2.c
index 7e8581a2bb3..f03fa7a0db3 100644
--- a/gcc/testsuite/gcc.dg/pr44214-2.c
+++ b/gcc/testsuite/gcc.dg/pr44214-2.c
@@ -11,4 +11,3 @@ void do_div (_Complex double *a, _Complex double *b)
 
 /* { dg-final { scan-tree-dump-times " \\\* " 1 "original" } } */
 /* { dg-final { scan-tree-dump-times " / " 0 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44214-3.c b/gcc/testsuite/gcc.dg/pr44214-3.c
index a0eb35b1ca6..705cb8f0a93 100644
--- a/gcc/testsuite/gcc.dg/pr44214-3.c
+++ b/gcc/testsuite/gcc.dg/pr44214-3.c
@@ -16,4 +16,3 @@ void do_div (v2df *a, v2df *b)
 
 /* { dg-final { scan-tree-dump-times " \\\* " 3 "ccp1" } } */
 /* { dg-final { scan-tree-dump-times " / " 0 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44290-1.c b/gcc/testsuite/gcc.dg/pr44290-1.c
index 071a2710425..c036db654f3 100644
--- a/gcc/testsuite/gcc.dg/pr44290-1.c
+++ b/gcc/testsuite/gcc.dg/pr44290-1.c
@@ -15,4 +15,3 @@ void fum(void *to)
 }
 
 /* { dg-final { scan-tree-dump "foo \\\(void \\\* from, void \\\* to\\\)" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr44290-2.c b/gcc/testsuite/gcc.dg/pr44290-2.c
index 1951a519dfc..17615366267 100644
--- a/gcc/testsuite/gcc.dg/pr44290-2.c
+++ b/gcc/testsuite/gcc.dg/pr44290-2.c
@@ -21,4 +21,3 @@ bar (void)
 }
 
 /* { dg-final { scan-tree-dump "foo \\\(long unsigned int base\\\)" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr45819.c b/gcc/testsuite/gcc.dg/pr45819.c
index 4979fd328ca..fb59359a708 100644
--- a/gcc/testsuite/gcc.dg/pr45819.c
+++ b/gcc/testsuite/gcc.dg/pr45819.c
@@ -17,4 +17,3 @@ int ehci_hub_control (struct ehci_hcd *ehci, int wIndex)
 }
 
 /* { dg-final { scan-tree-dump "={v}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr46217.c b/gcc/testsuite/gcc.dg/pr46217.c
index bb445bb239f..73a8780bd05 100644
--- a/gcc/testsuite/gcc.dg/pr46217.c
+++ b/gcc/testsuite/gcc.dg/pr46217.c
@@ -8,4 +8,3 @@ int foo(int a)
 }
 
 /* { dg-final { scan-tree-dump "={v}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr46309-2.c b/gcc/testsuite/gcc.dg/pr46309-2.c
index 00ffee14559..39b9b8377f7 100644
--- a/gcc/testsuite/gcc.dg/pr46309-2.c
+++ b/gcc/testsuite/gcc.dg/pr46309-2.c
@@ -143,5 +143,3 @@ f10 (int a)
 /* { dg-final { scan-tree-dump-times "Optimizing range tests a_\[0-9\]*.D. -.128, 159. and -.192, 223.\[\n\r\]* into" 1 "reassoc1" } } */
 /* { dg-final { scan-tree-dump-times "Optimizing range tests a_\[0-9\]*.D. -.1, 1. and -.2, 2. and -.3, 3. and -.4, 4. and -.5, 5. and -.6, 6. and -.7, 7. and -.8, 8.\[\n\r\]* into" 7 "reassoc1" } } */
 /* { dg-final { scan-tree-dump-times "Optimizing range tests \[^\r\n\]*_\[0-9\]* -.0, 31. and -.128, 159.\[\n\r\]* into" 1 "reassoc2" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc2" } } */
diff --git a/gcc/testsuite/gcc.dg/pr46309.c b/gcc/testsuite/gcc.dg/pr46309.c
index bec7350aee2..f362ac3eb42 100644
--- a/gcc/testsuite/gcc.dg/pr46309.c
+++ b/gcc/testsuite/gcc.dg/pr46309.c
@@ -66,5 +66,3 @@ f6 (unsigned int a)
 /* { dg-final { scan-tree-dump-times "Optimizing range tests a_\[0-9\]*.D. -.0, 31. and -.64, 95.\[\n\r\]* into" 2 "reassoc1" } } */
 /* { dg-final { scan-tree-dump-times "Optimizing range tests a_\[0-9\]*.D. -.128, 159. and -.192, 223.\[\n\r\]* into" 1 "reassoc1" } } */
 /* { dg-final { scan-tree-dump-times "Optimizing range tests \[^\r\n\]*_\[0-9\]* -.0, 31. and -.128, 159.\[\n\r\]* into" 1 "reassoc2" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc2" } } */
diff --git a/gcc/testsuite/gcc.dg/pr46647.c b/gcc/testsuite/gcc.dg/pr46647.c
index 4510d695b1f..d7ada9650dc 100644
--- a/gcc/testsuite/gcc.dg/pr46647.c
+++ b/gcc/testsuite/gcc.dg/pr46647.c
@@ -27,4 +27,3 @@ func3 (void)
 
 /* The xfail for avr, cris-* and crisv32-* is due to PR53535.  */
 /* { dg-final { scan-tree-dump-not "memset" "optimized" { xfail avr-*-* cris-*-* crisv32-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr46909.c b/gcc/testsuite/gcc.dg/pr46909.c
index 8bfaf05078c..c4d2f92686a 100644
--- a/gcc/testsuite/gcc.dg/pr46909.c
+++ b/gcc/testsuite/gcc.dg/pr46909.c
@@ -17,4 +17,3 @@ foo (unsigned int x)
 /* { dg-final { scan-tree-dump-times "x_\[0-9\]+\\(D\\) != 6" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "x_\[0-9\]+\\(D\\) == 2" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "x_\[0-9\]+\\(D\\) == 6" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr47391.c b/gcc/testsuite/gcc.dg/pr47391.c
index 5ec98f10850..fce34f830f4 100644
--- a/gcc/testsuite/gcc.dg/pr47391.c
+++ b/gcc/testsuite/gcc.dg/pr47391.c
@@ -19,4 +19,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-not "i = 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr47763.c b/gcc/testsuite/gcc.dg/pr47763.c
index 60fad41291b..4f0cebee463 100644
--- a/gcc/testsuite/gcc.dg/pr47763.c
+++ b/gcc/testsuite/gcc.dg/pr47763.c
@@ -7,4 +7,3 @@ foo()
 }
 
 /* { dg-final { scan-rtl-dump-not "Web oldreg" "web" } } */
-/* { dg-final { cleanup-rtl-dump "web" } } */
diff --git a/gcc/testsuite/gcc.dg/pr47917.c b/gcc/testsuite/gcc.dg/pr47917.c
index 92bcf79662b..725bc01c8a0 100644
--- a/gcc/testsuite/gcc.dg/pr47917.c
+++ b/gcc/testsuite/gcc.dg/pr47917.c
@@ -35,4 +35,3 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "snprintf" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "sprintf" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr50717-1.c b/gcc/testsuite/gcc.dg/pr50717-1.c
index afbe542a2be..de691a8aece 100644
--- a/gcc/testsuite/gcc.dg/pr50717-1.c
+++ b/gcc/testsuite/gcc.dg/pr50717-1.c
@@ -23,4 +23,3 @@ h (char a, char b, int c)
 }
 
 /* { dg-final { scan-tree-dump-times "WIDEN_MULT_PLUS_EXPR" 0 "widening_mul" } } */
-/* { dg-final { cleanup-tree-dump "widening_mul" } } */
diff --git a/gcc/testsuite/gcc.dg/pr50763.c b/gcc/testsuite/gcc.dg/pr50763.c
index 8201fd357a4..b233e93ee5e 100644
--- a/gcc/testsuite/gcc.dg/pr50763.c
+++ b/gcc/testsuite/gcc.dg/pr50763.c
@@ -13,4 +13,3 @@ foo (int c, int d)
 }
 
 /* { dg-final { scan-tree-dump-times "== 33" 2 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51491-2.c b/gcc/testsuite/gcc.dg/pr51491-2.c
index 79adcf6525e..f2dc8df028d 100644
--- a/gcc/testsuite/gcc.dg/pr51491-2.c
+++ b/gcc/testsuite/gcc.dg/pr51491-2.c
@@ -31,4 +31,3 @@ f (int n)
 }
 
 /* { dg-final { scan-tree-dump-times "CLOBBER" 2 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51491.c b/gcc/testsuite/gcc.dg/pr51491.c
index 50aa55f7a12..767769c01f1 100644
--- a/gcc/testsuite/gcc.dg/pr51491.c
+++ b/gcc/testsuite/gcc.dg/pr51491.c
@@ -22,4 +22,3 @@ int f(void)
 }
 
 /* { dg-final { scan-rtl-dump-times "Partition" 1 "expand"} } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51683.c b/gcc/testsuite/gcc.dg/pr51683.c
index f5a4a8be485..c477cd8fdd2 100644
--- a/gcc/testsuite/gcc.dg/pr51683.c
+++ b/gcc/testsuite/gcc.dg/pr51683.c
@@ -15,4 +15,3 @@ foo (void *p)
 }
 
 /* { dg-final { scan-tree-dump "memcpy" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51867.c b/gcc/testsuite/gcc.dg/pr51867.c
index 3e669cf7b46..a022b6ff8d2 100644
--- a/gcc/testsuite/gcc.dg/pr51867.c
+++ b/gcc/testsuite/gcc.dg/pr51867.c
@@ -14,4 +14,3 @@ float b(float x)
 /* Here the calls to sqrtf should be expanded into CALL_INSNs, rather than
    fpu sqrtf rtl patterns.  */
 /* { dg-final { scan-rtl-dump-times "call_insn" 2 "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-12.c b/gcc/testsuite/gcc.dg/pr51879-12.c
index 85e2687da17..927a24640ed 100644
--- a/gcc/testsuite/gcc.dg/pr51879-12.c
+++ b/gcc/testsuite/gcc.dg/pr51879-12.c
@@ -26,4 +26,3 @@ foo (int y)
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "bar2 \\(" 1 "pre" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-16.c b/gcc/testsuite/gcc.dg/pr51879-16.c
index 78970944790..ea771c0ce12 100644
--- a/gcc/testsuite/gcc.dg/pr51879-16.c
+++ b/gcc/testsuite/gcc.dg/pr51879-16.c
@@ -29,4 +29,3 @@ int bar (int c) {
 
 /* { dg-final { scan-tree-dump-times "foo \\(" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-times "foo2 \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-17.c b/gcc/testsuite/gcc.dg/pr51879-17.c
index 8a2fe5efc2a..9ecb9374fec 100644
--- a/gcc/testsuite/gcc.dg/pr51879-17.c
+++ b/gcc/testsuite/gcc.dg/pr51879-17.c
@@ -29,4 +29,3 @@ int bar (int c) {
 
 /* { dg-final { scan-tree-dump-times "foo \\(" 2 "pre"} } */
 /* { dg-final { scan-tree-dump-times "foo2 \\(" 2 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-18.c b/gcc/testsuite/gcc.dg/pr51879-18.c
index 8de3557f959..2944bea0727 100644
--- a/gcc/testsuite/gcc.dg/pr51879-18.c
+++ b/gcc/testsuite/gcc.dg/pr51879-18.c
@@ -14,4 +14,3 @@ void bar (int c, int *p)
 }
 
 /* { dg-final { scan-tree-dump-times "foo \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-2.c b/gcc/testsuite/gcc.dg/pr51879-2.c
index 78acd1fb170..dd9b4559006 100644
--- a/gcc/testsuite/gcc.dg/pr51879-2.c
+++ b/gcc/testsuite/gcc.dg/pr51879-2.c
@@ -16,4 +16,3 @@ foo (int y)
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-times "baz \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-3.c b/gcc/testsuite/gcc.dg/pr51879-3.c
index 90f0041c981..674edd48b7f 100644
--- a/gcc/testsuite/gcc.dg/pr51879-3.c
+++ b/gcc/testsuite/gcc.dg/pr51879-3.c
@@ -16,4 +16,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-4.c b/gcc/testsuite/gcc.dg/pr51879-4.c
index 1a9b76e7b4b..82a986b5455 100644
--- a/gcc/testsuite/gcc.dg/pr51879-4.c
+++ b/gcc/testsuite/gcc.dg/pr51879-4.c
@@ -13,4 +13,3 @@ int foo (int y)
 }
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 2 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-6.c b/gcc/testsuite/gcc.dg/pr51879-6.c
index 3d83590631a..42950668cbb 100644
--- a/gcc/testsuite/gcc.dg/pr51879-6.c
+++ b/gcc/testsuite/gcc.dg/pr51879-6.c
@@ -24,4 +24,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879-7.c b/gcc/testsuite/gcc.dg/pr51879-7.c
index 5fdf3192937..bb1a29a0f17 100644
--- a/gcc/testsuite/gcc.dg/pr51879-7.c
+++ b/gcc/testsuite/gcc.dg/pr51879-7.c
@@ -13,4 +13,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump-times "z = 5" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr51879.c b/gcc/testsuite/gcc.dg/pr51879.c
index ac4a4ccafcb..d295373331d 100644
--- a/gcc/testsuite/gcc.dg/pr51879.c
+++ b/gcc/testsuite/gcc.dg/pr51879.c
@@ -16,4 +16,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump-times "bar \\(" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52134.c b/gcc/testsuite/gcc.dg/pr52134.c
index 44cb4a6f3de..32e67cdab00 100644
--- a/gcc/testsuite/gcc.dg/pr52134.c
+++ b/gcc/testsuite/gcc.dg/pr52134.c
@@ -11,4 +11,3 @@ int f1(int t)
 }
 
 /* { dg-final { scan-tree-dump-not "\\\&" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52267.c b/gcc/testsuite/gcc.dg/pr52267.c
index 9ed88c0c43a..8362dc23c04 100644
--- a/gcc/testsuite/gcc.dg/pr52267.c
+++ b/gcc/testsuite/gcc.dg/pr52267.c
@@ -21,4 +21,3 @@ bar (int a)
 
 /* { dg-final { scan-tree-dump-not "& 3" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "& -4" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52445.c b/gcc/testsuite/gcc.dg/pr52445.c
index 0977821a829..6ab316bc1fb 100644
--- a/gcc/testsuite/gcc.dg/pr52445.c
+++ b/gcc/testsuite/gcc.dg/pr52445.c
@@ -12,4 +12,3 @@ foo (char *buf, unsigned long len)
 }
 
 /* { dg-final { scan-tree-dump-not "cstore\." "cselim" } } */
-/* { dg-final { cleanup-tree-dump "cselim" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52448.c b/gcc/testsuite/gcc.dg/pr52448.c
index 0aeb2130f2c..188799bf6fa 100644
--- a/gcc/testsuite/gcc.dg/pr52448.c
+++ b/gcc/testsuite/gcc.dg/pr52448.c
@@ -27,4 +27,3 @@ void f2 (int *p, int a, int b, int *cond, int *cond2)
 
 /* None of the above conditional stores might be made unconditional.  */
 /* { dg-final { scan-tree-dump-not "cstore" "cselim" } } */
-/* { dg-final { cleanup-tree-dump "cselim" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52578.c b/gcc/testsuite/gcc.dg/pr52578.c
index 0e668300f20..47a0484836b 100644
--- a/gcc/testsuite/gcc.dg/pr52578.c
+++ b/gcc/testsuite/gcc.dg/pr52578.c
@@ -11,4 +11,3 @@ long foo (int i)
 }
 
 /* { dg-final { scan-tree-dump-times "return 2;" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr52691.c b/gcc/testsuite/gcc.dg/pr52691.c
index 7a2d7d8ebb1..ad07b815a55 100644
--- a/gcc/testsuite/gcc.dg/pr52691.c
+++ b/gcc/testsuite/gcc.dg/pr52691.c
@@ -21,4 +21,3 @@ foo (int a, ...)
 /* { dg-final { scan-tree-dump "__builtin_next_arg" "optimized" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
 /* { dg-final { scan-tree-dump "__builtin_next_arg" "optimized" { target { powerpc*-*-darwin* powerpc*-*-aix* } } } } */
 /* { dg-final { scan-tree-dump "__builtin_next_arg" "optimized" { target { powerpc*-*-linux* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr55027.c b/gcc/testsuite/gcc.dg/pr55027.c
index e72b8fc03dc..05082b26b34 100644
--- a/gcc/testsuite/gcc.dg/pr55027.c
+++ b/gcc/testsuite/gcc.dg/pr55027.c
@@ -9,4 +9,3 @@ void f (v2df *x)
 }
 
 /* { dg-final { scan-tree-dump-not "gimple_assign" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr56094.c b/gcc/testsuite/gcc.dg/pr56094.c
index d22331193f1..364e368cf09 100644
--- a/gcc/testsuite/gcc.dg/pr56094.c
+++ b/gcc/testsuite/gcc.dg/pr56094.c
@@ -78,4 +78,3 @@ foo ()
 
 /* Verify no statements get the location of the foo () decl.  */
 /* { dg-final { scan-tree-dump-not " : 65:1\\\]" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr56098-1.c b/gcc/testsuite/gcc.dg/pr56098-1.c
index c3b081a0899..68e71fc0b98 100644
--- a/gcc/testsuite/gcc.dg/pr56098-1.c
+++ b/gcc/testsuite/gcc.dg/pr56098-1.c
@@ -13,4 +13,3 @@ foo (int x)
 }
 
 /* { dg-final { scan-tree-dump-not "=\[^\n\r]*\\*p" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr56098-2.c b/gcc/testsuite/gcc.dg/pr56098-2.c
index 3c967b52507..cd4bff2f4b9 100644
--- a/gcc/testsuite/gcc.dg/pr56098-2.c
+++ b/gcc/testsuite/gcc.dg/pr56098-2.c
@@ -16,4 +16,3 @@ bar (struct S *x, int y)
 }
 
 /* { dg-final { scan-tree-dump-not "r_\[0-9]* =.v. \[^\n\r]*;\[\n\r]*  r_\[0-9]* =.v. " "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr56837.c b/gcc/testsuite/gcc.dg/pr56837.c
index d665a6db7ff..0bb958f0b0d 100644
--- a/gcc/testsuite/gcc.dg/pr56837.c
+++ b/gcc/testsuite/gcc.dg/pr56837.c
@@ -64,4 +64,3 @@ fv (void)
 /* { dg-final { scan-tree-dump-times "memset ..b, 1, 1024.;" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "memset ..c, 68, 16384.;" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "memset ..v, 18, 16384.;" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr56997-4.c b/gcc/testsuite/gcc.dg/pr56997-4.c
index 38f6248d2ed..ecca9c69c20 100644
--- a/gcc/testsuite/gcc.dg/pr56997-4.c
+++ b/gcc/testsuite/gcc.dg/pr56997-4.c
@@ -20,4 +20,3 @@ foo (test_type u)
 /* The C++ memory model forbids data store race conditions outside the
    unaligned data member, therefore only QI or HI access is allowed, no SI.  */
 /* { dg-final { scan-rtl-dump-not "mem/v(/.)*:SI" "final" } } */
-/* { dg-final { cleanup-rtl-dump "final" } } */
diff --git a/gcc/testsuite/gcc.dg/pr57518.c b/gcc/testsuite/gcc.dg/pr57518.c
index 94ef82db8e3..4c84f30baef 100644
--- a/gcc/testsuite/gcc.dg/pr57518.c
+++ b/gcc/testsuite/gcc.dg/pr57518.c
@@ -14,4 +14,3 @@ void foo() {
 }
 
 /* { dg-final { scan-rtl-dump-not "REG_EQUIV\[^\n\]*mem\[^\n\]*\"ip\".*subreg" "ira" } } */
-/* { dg-final { cleanup-rtl-dump "ira" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58145-1.c b/gcc/testsuite/gcc.dg/pr58145-1.c
index 0e236c0456d..6589f924028 100644
--- a/gcc/testsuite/gcc.dg/pr58145-1.c
+++ b/gcc/testsuite/gcc.dg/pr58145-1.c
@@ -34,4 +34,3 @@ f4 (int val)
 }
 
 /* { dg-final { scan-tree-dump-times " ={v} " 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58145-2.c b/gcc/testsuite/gcc.dg/pr58145-2.c
index 840e9828972..d26c05bc283 100644
--- a/gcc/testsuite/gcc.dg/pr58145-2.c
+++ b/gcc/testsuite/gcc.dg/pr58145-2.c
@@ -48,4 +48,3 @@ f5 (void)
 }
 
 /* { dg-final { scan-tree-dump-times " ={v} " 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58463.c b/gcc/testsuite/gcc.dg/pr58463.c
index e2b44119347..da9dec89fde 100644
--- a/gcc/testsuite/gcc.dg/pr58463.c
+++ b/gcc/testsuite/gcc.dg/pr58463.c
@@ -12,4 +12,3 @@ fn1 (list_data * p1)
     p1->data16 = p1->data16 & 1 & p1->data16 >> 1;
 }
 
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58742-1.c b/gcc/testsuite/gcc.dg/pr58742-1.c
index 94f56273f49..54a0d3f9179 100644
--- a/gcc/testsuite/gcc.dg/pr58742-1.c
+++ b/gcc/testsuite/gcc.dg/pr58742-1.c
@@ -10,4 +10,3 @@ fx (int *b, int *e)
 }
 
 /* { dg-final { scan-tree-dump "return e" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58742-2.c b/gcc/testsuite/gcc.dg/pr58742-2.c
index e0011e950ca..f1628935589 100644
--- a/gcc/testsuite/gcc.dg/pr58742-2.c
+++ b/gcc/testsuite/gcc.dg/pr58742-2.c
@@ -10,4 +10,3 @@ fx (char *a, __SIZE_TYPE__ sz)
 }
 
 /* { dg-final { scan-tree-dump "return sz" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58742-3.c b/gcc/testsuite/gcc.dg/pr58742-3.c
index f4e95e64547..3c4d14596ce 100644
--- a/gcc/testsuite/gcc.dg/pr58742-3.c
+++ b/gcc/testsuite/gcc.dg/pr58742-3.c
@@ -11,4 +11,3 @@ fx (int *a, int sz)
 }
 
 /* { dg-final { scan-tree-dump "return a" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr58805.c b/gcc/testsuite/gcc.dg/pr58805.c
index dda0e4bdf4b..b46f7764260 100644
--- a/gcc/testsuite/gcc.dg/pr58805.c
+++ b/gcc/testsuite/gcc.dg/pr58805.c
@@ -21,4 +21,3 @@ foo (int n, TYPE *x, TYPE *y)
 }
 
 /* { dg-final { scan-tree-dump-times "__asm__" 2 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr59643.c b/gcc/testsuite/gcc.dg/pr59643.c
index f4df5e5b221..de78d604bb2 100644
--- a/gcc/testsuite/gcc.dg/pr59643.c
+++ b/gcc/testsuite/gcc.dg/pr59643.c
@@ -12,4 +12,3 @@ foo (double *a, double *b, double *c, double d, double e, int n)
 
 /* { dg-final { scan-tree-dump-times "Before commoning:" 1 "pcom" } } */
 /* { dg-final { scan-tree-dump-times "Unrolling 2 times" 1 "pcom" } } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/pr60267.c b/gcc/testsuite/gcc.dg/pr60267.c
index b6228fcefd0..c95def2399a 100644
--- a/gcc/testsuite/gcc.dg/pr60267.c
+++ b/gcc/testsuite/gcc.dg/pr60267.c
@@ -11,4 +11,3 @@ foo (int *a, int *b, int *c)
     a[i] = b[i] * c[i];
 }
 
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/pr61158.c b/gcc/testsuite/gcc.dg/pr61158.c
index d0ba7f3876b..67eca30b93a 100644
--- a/gcc/testsuite/gcc.dg/pr61158.c
+++ b/gcc/testsuite/gcc.dg/pr61158.c
@@ -9,4 +9,3 @@ foo (unsigned int x)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "original" { target { ilp32 || lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr61762.c b/gcc/testsuite/gcc.dg/pr61762.c
index 47dc140248c..4696d53705d 100644
--- a/gcc/testsuite/gcc.dg/pr61762.c
+++ b/gcc/testsuite/gcc.dg/pr61762.c
@@ -16,4 +16,3 @@ unsigned int f()
    the unused local static is removed.  */
 
 /* { dg-final { scan-tree-dump-not "Private" "release_ssa" } } */
-/* { dg-final { cleanup-tree-dump "release_ssa" } } */
diff --git a/gcc/testsuite/gcc.dg/pr62167.c b/gcc/testsuite/gcc.dg/pr62167.c
index f8c31a0792f..c24e7050eb9 100644
--- a/gcc/testsuite/gcc.dg/pr62167.c
+++ b/gcc/testsuite/gcc.dg/pr62167.c
@@ -47,4 +47,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-not "Removing basic block" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/pr63387-2.c b/gcc/testsuite/gcc.dg/pr63387-2.c
index 872195a1787..0ce7ab21b88 100644
--- a/gcc/testsuite/gcc.dg/pr63387-2.c
+++ b/gcc/testsuite/gcc.dg/pr63387-2.c
@@ -23,4 +23,3 @@ int h(double ccc, float ddd){
 /* { dg-final { scan-tree-dump-not "bbb\[^\n\r\]* ord bbb" "optimized" } } */
 /* { dg-final { scan-tree-dump-times "aaa\[^\n\r\]* ord bbb" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "ccc\[^\n\r\]* ord ddd" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr63387.c b/gcc/testsuite/gcc.dg/pr63387.c
index 1814fe08c9d..1f1078483c4 100644
--- a/gcc/testsuite/gcc.dg/pr63387.c
+++ b/gcc/testsuite/gcc.dg/pr63387.c
@@ -23,4 +23,3 @@ int h(double ccc, float ddd){
 /* { dg-final { scan-tree-dump-not "bbb\[^\n\r\]* unord bbb" "optimized" } } */
 /* { dg-final { scan-tree-dump-times "aaa\[^\n\r\]* unord bbb" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "ccc\[^\n\r\]* unord ddd" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr63568.c b/gcc/testsuite/gcc.dg/pr63568.c
index fb42bea6fcf..c6b88e70e32 100644
--- a/gcc/testsuite/gcc.dg/pr63568.c
+++ b/gcc/testsuite/gcc.dg/pr63568.c
@@ -51,4 +51,3 @@ fn8 (int a, int b, int m)
 }
 
 /* { dg-final { scan-tree-dump-not " \\| " "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr63743.c b/gcc/testsuite/gcc.dg/pr63743.c
index 87254edbde1..635ac381c55 100644
--- a/gcc/testsuite/gcc.dg/pr63743.c
+++ b/gcc/testsuite/gcc.dg/pr63743.c
@@ -8,4 +8,3 @@ libcall_dep (double x, double y)
 }
 
 /* { dg-final { scan-rtl-dump-times "Swap operands" 1 "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/pr64277.c b/gcc/testsuite/gcc.dg/pr64277.c
index c6ef33119a7..62f6f1cc859 100644
--- a/gcc/testsuite/gcc.dg/pr64277.c
+++ b/gcc/testsuite/gcc.dg/pr64277.c
@@ -3,7 +3,6 @@
 /* { dg-options "-O3 -Wall -Werror -fdump-tree-cunroll-details" } */
 /* { dg-final { scan-tree-dump "loop with 5 iterations completely unrolled" "cunroll" } } */
 /* { dg-final { scan-tree-dump "loop with 6 iterations completely unrolled" "cunroll" } } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
 
 int f1[10];
 void test1 (short a[], short m, unsigned short l)
diff --git a/gcc/testsuite/gcc.dg/pr64309.c b/gcc/testsuite/gcc.dg/pr64309.c
index 710a7624e21..0a3a009aaf5 100644
--- a/gcc/testsuite/gcc.dg/pr64309.c
+++ b/gcc/testsuite/gcc.dg/pr64309.c
@@ -63,4 +63,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-not "(<<|>>)" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/pr64434.c b/gcc/testsuite/gcc.dg/pr64434.c
index 60fc80615de..550a63d2b13 100644
--- a/gcc/testsuite/gcc.dg/pr64434.c
+++ b/gcc/testsuite/gcc.dg/pr64434.c
@@ -16,6 +16,5 @@ void foo ()
 }
 
 /* { dg-final { scan-rtl-dump-times "Swap operands" 1 "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/pr64454.c b/gcc/testsuite/gcc.dg/pr64454.c
index 35542349c70..377a9e48bbf 100644
--- a/gcc/testsuite/gcc.dg/pr64454.c
+++ b/gcc/testsuite/gcc.dg/pr64454.c
@@ -40,4 +40,3 @@ f6 (int x)
 
 /* { dg-final { scan-tree-dump-times "% 5" 6 "vrp1" } } */
 /* { dg-final { scan-tree-dump-times "% 6" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/pr64715-1.c b/gcc/testsuite/gcc.dg/pr64715-1.c
index fbb635393fb..f2c1bd0f97c 100644
--- a/gcc/testsuite/gcc.dg/pr64715-1.c
+++ b/gcc/testsuite/gcc.dg/pr64715-1.c
@@ -20,4 +20,3 @@ foo ()
 }
 
 /* { dg-final { scan-tree-dump "__builtin___strcpy_chk\[^;\n\r\]*, 5\\\);" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/pr64715-2.c b/gcc/testsuite/gcc.dg/pr64715-2.c
index 4c7b581f60e..5c799123f07 100644
--- a/gcc/testsuite/gcc.dg/pr64715-2.c
+++ b/gcc/testsuite/gcc.dg/pr64715-2.c
@@ -16,4 +16,3 @@ foo (int x)
 }
 
 /* { dg-final { scan-tree-dump "__builtin_memcpy \\\(\[^;\n\r\]*, \"abcdefghijkl\", 13\\\);" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-1.c b/gcc/testsuite/gcc.dg/predict-1.c
index 5c9a5a930a5..a2a06044384 100644
--- a/gcc/testsuite/gcc.dg/predict-1.c
+++ b/gcc/testsuite/gcc.dg/predict-1.c
@@ -24,4 +24,3 @@ void foo (int bound)
 }
 
 /* { dg-final { scan-tree-dump-times "loop iv compare heuristics: 0.0%" 5 "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-2.c b/gcc/testsuite/gcc.dg/predict-2.c
index 55ca1d0bc7e..f2fc49ddc47 100644
--- a/gcc/testsuite/gcc.dg/predict-2.c
+++ b/gcc/testsuite/gcc.dg/predict-2.c
@@ -24,4 +24,3 @@ void foo (int base, int bound)
 }
 
 /* { dg-final { scan-tree-dump-not "loop iv compare heuristics" "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-3.c b/gcc/testsuite/gcc.dg/predict-3.c
index 8881bde30b6..2335201626e 100644
--- a/gcc/testsuite/gcc.dg/predict-3.c
+++ b/gcc/testsuite/gcc.dg/predict-3.c
@@ -22,4 +22,3 @@ void foo (int bound)
 }
 
 /* { dg-final { scan-tree-dump-times "loop iv compare heuristics: 100.0%" 4 "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-4.c b/gcc/testsuite/gcc.dg/predict-4.c
index 17a50b9ead5..3e7fb7488a9 100644
--- a/gcc/testsuite/gcc.dg/predict-4.c
+++ b/gcc/testsuite/gcc.dg/predict-4.c
@@ -16,4 +16,3 @@ void foo (int bound)
 }
 
 /* { dg-final { scan-tree-dump "loop iv compare heuristics: 50.0%" "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-5.c b/gcc/testsuite/gcc.dg/predict-5.c
index f2fe339b6cb..3e7cc6fdfc0 100644
--- a/gcc/testsuite/gcc.dg/predict-5.c
+++ b/gcc/testsuite/gcc.dg/predict-5.c
@@ -22,4 +22,3 @@ void foo (int base, int bound)
 }
 
 /* { dg-final { scan-tree-dump-times "loop iv compare heuristics: 100.0%" 4 "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-6.c b/gcc/testsuite/gcc.dg/predict-6.c
index bf769fd2cf8..cda30e26e30 100644
--- a/gcc/testsuite/gcc.dg/predict-6.c
+++ b/gcc/testsuite/gcc.dg/predict-6.c
@@ -22,4 +22,3 @@ void foo (int base, int bound)
 }
 
 /* { dg-final { scan-tree-dump-times "loop iv compare heuristics: 0.0%" 4 "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-7.c b/gcc/testsuite/gcc.dg/predict-7.c
index 2c1c36f7878..a0ea37bdfa8 100644
--- a/gcc/testsuite/gcc.dg/predict-7.c
+++ b/gcc/testsuite/gcc.dg/predict-7.c
@@ -14,4 +14,3 @@ void foo (int base)
 }
 
 /* { dg-final { scan-tree-dump-times "loop branch heuristics" 0 "profile_estimate"} } */
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/predict-8.c b/gcc/testsuite/gcc.dg/predict-8.c
index 8c78ca7fc86..edead8d90b1 100644
--- a/gcc/testsuite/gcc.dg/predict-8.c
+++ b/gcc/testsuite/gcc.dg/predict-8.c
@@ -9,4 +9,3 @@ int foo(float a, float b) {
 }
 
 /* { dg-final { scan-rtl-dump-times "REG_BR_PROB 100" 1 "expand"} } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/profile-dir-1.c b/gcc/testsuite/gcc.dg/profile-dir-1.c
index 6cf5391bb10..df49e2361f4 100644
--- a/gcc/testsuite/gcc.dg/profile-dir-1.c
+++ b/gcc/testsuite/gcc.dg/profile-dir-1.c
@@ -9,4 +9,3 @@ main(void)
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "cgraph" } } */
diff --git a/gcc/testsuite/gcc.dg/profile-dir-2.c b/gcc/testsuite/gcc.dg/profile-dir-2.c
index 0d8624e18b5..004ba0b0905 100644
--- a/gcc/testsuite/gcc.dg/profile-dir-2.c
+++ b/gcc/testsuite/gcc.dg/profile-dir-2.c
@@ -9,4 +9,3 @@ main(void)
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "cgraph" } } */
diff --git a/gcc/testsuite/gcc.dg/profile-dir-3.c b/gcc/testsuite/gcc.dg/profile-dir-3.c
index dac0e4a6d2b..6b47807d850 100644
--- a/gcc/testsuite/gcc.dg/profile-dir-3.c
+++ b/gcc/testsuite/gcc.dg/profile-dir-3.c
@@ -9,4 +9,3 @@ main(void)
   return 0;
 }
 
-/* { dg-final { cleanup-ipa-dump "cgraph" } } */
diff --git a/gcc/testsuite/gcc.dg/pure-1.c b/gcc/testsuite/gcc.dg/pure-1.c
index f365c8dae37..9739aa69af4 100644
--- a/gcc/testsuite/gcc.dg/pure-1.c
+++ b/gcc/testsuite/gcc.dg/pure-1.c
@@ -13,4 +13,3 @@ int func_a(struct test_a *a)
 }
 
 /* { dg-final { scan-ipa-dump-not "found to be pure: func_a" "pure-const" } } */
-/* { dg-final { cleanup-ipa-dump "pure-const" } } */
diff --git a/gcc/testsuite/gcc.dg/shrink-wrap-loop.c b/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
index f540d2914de..52dfc2790ed 100644
--- a/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
+++ b/gcc/testsuite/gcc.dg/shrink-wrap-loop.c
@@ -17,4 +17,3 @@ test (int *p1, int *p2)
   return 1;
 }
 /* { dg-final { scan-rtl-dump "Performing shrink-wrapping" "pro_and_epilogue"  } } */
-/* { dg-final { cleanup-rtl-dump "pro_and_epilogue" } } */
diff --git a/gcc/testsuite/gcc.dg/sms-1.c b/gcc/testsuite/gcc.dg/sms-1.c
index 3713dc67922..497fe0f1e42 100644
--- a/gcc/testsuite/gcc.dg/sms-1.c
+++ b/gcc/testsuite/gcc.dg/sms-1.c
@@ -41,5 +41,4 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms"  { target powerpc*-*-* spu-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-10.c b/gcc/testsuite/gcc.dg/sms-10.c
index c1de07f1619..d85e8e2a274 100644
--- a/gcc/testsuite/gcc.dg/sms-10.c
+++ b/gcc/testsuite/gcc.dg/sms-10.c
@@ -115,5 +115,4 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-11.c b/gcc/testsuite/gcc.dg/sms-11.c
index 6134598632d..11408f9e8cf 100644
--- a/gcc/testsuite/gcc.dg/sms-11.c
+++ b/gcc/testsuite/gcc.dg/sms-11.c
@@ -34,4 +34,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-rtl-dump "sms" } } */
diff --git a/gcc/testsuite/gcc.dg/sms-12.c b/gcc/testsuite/gcc.dg/sms-12.c
index 23cff3b137a..581e1d751cf 100644
--- a/gcc/testsuite/gcc.dg/sms-12.c
+++ b/gcc/testsuite/gcc.dg/sms-12.c
@@ -39,5 +39,4 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-2.c b/gcc/testsuite/gcc.dg/sms-2.c
index 897e5d4b173..c449398c3ca 100644
--- a/gcc/testsuite/gcc.dg/sms-2.c
+++ b/gcc/testsuite/gcc.dg/sms-2.c
@@ -33,4 +33,3 @@ fun (nb)
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS loop many exits" 1 "sms" { target spu-*-* powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
diff --git a/gcc/testsuite/gcc.dg/sms-3.c b/gcc/testsuite/gcc.dg/sms-3.c
index d1d3b508f67..8a245f286c7 100644
--- a/gcc/testsuite/gcc.dg/sms-3.c
+++ b/gcc/testsuite/gcc.dg/sms-3.c
@@ -39,5 +39,4 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target spu-*-* powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-4.c b/gcc/testsuite/gcc.dg/sms-4.c
index 98132e0d0c3..0dc1de2611d 100644
--- a/gcc/testsuite/gcc.dg/sms-4.c
+++ b/gcc/testsuite/gcc.dg/sms-4.c
@@ -36,5 +36,4 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target spu-*-* powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-5.c b/gcc/testsuite/gcc.dg/sms-5.c
index 7bc4c33a3cd..09213cc25e0 100644
--- a/gcc/testsuite/gcc.dg/sms-5.c
+++ b/gcc/testsuite/gcc.dg/sms-5.c
@@ -48,5 +48,4 @@ int main ()
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target spu-*-* } } } */
 
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-6.c b/gcc/testsuite/gcc.dg/sms-6.c
index 87d1a959abf..3000e0dfc77 100644
--- a/gcc/testsuite/gcc.dg/sms-6.c
+++ b/gcc/testsuite/gcc.dg/sms-6.c
@@ -44,4 +44,3 @@ int main()
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target spu-*-* } } } */
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 3 "sms" { target powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
diff --git a/gcc/testsuite/gcc.dg/sms-7.c b/gcc/testsuite/gcc.dg/sms-7.c
index f96530a2697..cd49461ea7e 100644
--- a/gcc/testsuite/gcc.dg/sms-7.c
+++ b/gcc/testsuite/gcc.dg/sms-7.c
@@ -45,5 +45,4 @@ int main()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 1 "sms" { target spu-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
diff --git a/gcc/testsuite/gcc.dg/sms-8.c b/gcc/testsuite/gcc.dg/sms-8.c
index 1cb6280aab2..78a2b50116f 100644
--- a/gcc/testsuite/gcc.dg/sms-8.c
+++ b/gcc/testsuite/gcc.dg/sms-8.c
@@ -37,6 +37,5 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump-times "SMS succeeded" 0 "sms" { target powerpc*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "sms" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/stack-layout-1.c b/gcc/testsuite/gcc.dg/stack-layout-1.c
index 389a4eb051e..b80d96d7d78 100644
--- a/gcc/testsuite/gcc.dg/stack-layout-1.c
+++ b/gcc/testsuite/gcc.dg/stack-layout-1.c
@@ -22,4 +22,3 @@ void foo ()
   }
 
 /* { dg-final { scan-rtl-dump-times "Partition" 1 "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/stack-layout-2.c b/gcc/testsuite/gcc.dg/stack-layout-2.c
index 9ed545d727a..5d5b385f675 100644
--- a/gcc/testsuite/gcc.dg/stack-layout-2.c
+++ b/gcc/testsuite/gcc.dg/stack-layout-2.c
@@ -21,4 +21,3 @@ int foo()
 }
 /* { dg-final { scan-rtl-dump "size 8192" "expand" } } */
 /* { dg-final { scan-rtl-dump "size 32" "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/store-motion-fgcse-sm.c b/gcc/testsuite/gcc.dg/store-motion-fgcse-sm.c
index c291d707ae1..0e988b8081f 100644
--- a/gcc/testsuite/gcc.dg/store-motion-fgcse-sm.c
+++ b/gcc/testsuite/gcc.dg/store-motion-fgcse-sm.c
@@ -30,5 +30,4 @@ main ()
 
 /* Check that -fgcse-sm did something for f.  */
 /* { dg-final { scan-rtl-dump "STORE_MOTION of f, .* basic blocks, 1 insns deleted, 1 insns created" "store_motion" } } */
-/* { dg-final { cleanup-rtl-dump "store_motion" } } */
  
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-1.c b/gcc/testsuite/gcc.dg/strict-overflow-1.c
index f37dbd54f7f..184502f01c2 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-1.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-1.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump-not "-\[ \]*5" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-2.c b/gcc/testsuite/gcc.dg/strict-overflow-2.c
index fd2dc69204d..c39d8e8a3d3 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-2.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-2.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump-not "100" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-3.c b/gcc/testsuite/gcc.dg/strict-overflow-3.c
index bdde003a14d..6215a501a72 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-3.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-3.c
@@ -13,4 +13,3 @@ foo (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-not "1000" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-4.c b/gcc/testsuite/gcc.dg/strict-overflow-4.c
index ad2d635e464..7200e0b7804 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-4.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-4.c
@@ -13,4 +13,3 @@ foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-5.c b/gcc/testsuite/gcc.dg/strict-overflow-5.c
index 816bfe440f0..9085f1532b5 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-5.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-5.c
@@ -15,5 +15,4 @@ int foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "return 3" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/strict-overflow-6.c b/gcc/testsuite/gcc.dg/strict-overflow-6.c
index d8251f4cf19..971c72ea1c9 100644
--- a/gcc/testsuite/gcc.dg/strict-overflow-6.c
+++ b/gcc/testsuite/gcc.dg/strict-overflow-6.c
@@ -13,4 +13,3 @@ foo (char* p)
 }
 
 /* { dg-final { scan-tree-dump-not "\[+\]\[ \]*1000" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-1.c b/gcc/testsuite/gcc.dg/strlenopt-1.c
index 5ed5be1f927..910ec672e96 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-1.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-1.c
@@ -42,4 +42,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-10.c b/gcc/testsuite/gcc.dg/strlenopt-10.c
index b044496352d..97167df959f 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-10.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-10.c
@@ -80,4 +80,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "\\*q_\[0-9\]* = 32;" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "memcpy \\(\[^\n\r\]*, 1\\)" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-11.c b/gcc/testsuite/gcc.dg/strlenopt-11.c
index 0fb327ced02..f7fa44bde35 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-11.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-11.c
@@ -73,4 +73,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;\[\n\r\]*  l.9. = " 1 "strlen" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;" 3 "strlen" { target { avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-13.c b/gcc/testsuite/gcc.dg/strlenopt-13.c
index f9ab561110d..3502599b28c 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-13.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-13.c
@@ -71,4 +71,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;\[\n\r\]*  l.5. = " 1 "strlen" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;\[\n\r\]*  l.6. = " 1 "strlen" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "  _\[0-9\]* = strlen \\(\[^\n\r\]*;" 4 "strlen" { target { avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-14g.c b/gcc/testsuite/gcc.dg/strlenopt-14g.c
index 8bc47903be1..62a83bf8fd7 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-14g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-14g.c
@@ -114,4 +114,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 2 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-14gf.c b/gcc/testsuite/gcc.dg/strlenopt-14gf.c
index 54bb3a1b065..8b126fcb7ea 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-14gf.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-14gf.c
@@ -23,4 +23,3 @@
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 2 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-15.c b/gcc/testsuite/gcc.dg/strlenopt-15.c
index 495166ddb9b..827ea07b6ea 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-15.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-15.c
@@ -57,4 +57,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-16g.c b/gcc/testsuite/gcc.dg/strlenopt-16g.c
index 0e74ad7f202..0cf8410735a 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-16g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-16g.c
@@ -31,4 +31,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-17g.c b/gcc/testsuite/gcc.dg/strlenopt-17g.c
index f06435f6b92..184e530788e 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-17g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-17g.c
@@ -54,4 +54,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-18g.c b/gcc/testsuite/gcc.dg/strlenopt-18g.c
index 21b6c47c0bf..f734675ec40 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-18g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-18g.c
@@ -79,4 +79,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 2 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-19.c b/gcc/testsuite/gcc.dg/strlenopt-19.c
index 042fd77b002..022ba8b4787 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-19.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-19.c
@@ -78,4 +78,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-1f.c b/gcc/testsuite/gcc.dg/strlenopt-1f.c
index 50c5f91306a..856774de7ad 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-1f.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-1f.c
@@ -15,4 +15,3 @@
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-2.c b/gcc/testsuite/gcc.dg/strlenopt-2.c
index 5e6557b5687..fd59a3cd513 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-2.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-2.c
@@ -46,4 +46,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-20.c b/gcc/testsuite/gcc.dg/strlenopt-20.c
index 6fe99a422e9..a83e845c26d 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-20.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-20.c
@@ -92,4 +92,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-21.c b/gcc/testsuite/gcc.dg/strlenopt-21.c
index 1f27c33400d..e22fa9fca9b 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-21.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-21.c
@@ -63,4 +63,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-22.c b/gcc/testsuite/gcc.dg/strlenopt-22.c
index d6fd4dfbd88..aa55f5ebd6a 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-22.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-22.c
@@ -36,5 +36,4 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 1 "strlen" } } */
-/* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } *
-/* { dg-final { cleanup-tree-dump "strlen" } } */
+/* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-22g.c b/gcc/testsuite/gcc.dg/strlenopt-22g.c
index 4cd6a5f1c78..3e2f8c46339 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-22g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-22g.c
@@ -11,4 +11,3 @@
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-24.c b/gcc/testsuite/gcc.dg/strlenopt-24.c
index 962e04fded3..639501a53e0 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-24.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-24.c
@@ -13,5 +13,4 @@ main ()
   return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "strlen \\(" 0 "strlen" } } *
-/* { dg-final { cleanup-tree-dump "strlen" } } */
+/* { dg-final { scan-tree-dump-times "strlen \\(" 0 "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-25.c b/gcc/testsuite/gcc.dg/strlenopt-25.c
index 4862156546e..89b60e3ebed 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-25.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-25.c
@@ -15,4 +15,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-26.c b/gcc/testsuite/gcc.dg/strlenopt-26.c
index 089355e498b..4bd54bef540 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-26.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-26.c
@@ -22,4 +22,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-27.c b/gcc/testsuite/gcc.dg/strlenopt-27.c
index 8d06aac2611..c539edb821c 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-27.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-27.c
@@ -20,4 +20,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "strlen \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-2f.c b/gcc/testsuite/gcc.dg/strlenopt-2f.c
index ba4797d51f2..1e915dac928 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-2f.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-2f.c
@@ -15,4 +15,3 @@
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-3.c b/gcc/testsuite/gcc.dg/strlenopt-3.c
index 1bab8f37e99..f17779c0a66 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-3.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-3.c
@@ -59,8 +59,6 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
 /* { dg-final { scan-tree-dump-times "return 0" 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 4" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 3" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-4.c b/gcc/testsuite/gcc.dg/strlenopt-4.c
index beea4959245..802e4ca7ce4 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-4.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-4.c
@@ -72,4 +72,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 3 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-4g.c b/gcc/testsuite/gcc.dg/strlenopt-4g.c
index c9a5f00ba94..879d5666c90 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-4g.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-4g.c
@@ -11,4 +11,3 @@
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 5 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-4gf.c b/gcc/testsuite/gcc.dg/strlenopt-4gf.c
index e1762366e45..7f261b7d34d 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-4gf.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-4gf.c
@@ -16,4 +16,3 @@
 /* { dg-final { scan-tree-dump-times "strcpy \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 5 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-5.c b/gcc/testsuite/gcc.dg/strlenopt-5.c
index 131494ac8e4..1b006a93045 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-5.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-5.c
@@ -54,4 +54,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 2 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-6.c b/gcc/testsuite/gcc.dg/strlenopt-6.c
index d9b718758a5..fbff14c4fdb 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-6.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-6.c
@@ -83,4 +83,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-7.c b/gcc/testsuite/gcc.dg/strlenopt-7.c
index 6fd940d748b..3ae1e2cb3f0 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-7.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-7.c
@@ -47,7 +47,5 @@ main ()
 /* { dg-final { scan-tree-dump-times "strchr \\(" 1 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "\\*r_\[0-9\]* = 0;" 1 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
 /* { dg-final { scan-tree-dump-times "return 3;" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return 0;" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-8.c b/gcc/testsuite/gcc.dg/strlenopt-8.c
index d82b31c5e0d..85c6d38a965 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-8.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-8.c
@@ -54,4 +54,3 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
diff --git a/gcc/testsuite/gcc.dg/strlenopt-9.c b/gcc/testsuite/gcc.dg/strlenopt-9.c
index 2610f6e979a..b0406b162d4 100644
--- a/gcc/testsuite/gcc.dg/strlenopt-9.c
+++ b/gcc/testsuite/gcc.dg/strlenopt-9.c
@@ -104,6 +104,4 @@ main ()
 /* { dg-final { scan-tree-dump-times "strcat \\(" 0 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "strchr \\(" 3 "strlen" } } */
 /* { dg-final { scan-tree-dump-times "stpcpy \\(" 0 "strlen" } } */
-/* { dg-final { cleanup-tree-dump "strlen" } } */
 /* { dg-final { scan-tree-dump-times "return 4;" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/superblock.c b/gcc/testsuite/gcc.dg/superblock.c
index 272d161f058..2b2fa9e154f 100644
--- a/gcc/testsuite/gcc.dg/superblock.c
+++ b/gcc/testsuite/gcc.dg/superblock.c
@@ -19,6 +19,4 @@ foo (void)
 
 /* { dg-final { scan-rtl-dump-times "0 uses" 0 "bbro"} } */
 /* { dg-final { scan-rtl-dump-times "ADVANCING TO" 2 "sched2"} } */
-/* { dg-final { cleanup-rtl-dump "bbro" } } */
-/* { dg-final { cleanup-rtl-dump "sched2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tail-merge-store.c b/gcc/testsuite/gcc.dg/tail-merge-store.c
index 1aefbdc1495..6f323a0e1ab 100644
--- a/gcc/testsuite/gcc.dg/tail-merge-store.c
+++ b/gcc/testsuite/gcc.dg/tail-merge-store.c
@@ -19,4 +19,3 @@ f (int c, int d)
 
 /* { dg-final { scan-tree-dump-times "duplicate of" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-times "z = 5" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/20091221.c b/gcc/testsuite/gcc.dg/tm/20091221.c
index 4751f2bb781..7837243fe5c 100644
--- a/gcc/testsuite/gcc.dg/tm/20091221.c
+++ b/gcc/testsuite/gcc.dg/tm/20091221.c
@@ -13,4 +13,3 @@ foo()
 }
 
 /* { dg-final { scan-tree-dump-times "readOnly" 1 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/20100125.c b/gcc/testsuite/gcc.dg/tm/20100125.c
index 3b3d2b9f52b..26bd893ec4e 100644
--- a/gcc/testsuite/gcc.dg/tm/20100125.c
+++ b/gcc/testsuite/gcc.dg/tm/20100125.c
@@ -15,4 +15,3 @@ void set_remove(int * val)
 }
 
 /* { dg-final { scan-tree-dump-times "getTMCloneOrIrrevocable" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/20100603.c b/gcc/testsuite/gcc.dg/tm/20100603.c
index 3061063394d..34d837b610c 100644
--- a/gcc/testsuite/gcc.dg/tm/20100603.c
+++ b/gcc/testsuite/gcc.dg/tm/20100603.c
@@ -18,4 +18,3 @@ void TMlist_free ()
 }
 
 /* { dg-final { scan-tree-dump-times "Function poof ._ZGTt4poof" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/alias-1.c b/gcc/testsuite/gcc.dg/tm/alias-1.c
index 596851d5967..86b3d7ab0ef 100644
--- a/gcc/testsuite/gcc.dg/tm/alias-1.c
+++ b/gcc/testsuite/gcc.dg/tm/alias-1.c
@@ -37,4 +37,3 @@ void f(void)
 /* { dg-final { scan-tree-dump-times "someptr = .*same as mystruct" 1 "ealias" } } */
 /* { dg-final { scan-tree-dump-times "ui\..* = .*same as mystruct" 1 "ealias" } } */
 /* { dg-final { scan-tree-dump-times "pp\..* = .*same as mystruct" 1 "ealias" } } */
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/alias-2.c b/gcc/testsuite/gcc.dg/tm/alias-2.c
index 630680355dc..dd3db94cbf7 100644
--- a/gcc/testsuite/gcc.dg/tm/alias-2.c
+++ b/gcc/testsuite/gcc.dg/tm/alias-2.c
@@ -39,4 +39,3 @@ void foo()
 /* { dg-final { scan-tree-dump-times "ui\..* = .*same as mystruct" 1 "ealias" } } */
 /* { dg-final { scan-tree-dump-times "mystruct.*ESCAPED" 1 "ealias" } } */
 /* { dg-final { scan-tree-dump-times "pp = .*same as mystruct" 1 "ealias" } } */
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/clone-1.c b/gcc/testsuite/gcc.dg/tm/clone-1.c
index 4050adddc55..fe3b7634a25 100644
--- a/gcc/testsuite/gcc.dg/tm/clone-1.c
+++ b/gcc/testsuite/gcc.dg/tm/clone-1.c
@@ -10,4 +10,3 @@ void cloneme()
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_WU.*foo" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/debug-1.c b/gcc/testsuite/gcc.dg/tm/debug-1.c
index 691cd77578a..43516542a31 100644
--- a/gcc/testsuite/gcc.dg/tm/debug-1.c
+++ b/gcc/testsuite/gcc.dg/tm/debug-1.c
@@ -23,4 +23,3 @@ int main() {
 /* { dg-final { scan-tree-dump-times ":14:.*_ITM_beginTransaction" 1 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times ":15:.*ITM_WU. \\(&z" 1 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times ":16:.*ITM_WU. \\(&a" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/instrumented-mask.c b/gcc/testsuite/gcc.dg/tm/instrumented-mask.c
index 6cfd3e47924..f44ea92365a 100644
--- a/gcc/testsuite/gcc.dg/tm/instrumented-mask.c
+++ b/gcc/testsuite/gcc.dg/tm/instrumented-mask.c
@@ -13,4 +13,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump-times " instrumentedCode" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/ipa-1.c b/gcc/testsuite/gcc.dg/tm/ipa-1.c
index ec1cdca7032..0f124784a6c 100644
--- a/gcc/testsuite/gcc.dg/tm/ipa-1.c
+++ b/gcc/testsuite/gcc.dg/tm/ipa-1.c
@@ -11,4 +11,3 @@ void bar(void)
 }
 
 /* { dg-final { scan-tree-dump-times "_ZGTt3foo" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/ipa-2.c b/gcc/testsuite/gcc.dg/tm/ipa-2.c
index e7a02cb1926..23e03e94ffd 100644
--- a/gcc/testsuite/gcc.dg/tm/ipa-2.c
+++ b/gcc/testsuite/gcc.dg/tm/ipa-2.c
@@ -11,4 +11,3 @@ void bar(void)
 }
 
 /* { dg-final { scan-tree-dump-times "_ZGTt3foo" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-2.c b/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
index 9b1127f2f4d..f41f8443006 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-2.c
@@ -19,4 +19,3 @@ foo()
 
 /* { dg-final { scan-tree-dump-times "doesGoIrrevocable" 1 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "hasNoIrrevocable" 0 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-3.c b/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
index 9a9903c1ee3..c9a8e63dc90 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-3.c
@@ -12,4 +12,3 @@ foo()
 }
 
 /* { dg-final { scan-tree-dump-times "doesGoIrrevocable" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-4.c b/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
index ee48f82f17e..22790c481b5 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-4.c
@@ -13,4 +13,3 @@ foo()
 }
 
 /* { dg-final { scan-tree-dump-times "hasNoIrrevocable" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-5.c b/gcc/testsuite/gcc.dg/tm/irrevocable-5.c
index 155879f1a21..875b4296b34 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-5.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-5.c
@@ -24,4 +24,3 @@ void wildthing()
 /* { dg-final { scan-ipa-dump-times "bb 4 goes irr" 1 "tmipa" } } */
 /* { dg-final { scan-ipa-dump-times "bb 5 goes irr" 1 "tmipa" } } */
 /* { dg-final { scan-ipa-dump-times "bb 6 goes irr" 1 "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-6.c b/gcc/testsuite/gcc.dg/tm/irrevocable-6.c
index 2399131210b..a94b0c6de2c 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-6.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-6.c
@@ -31,4 +31,3 @@ void wildthing()
 /* { dg-final { scan-ipa-dump-times "bb 7 goes irr" 1 "tmipa" } } */
 /* { dg-final { scan-ipa-dump-times "bb 8 goes irr" 1 "tmipa" } } */
 /* { dg-final { scan-ipa-dump-times "bb 9 goes irr" 1 "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/irrevocable-7.c b/gcc/testsuite/gcc.dg/tm/irrevocable-7.c
index ea8a00f0c55..32f61f72cf0 100644
--- a/gcc/testsuite/gcc.dg/tm/irrevocable-7.c
+++ b/gcc/testsuite/gcc.dg/tm/irrevocable-7.c
@@ -10,4 +10,3 @@ int foo()
 }
 
 /* { dg-final { scan-ipa-dump-times "changeTransactionMode \\(0\\)" 1 "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-1.c b/gcc/testsuite/gcc.dg/tm/memopt-1.c
index ac88ebd1e43..5e7c57b0b73 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-1.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-1.c
@@ -27,4 +27,3 @@ f()
 /* { dg-final { scan-tree-dump-times "transforming: .*_ITM_WaRU4 \\(&i," 1 "tmmemopt" } } */
 /* { dg-final { scan-tree-dump-times "transforming: .*_ITM_RaWU4 \\(&i\\);" 1 "tmmemopt" } } */
 /* { dg-final { scan-tree-dump-times "transforming: .*_ITM_WaWU4 \\(&i," 1 "tmmemopt" } } */
-/* { dg-final { cleanup-tree-dump "tmmemopt" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-10.c b/gcc/testsuite/gcc.dg/tm/memopt-10.c
index 0978bce912d..5438ecbd9ca 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-10.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-10.c
@@ -25,4 +25,3 @@ int f()
 /* { dg-final { scan-tree-dump-times "ITM_LU" 0 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "ITM_WU" 0 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "int tm_save" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-11.c b/gcc/testsuite/gcc.dg/tm/memopt-11.c
index 0c96f0efa8f..44c538b54d5 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-11.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-11.c
@@ -27,4 +27,3 @@ int f()
 /* { dg-final { scan-tree-dump-times "ITM_LU" 0 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "ITM_WU" 0 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "int tm_save" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-12.c b/gcc/testsuite/gcc.dg/tm/memopt-12.c
index 42788167394..321f6c09927 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-12.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-12.c
@@ -32,4 +32,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_WU" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-13.c b/gcc/testsuite/gcc.dg/tm/memopt-13.c
index 381e682bca0..6e93b7feaea 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-13.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-13.c
@@ -13,4 +13,3 @@ void f()
 }
 
 /* { dg-final { scan-tree-dump-times "memmoveRtWt \\\(&large_global," 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-16.c b/gcc/testsuite/gcc.dg/tm/memopt-16.c
index 44ae3d40b30..fce9277bb42 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-16.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-16.c
@@ -41,4 +41,3 @@ int f(int j)
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_WU" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-2.c b/gcc/testsuite/gcc.dg/tm/memopt-2.c
index 08aa9acdcbc..cd29692a074 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-2.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-2.c
@@ -12,4 +12,3 @@ void f(void)
 
 /* { dg-final { scan-tree-dump-times "transforming.*RfWU1 \\(&c" 1 "tmmemopt" } } */
 /* { dg-final { scan-tree-dump-times "transforming.*WaWU1 \\(&c" 1 "tmmemopt" } } */
-/* { dg-final { cleanup-tree-dump "tmmemopt" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-3.c b/gcc/testsuite/gcc.dg/tm/memopt-3.c
index d44bd7f74b4..5316f9cae20 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-3.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-3.c
@@ -18,4 +18,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "logging: lala.x\\\[i_4\\\]" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-4.c b/gcc/testsuite/gcc.dg/tm/memopt-4.c
index 67135f3b92d..143c88b5550 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-4.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-4.c
@@ -22,4 +22,3 @@ int f()
 
 /* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala.x\\\[55\\\]" 1 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "lala.x\\\[55\\\] = tm_save" 1 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-5.c b/gcc/testsuite/gcc.dg/tm/memopt-5.c
index 414de819565..5ad24e048ae 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-5.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-5.c
@@ -21,4 +21,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_LU\[0-9\] \\\(&lala.x\\\[55\\\]" 1 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-6.c b/gcc/testsuite/gcc.dg/tm/memopt-6.c
index 91524f900b4..4f1a41db323 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-6.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-6.c
@@ -19,4 +19,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "memmoveRtWt \\\(.*, &lacopy" 1 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-7.c b/gcc/testsuite/gcc.dg/tm/memopt-7.c
index d3a478bde1c..670d3dba117 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-7.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-7.c
@@ -19,4 +19,3 @@ int f()
 
 /* { dg-final { scan-tree-dump-times "tm_save.\[0-9_\]+ = lala" 1 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "lala = tm_save" 1 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-8.c b/gcc/testsuite/gcc.dg/tm/memopt-8.c
index 10320e78950..f0e6e083130 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-8.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-8.c
@@ -23,4 +23,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_WU" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memopt-9.c b/gcc/testsuite/gcc.dg/tm/memopt-9.c
index 0c34f20b926..ce47cc79897 100644
--- a/gcc/testsuite/gcc.dg/tm/memopt-9.c
+++ b/gcc/testsuite/gcc.dg/tm/memopt-9.c
@@ -26,4 +26,3 @@ int f()
 }
 
 /* { dg-final { scan-tree-dump-times "ITM_WU" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/memset-2.c b/gcc/testsuite/gcc.dg/tm/memset-2.c
index 743ada13783..bf565725f08 100644
--- a/gcc/testsuite/gcc.dg/tm/memset-2.c
+++ b/gcc/testsuite/gcc.dg/tm/memset-2.c
@@ -14,4 +14,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "GTMA_HAVE_STORE" 1 "tmlower" } } */
-/* { dg-final { cleanup-tree-dump "tmlower" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/pr55401.c b/gcc/testsuite/gcc.dg/tm/pr55401.c
index 1ac7d975715..6dd73c1b88c 100644
--- a/gcc/testsuite/gcc.dg/tm/pr55401.c
+++ b/gcc/testsuite/gcc.dg/tm/pr55401.c
@@ -19,4 +19,3 @@ void foo()
    FOO.  */
 /* { dg-final { scan-tree-dump-times "ITM_WU\[0-9\] \\(&george," 2 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/props-1.c b/gcc/testsuite/gcc.dg/tm/props-1.c
index 344e6df21a9..b1db425cedd 100644
--- a/gcc/testsuite/gcc.dg/tm/props-1.c
+++ b/gcc/testsuite/gcc.dg/tm/props-1.c
@@ -16,5 +16,3 @@ foo(int local)
 /* { dg-final { scan-tree-dump-times " instrumentedCode" 1 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "hasNoAbort" 0 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "GTMA_HAVE_ABORT" 1 "tmlower" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmlower" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/props-2.c b/gcc/testsuite/gcc.dg/tm/props-2.c
index 2d2bdb8c263..acbe16a40ab 100644
--- a/gcc/testsuite/gcc.dg/tm/props-2.c
+++ b/gcc/testsuite/gcc.dg/tm/props-2.c
@@ -18,4 +18,3 @@ foo(){
 }
 
 /* { dg-final { scan-ipa-dump-times "GTMA_MAY_ENTER_IRREVOCABLE" 1 "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/props-3.c b/gcc/testsuite/gcc.dg/tm/props-3.c
index 606b9a34fd6..2813745f813 100644
--- a/gcc/testsuite/gcc.dg/tm/props-3.c
+++ b/gcc/testsuite/gcc.dg/tm/props-3.c
@@ -13,4 +13,3 @@ foo(){
 }
 
 /* { dg-final { scan-ipa-dump-times "GTMA_MAY_ENTER_IRREVOCABLE" 1 "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/props-4.c b/gcc/testsuite/gcc.dg/tm/props-4.c
index c34f5e619e3..dcfb094e473 100644
--- a/gcc/testsuite/gcc.dg/tm/props-4.c
+++ b/gcc/testsuite/gcc.dg/tm/props-4.c
@@ -22,5 +22,3 @@ foo(void)
 
 /* { dg-final { scan-tree-dump-times " instrumentedCode" 1 "tmedge" } } */
 /* { dg-final { scan-tree-dump-times "hasNoAbort" 0 "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmedge" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c
index 660e9a62767..c95111ca125 100644
--- a/gcc/testsuite/gcc.dg/tm/pub-safety-1.c
+++ b/gcc/testsuite/gcc.dg/tm/pub-safety-1.c
@@ -21,4 +21,3 @@ void reader()
 }
 
 /* { dg-final { scan-tree-dump-times "Cannot hoist.*DATA_DATA because it is in a transaction" 1 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/reg-promotion.c b/gcc/testsuite/gcc.dg/tm/reg-promotion.c
index e48bfb2795d..0200600ef11 100644
--- a/gcc/testsuite/gcc.dg/tm/reg-promotion.c
+++ b/gcc/testsuite/gcc.dg/tm/reg-promotion.c
@@ -21,4 +21,3 @@ void func()
 }
 
 /* { dg-final { scan-tree-dump-times "Cannot hoist conditional load of count because it is in a transaction" 1 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/wrap-3.c b/gcc/testsuite/gcc.dg/tm/wrap-3.c
index 673247103dc..c9017855298 100644
--- a/gcc/testsuite/gcc.dg/tm/wrap-3.c
+++ b/gcc/testsuite/gcc.dg/tm/wrap-3.c
@@ -14,4 +14,3 @@ void foo()
    everything is as usual.  */
 /* { dg-final { scan-tree-dump-times "free" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tm/wrap-4.c b/gcc/testsuite/gcc.dg/tm/wrap-4.c
index d3a6a48f8e0..7c1969ba425 100644
--- a/gcc/testsuite/gcc.dg/tm/wrap-4.c
+++ b/gcc/testsuite/gcc.dg/tm/wrap-4.c
@@ -17,4 +17,3 @@ void foo()
    everything is as usual.  */
 /* { dg-final { scan-tree-dump-times "candy \\(\\);" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
index 3dc47ad1ed2..acf89cef843 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-convert-4.c
@@ -33,4 +33,3 @@ int main()
 /* { dg-final { scan-tree-dump-times "nearbyint " 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "nearbyintf" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "nearbyintl" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-math-2.c b/gcc/testsuite/gcc.dg/torture/builtin-math-2.c
index 7e2ff138368..e8f2c440736 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-math-2.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-math-2.c
@@ -382,4 +382,3 @@ void bar()
 /* { dg-final { scan-tree-dump-times "_gamma_r " 6 "original" } } */
 /* { dg-final { scan-tree-dump-times "_gammaf_r" 6 "original" } } */
 /* { dg-final { scan-tree-dump-times "_gammal_r" 6 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-math-5.c b/gcc/testsuite/gcc.dg/torture/builtin-math-5.c
index 259164107d8..025f4d0c025 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-math-5.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-math-5.c
@@ -120,4 +120,3 @@ void bar()
 /* { dg-final { scan-tree-dump-times "cpowf" 12 "original" { target { spu*-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "cpow " 18 "original" } } */
 /* { dg-final { scan-tree-dump-times "cpowl" 18 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-pow-mpfr-1.c b/gcc/testsuite/gcc.dg/torture/builtin-pow-mpfr-1.c
index 6206b9ee3d2..67a3246c145 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-pow-mpfr-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-pow-mpfr-1.c
@@ -16,4 +16,3 @@ extern double testit()
 }
 
 /* { dg-final { scan-tree-dump "pow" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/builtins-1.c b/gcc/testsuite/gcc.dg/torture/builtins-1.c
index c0e8210a105..6a48753188c 100644
--- a/gcc/testsuite/gcc.dg/torture/builtins-1.c
+++ b/gcc/testsuite/gcc.dg/torture/builtins-1.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-fdump-rtl-expand-all" */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
 int isdigit(int c)
 {
         return c >= 0;
diff --git a/gcc/testsuite/gcc.dg/torture/ipa-pta-1.c b/gcc/testsuite/gcc.dg/torture/ipa-pta-1.c
index 80303a54eb6..c31d4089a60 100644
--- a/gcc/testsuite/gcc.dg/torture/ipa-pta-1.c
+++ b/gcc/testsuite/gcc.dg/torture/ipa-pta-1.c
@@ -43,4 +43,3 @@ void test4 (int a4, char b, char c, char d, char e, char f, char g, char h)
 }
 
 /* { dg-final { scan-ipa-dump "bar.arg0 = { test4.arg0 test3.arg0 test2.arg0 test1.arg0 }" "pta" } } */
-/* { dg-final { cleanup-ipa-dump "pta" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/ldist-1.c b/gcc/testsuite/gcc.dg/torture/ldist-1.c
index b6a0f28bac8..a3d7cb84872 100644
--- a/gcc/testsuite/gcc.dg/torture/ldist-1.c
+++ b/gcc/testsuite/gcc.dg/torture/ldist-1.c
@@ -9,4 +9,3 @@ void foo (volatile int *p, int n)
 }
 
 /* { dg-final { scan-assembler-not "memset" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr23821.c b/gcc/testsuite/gcc.dg/torture/pr23821.c
index 04847d65ae1..ce8bb520d8f 100644
--- a/gcc/testsuite/gcc.dg/torture/pr23821.c
+++ b/gcc/testsuite/gcc.dg/torture/pr23821.c
@@ -26,4 +26,3 @@ main ()
    induction variable increment.  */
 
 /* { dg-final { scan-tree-dump "Added canonical iv" "ivcanon" } } */
-/* { dg-final { cleanup-tree-dump "ivcanon" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr39074-2.c b/gcc/testsuite/gcc.dg/torture/pr39074-2.c
index d18930a4d6e..740b463debc 100644
--- a/gcc/testsuite/gcc.dg/torture/pr39074-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pr39074-2.c
@@ -32,4 +32,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "y.._. = { i }" "alias" } } */
 /* { dg-final { scan-tree-dump "y.._., points-to vars: { D..... }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr39074.c b/gcc/testsuite/gcc.dg/torture/pr39074.c
index 5d46f3120d1..31ed499bfda 100644
--- a/gcc/testsuite/gcc.dg/torture/pr39074.c
+++ b/gcc/testsuite/gcc.dg/torture/pr39074.c
@@ -31,4 +31,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "y.._. = { i }" "alias" } } */
 /* { dg-final { scan-tree-dump "y.._., points-to vars: { D..... }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr42898-2.c b/gcc/testsuite/gcc.dg/torture/pr42898-2.c
index ee2de9675bf..6634ea0b077 100644
--- a/gcc/testsuite/gcc.dg/torture/pr42898-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pr42898-2.c
@@ -23,4 +23,3 @@ void f1(volatile struct hardware *ptr)
 }
 
 /* { dg-final { scan-tree-dump-times "\\*ptr" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr42898.c b/gcc/testsuite/gcc.dg/torture/pr42898.c
index d87c45dfbc7..6cd24a59c12 100644
--- a/gcc/testsuite/gcc.dg/torture/pr42898.c
+++ b/gcc/testsuite/gcc.dg/torture/pr42898.c
@@ -21,4 +21,3 @@ void f1(volatile struct hardware *ptr)
 }
 
 /* { dg-final { scan-tree-dump-times "\\*ptr" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr45704.c b/gcc/testsuite/gcc.dg/torture/pr45704.c
index 51456cec46a..3afe6ad0dc9 100644
--- a/gcc/testsuite/gcc.dg/torture/pr45704.c
+++ b/gcc/testsuite/gcc.dg/torture/pr45704.c
@@ -13,4 +13,3 @@ int foo(struct st *st)
 }
 
 /* { dg-final { scan-tree-dump-times "={v}" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr50472.c b/gcc/testsuite/gcc.dg/torture/pr50472.c
index 3b432eae31a..519408038d1 100644
--- a/gcc/testsuite/gcc.dg/torture/pr50472.c
+++ b/gcc/testsuite/gcc.dg/torture/pr50472.c
@@ -10,4 +10,3 @@ unsigned int test( void )
 }
 
 /* { dg-final { scan-tree-dump-not "return 1" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr55018.c b/gcc/testsuite/gcc.dg/torture/pr55018.c
index d459b1ba652..629fbcdaebf 100644
--- a/gcc/testsuite/gcc.dg/torture/pr55018.c
+++ b/gcc/testsuite/gcc.dg/torture/pr55018.c
@@ -20,4 +20,3 @@ lab:
 }
 
 /* { dg-final { scan-tree-dump "printf" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr57147-1.c b/gcc/testsuite/gcc.dg/torture/pr57147-1.c
index e5ad5449989..5c2a30e91e6 100644
--- a/gcc/testsuite/gcc.dg/torture/pr57147-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr57147-1.c
@@ -18,4 +18,3 @@ void TestSyscall(void)
 }
 
 /* { dg-final { scan-tree-dump-not "builtin_unreachable" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pr57147-2.c b/gcc/testsuite/gcc.dg/torture/pr57147-2.c
index 087c2de15c6..fc5fb39eed5 100644
--- a/gcc/testsuite/gcc.dg/torture/pr57147-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pr57147-2.c
@@ -20,4 +20,3 @@ void TestSyscall(void)
 }
 
 /* { dg-final { scan-tree-dump "setjmp" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-callused-1.c b/gcc/testsuite/gcc.dg/torture/pta-callused-1.c
index 5ca71c2a02e..b35959c6351 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-callused-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-callused-1.c
@@ -22,4 +22,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "p.._. = { i j }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-escape-1.c b/gcc/testsuite/gcc.dg/torture/pta-escape-1.c
index d3cb25437cc..9172bedb880 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-escape-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-escape-1.c
@@ -31,4 +31,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump "ESCAPED = {\[^\n\}\]* i \[^\n\}\]*}" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c
index ab5634da97b..99a548840df 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c
@@ -30,4 +30,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "ESCAPED = {\[^\n\}\]* i f \[^\n\}\]*}" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c
index 1158775abcd..4f5556acc93 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c
@@ -33,4 +33,3 @@ int main()
 /* In theory = { i } is the correct solution.  But it's not easy to scan
    for that reliably, so just use what we create now.  */
 /* { dg-final { scan-tree-dump "= { i j }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c
index 4b18e1aa3ac..b952f11cece 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-3.c
@@ -34,4 +34,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "q_. = { i j k }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/pta-structcopy-1.c b/gcc/testsuite/gcc.dg/torture/pta-structcopy-1.c
index 4846dd69879..f9cf8920b63 100644
--- a/gcc/testsuite/gcc.dg/torture/pta-structcopy-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pta-structcopy-1.c
@@ -33,4 +33,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "y.* = { i }" "ealias" } } */
 /* { dg-final { scan-tree-dump "y.*, points-to vars: { D..... }" "ealias" } } */
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/torture/ssa-pta-fn-1.c b/gcc/testsuite/gcc.dg/torture/ssa-pta-fn-1.c
index a90b1c62d3b..7d6da11854e 100644
--- a/gcc/testsuite/gcc.dg/torture/ssa-pta-fn-1.c
+++ b/gcc/testsuite/gcc.dg/torture/ssa-pta-fn-1.c
@@ -59,4 +59,3 @@ int main()
 /* { dg-final { scan-tree-dump "q_const_. = { NONLOCAL i }" "alias" } } */
 /* { dg-final { scan-tree-dump "q_pure_. = { ESCAPED NONLOCAL i }" "alias" } } */
 /* { dg-final { scan-tree-dump "q_normal_. = { ESCAPED NONLOCAL }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
index 881a0fd81fe..233c7ec70c0 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/20050826-2.c
@@ -73,4 +73,3 @@ 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 a932c968b95..565dd1cd366 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/cmpsf-1.c
@@ -182,4 +182,3 @@ 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/cold_partition_label.c b/gcc/testsuite/gcc.dg/tree-prof/cold_partition_label.c
index 42a19abafe7..910ac046bcc 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/cold_partition_label.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/cold_partition_label.c
@@ -37,4 +37,3 @@ main (int argc, char *argv[])
 
 /* { dg-final-use { scan-assembler "foo\[._\]+cold\[\._\]+0" { target *-*-linux* *-*-gnu* } } } */
 /* { dg-final-use { scan-assembler "size\[ \ta-zA-Z0-0\]+foo\[._\]+cold\[\._\]+0" { target *-*-linux* *-*-gnu* } } } */
-/* { dg-final-use { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c
index e9f3a418dca..e36ba269148 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1.c
@@ -16,4 +16,3 @@ caller(void (*func) (void))
 }
 
 /* { dg-final-use { scan-ipa-dump "hist->count 1 hist->all 1" "profile" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c
index fa9d6e70522..e09c9b98175 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/ic-misattribution-1a.c
@@ -19,4 +19,3 @@ main ()
   return 0;
 }
 
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c b/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c
index df7481f4daf..bed40a594c3 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/indir-call-prof.c
@@ -39,5 +39,3 @@ main (void)
 
 /* { dg-final-use { scan-ipa-dump "Indirect call -> direct call.* a1 transformation on insn" "profile"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/inliner-1.c b/gcc/testsuite/gcc.dg/tree-prof/inliner-1.c
index d95ff6b1126..f0cdf879c83 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/inliner-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/inliner-1.c
@@ -40,4 +40,3 @@ main ()
    declaration or other appearances of the string in dump.  */
 /* { dg-final-use { scan-tree-dump "cold_function ..;" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "hot_function ..;" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/merge_block.c b/gcc/testsuite/gcc.dg/tree-prof/merge_block.c
index d8cfb21cbf9..da4ec5a8676 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/merge_block.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/merge_block.c
@@ -19,4 +19,3 @@ main ()
   return 0;
 }
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/peel-1.c b/gcc/testsuite/gcc.dg/tree-prof/peel-1.c
index 92085b9f619..048beb69136 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/peel-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/peel-1.c
@@ -23,4 +23,3 @@ main()
 /* { dg-final-use { scan-tree-dump "Peeled loop ., 2 times" "cunroll" } } */
 /* In fact one peeling is enough; we however mispredict number of iterations of the loop
    at least until loop_ch is schedule ahead of profiling pass.  */
-/* { dg-final-use { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c b/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c
index 7fcefb72429..e1e06348aea 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/stringop-1.c
@@ -19,5 +19,3 @@ main()
 /* a[0] = b[0] is what we fold the resulting memcpy into.  */
 /* { dg-final-use { scan-tree-dump " = MEM.*&b" "optimized"} } */
 /* { dg-final-use { scan-tree-dump "MEM.*&a\\\] = " "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
index 0489aee68e3..bad185e2c9a 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/stringop-2.c
@@ -21,5 +21,3 @@ main()
 /* { dg-final-use { scan-ipa-dump "Single value 4 stringop" "profile"} } */
 /* The versioned memset of size 4 should be optimized to an assignment.  */
 /* { dg-final-use { scan-tree-dump "MEM\\\[\\(void .\\)&a\\\] = 168430090" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/switch-case-1.c b/gcc/testsuite/gcc.dg/tree-prof/switch-case-1.c
index 50ee9e44fd4..89e76cc59d5 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/switch-case-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/switch-case-1.c
@@ -37,4 +37,3 @@ int main ()
 }
 /* { dg-final-use { scan-rtl-dump-times ";; basic block\[^\\n\]*count 4000" 2 "expand"} } */
 /* { dg-final-use { scan-rtl-dump-times ";; basic block\[^\\n\]*count 2000" 1 "expand"} } */
-/* { dg-final-use { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/switch-case-2.c b/gcc/testsuite/gcc.dg/tree-prof/switch-case-2.c
index 07d4363d395..71612821174 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/switch-case-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/switch-case-2.c
@@ -37,4 +37,3 @@ int main ()
 }
 /* { dg-final-use { scan-rtl-dump-times ";; basic block\[^\\n\]*count 4000" 2 "expand"} } */
 /* { dg-final-use { scan-rtl-dump-times ";; basic block\[^\\n\]*count 2000" 1 "expand"} } */
-/* { dg-final-use { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
index c61b534a250..ee8a9d805cf 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-1.c
@@ -19,4 +19,3 @@ int main ()
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 0" 1 "profile"} } */
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
index 04113419753..29c0d191afe 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/time-profiler-2.c
@@ -47,4 +47,3 @@ int main ()
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 1" 1 "profile"} } */
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 2" 1 "profile"} } */
 /* { dg-final-use { scan-ipa-dump-times "Read tp_first_run: 3" 1 "profile"} } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/tracer-1.c b/gcc/testsuite/gcc.dg/tree-prof/tracer-1.c
index 385a1a5c2f3..1e64f284ac0 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/tracer-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/tracer-1.c
@@ -15,4 +15,3 @@ int main ()
 }
 /* Superblock formation should produce two copies of the increment of c */
 /* { dg-final-generate { scan-tree-dump-times "c =" 2 "tracer" } } */
-/* { dg-final-use { cleanup-tree-dump "tracer" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/unroll-1.c b/gcc/testsuite/gcc.dg/tree-prof/unroll-1.c
index c5fcad305c1..1e95c3d0f0a 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/unroll-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/unroll-1.c
@@ -21,4 +21,3 @@ main()
   return 0;
 }
 /* { dg-final-use { scan-rtl-dump "Considering unrolling loop with constant number of iterations" "loop2_unroll" } } */
-/* { dg-final-use { cleanup-rtl-dump "loop2_unroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/update-cunroll-2.c b/gcc/testsuite/gcc.dg/tree-prof/update-cunroll-2.c
index dc481c75c9b..c286816cdf8 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/update-cunroll-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/update-cunroll-2.c
@@ -19,4 +19,3 @@ main ()
   return 0;
 }
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
index 85a4b2a840c..4dd51af6aeb 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
@@ -19,5 +19,3 @@ main ()
 /* { dg-final-use { scan-tree-dump-not "loop depth 1, count 33332" "optimized"} } */
 /* { dg-final-use { scan-tree-dump "Removing basic block" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/update-tailcall.c b/gcc/testsuite/gcc.dg/tree-prof/update-tailcall.c
index 28549144534..57e781c7991 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/update-tailcall.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/update-tailcall.c
@@ -16,5 +16,3 @@ main()
 }
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "tailc"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "tailc" } } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c
index e3e15a8225f..97dd311f4df 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-1.c
@@ -19,5 +19,3 @@ main ()
 /* { dg-final-use { scan-ipa-dump "Div.mod by constant n_\[0-9\]*=257 transformation on insn" "profile"} } */
 /* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* != 257\\)" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c
index 6920cbce69d..2e85a86f513 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-2.c
@@ -29,5 +29,3 @@ main ()
    didn't get optimized out.  */
 /* { dg-final-use { scan-tree-dump "n_\[0-9\]* \\+ (4294967295|0x0*ffffffff)" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c
index fc5a7cd0f4d..6da88a898f1 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-3.c
@@ -29,5 +29,3 @@ main ()
    didn't get optimized out.  */
 /* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* \\>" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c
index a1927d1de31..5d151580f1f 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-4.c
@@ -29,5 +29,3 @@ main ()
    didn't get optimized out.  */
 /* { dg-final-use { scan-tree-dump "if \\(n_\[0-9\]* \\>" "optimized"} } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c
index 8cb17b05bd6..7e88ac47dc6 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-5.c
@@ -14,5 +14,3 @@ main()
 }
 /* { dg-final-use { scan-ipa-dump "Div.mod by constant b.*=997 transformation on insn" "profile" } } */
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-6.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-6.c
index 4ac9b755b68..fd24ee33bda 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-6.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-6.c
@@ -17,4 +17,3 @@ main()
 }
 /* { dg-final-use { scan-tree-dump "Average value sum:499500" "optimized"} } */
 /* { dg-final-use { scan-tree-dump "IOR value" "optimized"} } */
-/* { dg-final-use { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c b/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c
index 6c64d0795a3..3d85714d14b 100644
--- a/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c
@@ -23,4 +23,3 @@ int main() {
 }
 
 /* { dg-final-use { scan-ipa-dump "Single value 8 stringop transformation on bzero" "profile" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c
index c16196b3d17..f03a2cf41ed 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030530-2.c
@@ -24,5 +24,4 @@ rs6000_emit_prologue (int i, rs6000_stack_t *info)
    commutative operands correctly.  */
 /* { dg-final { scan-tree-dump-times "\\+" 1 "dom2"} } */
  
-/* { dg-final { cleanup-tree-dump "dom2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c
index c419094ddc9..9250ab3b4a7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030611-1.c
@@ -12,4 +12,3 @@ shit(int a)
 /* There should be precisely one call to square.   If there is more than one,
    then the dominator optimizations failed to remove the redundant call.  */
 /* { dg-final { scan-tree-dump-times "square" 1 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c
index 8a397732792..5d274c1f922 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030703-1.c
@@ -20,4 +20,3 @@ foo(int index)
 /* There should be exactly one IF conditional.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c
index 4a64b90db1a..ce50af26a7c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030703-2.c
@@ -41,4 +41,3 @@ get_alias_set (t)
    if() to disappear.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c
index 5d083fb98db..8b7ab985bd3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030708-1.c
@@ -42,4 +42,3 @@ nonlocal_mentioned_p (x)
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */
                                                                                 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030709-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030709-1.c
index 686ca76a367..014fa784c01 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030709-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030709-1.c
@@ -14,4 +14,3 @@ foo ()
 
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c
index 74014ba8330..aeff3418c50 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030709-2.c
@@ -52,4 +52,3 @@ get_alias_set (t)
    collapse down to a simple return 0 without any conditionals).  */
 /* { dg-final { scan-tree-dump-times "if " 1 "cddce2"} } */
 
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c
index 4f9847852bf..838317de293 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030709-3.c
@@ -45,4 +45,3 @@ record_component_aliases (type)
 /* There should be one IF conditional.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c
index edf51c56af7..eba41e9f96b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030710-1.c
@@ -53,4 +53,3 @@ record_component_aliases (type)
 /* There should be two loads of vec.length.  */
 /* { dg-final { scan-tree-dump-times "vec.length" 2 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c
index 32901a211e1..5ad2f113d43 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-1.c
@@ -53,4 +53,3 @@ record_component_aliases (type)
 /* There should be four loads of vec.length.  */
 /* { dg-final { scan-tree-dump-times "vec.length" 4 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c
index 10396dd4528..7fce5ab4b66 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-2.c
@@ -67,4 +67,3 @@ get_alias_set (t,z)
 /* There should be one load of alias.  */
 /* { dg-final { scan-tree-dump-times "->alias" 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c
index 099ba8b3661..15d7e973041 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030711-3.c
@@ -59,4 +59,3 @@ get_alias_set (t)
 /* There should be one load of alias.  */
 /* { dg-final { scan-tree-dump-times "->alias" 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c
index 0225d58a48c..9f0daac22dc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030714-1.c
@@ -43,4 +43,3 @@ find_base_value_wrapper (src)
 /* There should be no casts to short unsigned int.  */
 /* { dg-final { scan-tree-dump-times "\\(short unsigned int\\)" 0 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c
index cac64868726..eb663f2ff5b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030714-2.c
@@ -36,4 +36,3 @@ get_alias_set (t)
    properly.  */
 /* { dg-final { scan-tree-dump-times "if " 3 "dom2"} } */
  
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030728-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030728-1.c
index a11ddeaf218..7c1fea7dfbb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030728-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030728-1.c
@@ -42,4 +42,3 @@ objects_must_conflict_p (t1, t2)
    second to be propagated into all its uses and eliminated.   */
 /* { dg-final { scan-rtl-dump-times "PART.. = 0" 1 "expand"} } */
  
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c
index cf3923c5321..59d3a1baffc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030729-1.c
@@ -51,4 +51,3 @@ readonly_fields_p (type)
    because we load from ->common.code using different types.  */
 /* { dg-final { scan-tree-dump-times "common\.code" 1 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c
index 9f8f2746734..0b27938fd1c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030730-1.c
@@ -22,4 +22,3 @@ foo (int attr_kind, unsigned long offset)
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump "if " "dom2" { target { keeps_null_pointer_checks } } } } */
      
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c
index 0be596e8e64..699f0803a94 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030730-2.c
@@ -22,4 +22,3 @@ foo (int attr_kind, unsigned long offset)
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump "if " "dom2" { target { keeps_null_pointer_checks } } } } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c
index e1609fdd993..3605586e4a1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030731-1.c
@@ -64,4 +64,3 @@ store_expr (exp, target, want_value)
    immediately dominates the comparison in question.  We need something
    stronger.  */
 /* { dg-final { scan-tree-dump-times "target.*!= 0" 0 "dom2" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c
index 84353a5c785..bdb22fff646 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030731-2.c
@@ -16,4 +16,3 @@ bar (int i, int partial, int args_addr)
 /* There should be only one IF conditional since the first does nothing
    useful.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dce1"} } */
-/* { dg-final { cleanup-tree-dump "dce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c
index ead99e1da26..5f1f2dc903b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-1.c
@@ -43,4 +43,3 @@ bar (rtx r)
    which combines the result of those two tests into a new test
    must always be true and it is optimized appropriately.  */
 /* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-10.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-10.c
index fe5e859ee5d..0903f3c4321 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-10.c
@@ -23,4 +23,3 @@ subreg_highpart_offset (outermode, innermode)
 /* There should be one right shift by 2 places.  */
 /* { dg-final { scan-tree-dump-times " >> 2" 1 "vrp1"} } */
 
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c
index c49645f8b24..6effbb7ffe5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-11.c
@@ -19,4 +19,3 @@ foo (reg)
                                                                                 
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c
index 0b55b9bd0db..259932480a1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-2.c
@@ -29,4 +29,3 @@ foo(int n)
                                                                                
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c
index 2c1b3332123..bba3569c76f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-3.c
@@ -26,4 +26,3 @@ cpp_parse_escape (pstr, limit, wide)
 /* There should be precisely three IF statements.  If there is
    more than two, then the dominator optimizations failed.  */
 /* { dg-final { scan-tree-dump-times "if " 3 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c
index 2397644129f..41f8dd9994e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-5.c
@@ -36,4 +36,3 @@ foo ()
    The other one for '(EXPR)->unchanging'.  */
 /* { dg-final { scan-tree-dump-times "if " 2 "dom2"} } */
 
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-6.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-6.c
index 8a6506b3d6c..e680de8bdee 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-6.c
@@ -40,4 +40,3 @@ foo4 (distance, i, j)
 
 /* There should be no ABS_EXPR.  */
 /* { dg-final { scan-tree-dump-times "ABS_EXPR " 0 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-7.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-7.c
index 044e1c2ec17..0dda180d43a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-7.c
@@ -35,4 +35,3 @@ simplify_condition (cond_p)
 
 /* There should be exactly one IF conditional.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c
index 9be4503ebcd..83ec7281a4c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-8.c
@@ -52,4 +52,3 @@ output_location_lists (die)
 
 /* There should be exactly one IF conditional, in output_location_lists.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c b/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c
index 2506989901d..274b5a587c5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030807-9.c
@@ -20,4 +20,3 @@ ooof ()
 
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
index 27e2c7105f6..7cc5404561c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030808-1.c
@@ -38,4 +38,3 @@ delete_dead_jumptables ()
 /* There should be no IF statements.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "cddce2"} } */
 
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c
index 44c804364e7..451dc3b9045 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-1.c
@@ -20,4 +20,3 @@ com(int *blah)
    more than one, then the dominator optimizations failed.  */
 /* { dg-final { scan-tree-dump-times "\\*blah" 1 "dom2"} } */
   
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c
index 035b4ad3c2a..a99abf41570 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-2.c
@@ -20,4 +20,3 @@ foo (int value)
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */
  
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c
index e69b0ee5408..149da1bd912 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-3.c
@@ -21,4 +21,3 @@ foo (int value)
 /* There should be one IF conditional.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "dom2"} } */
  
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c
index 1b941d6654f..e59b3e346c2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-4.c
@@ -36,9 +36,7 @@ blah (decl, set)
 /* There should be precisely one reference to pointer_alias_set.  If there is
    more than one, then the dominator optimizations failed.  */
 /* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
 
 /* The assignment set = -1 in the ELSE clause of the last IF
    statement should be removed by the final cleanup phase.  */
 /* { dg-final { scan-tree-dump-times "set = -1" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c
index c4592106758..1b0bef1d3e0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-5.c
@@ -37,9 +37,7 @@ blah (decl, set)
 /* There should be precisely one reference to pointer_alias_set.  If there is
    more than one, then the dominator optimizations failed.  */
 /* { dg-final { scan-tree-dump-times "pointer_alias_set" 1 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
 
 /* The assignment set = -1 in the ELSE clause of the last IF
    statement should be removed by the final cleanup phase.  */
 /* { dg-final { scan-tree-dump-times "set = -1" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c
index 170526547d2..e84c958c31a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-6.c
@@ -42,4 +42,3 @@ foo (t, set)
 /* ??? Will fail until we properly distinguish member stores.  At
    present the write to type.alias_set kills the previous load.  */
 /* { dg-final { scan-tree-dump-times "common.code" 1 "dom2" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c b/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c
index 711bab25168..7aef97a2e48 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030814-7.c
@@ -39,4 +39,3 @@ mark_constant_function (void)
    This if we find current_function_decl used as an argument, then
    we have failed.  */
 /* { dg-final { scan-tree-dump-times "\\(current_function_decl\\)" 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
index 8cf74d59210..13ecd494354 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030821-1.c
@@ -26,5 +26,3 @@ y: ;
 
 /* We should have folded away the goto &x  */
 /* { dg-final { scan-tree-dump-times "goto &x" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030824-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030824-1.c
index e5988bd7998..1b3feb65117 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030824-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030824-1.c
@@ -20,4 +20,3 @@ int foo (int x, int y)
 
 /* The addition should be optimized into 'y+x'.  */
 /* { dg-final { scan-tree-dump-times "\[xy\]_..D. \\+ \[xy]_..D." 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030824-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030824-2.c
index 1234aeb34d1..7a73c70c4f1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030824-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030824-2.c
@@ -20,4 +20,3 @@ int foo (int x, int y)
 
 /* This function should be optimized into 'return y+x'.  */
 /* { dg-final { scan-tree-dump-times "\[xy\]_..D. \\+ \[xy]_..D." 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030825-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030825-1.c
index de34acaec4a..440f75571d4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030825-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030825-1.c
@@ -26,4 +26,3 @@ xxx:;
 
 /* Bla should not be optimized away.  */
 /* { dg-final { scan-tree-dump-times "bla" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030907-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030907-1.c
index a36472d39b6..6fb37c34349 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030907-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030907-1.c
@@ -27,4 +27,3 @@ int main()
 
 /* The abort() call clearly is unreachable.  */
 /* { dg-final { scan-tree-dump-times "abort" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030917-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030917-1.c
index 94d13365438..c53c4c9e1ec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030917-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030917-1.c
@@ -16,4 +16,3 @@ findbestextension (int blah, int blah2)
 
 /* The argument to "foo" should be a variable, not a constant.  */
 /* { dg-final { scan-tree-dump-times "foo .defval" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030917-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20030917-3.c
index 6a4d30cf07e..d1d9c992701 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030917-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030917-3.c
@@ -22,4 +22,3 @@ main ()
 
 /* The argument to "printf" should be a constant, not a variable.  */
 /* { dg-final { scan-tree-dump-times "printf.*, 0" 1 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c
index 96db1bd1d3a..7c1981a84ef 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030922-1.c
@@ -31,4 +31,3 @@ voidify_wrapper_expr (tree wrapper)
 
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c
index 5b9498cae4c..2434d34745b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20030922-2.c
@@ -25,4 +25,3 @@ rgn_rank (rtx insn1, rtx insn2)
    from temporary equivalences.  The heuristics there no longer do
    the correct thing.  VRP still optimizes this testcase.  */
 /* { dg-final { scan-tree-dump-times "if " 2 "dom1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c
index 3cc2ae94687..faa6853f571 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c
@@ -15,4 +15,3 @@ main(void)
 
 /* The VDEF comes from the initial assignment, the asm, and the clobber.  */
 /* { dg-final { scan-tree-dump-times "DEF" 3 "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031021-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031021-1.c
index 7c34ff4496a..e86a2a5e0ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031021-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031021-1.c
@@ -18,4 +18,3 @@ int main()
 
 /* We should only store to a.i, not load from it.  */
 /* { dg-final { scan-tree-dump-not "= a.i" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c
index 55769248b77..c780e7e9f9e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031022-1.c
@@ -27,4 +27,3 @@ blah (int arf)
 
 /* There should be one load from entry_exit_blocks[1].pred.  */
 /* { dg-final { scan-tree-dump-times "entry_exit_blocks.1..pred" 1 "dom1"} } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-1.c
index fea5aaf082c..d96f4197b6b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-1.c
@@ -18,4 +18,3 @@ void foo (int testarray[])
 
 /* There should be no link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-2.c
index 73dd4ff2ec1..9d177780514 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-2.c
@@ -26,4 +26,3 @@ void foo (struct s* teststruct)
 /* There should be no link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-3.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-3.c
index 2508a2c2f5f..cdce275774b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-3.c
@@ -19,4 +19,3 @@ void foo (int testarray[])
 
 /* There should be no link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-4.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-4.c
index d7278869170..fda3165f6b5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-4.c
@@ -27,4 +27,3 @@ void foo (struct s*  r)
 
 /* There should be no link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-5.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-5.c
index b066ab6cac0..e543939c77b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-5.c
@@ -26,4 +26,3 @@ void foo2 (struct s*  r, struct s*  p)
 
 /* There should be no link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031106-6.c b/gcc/testsuite/gcc.dg/tree-ssa/20031106-6.c
index 51fcd9788f2..56d1887bd78 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031106-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031106-6.c
@@ -26,4 +26,3 @@ struct s foo (struct s r)
 /* There should be no references to any of "temp_struct*"
    temporaries.  */
 /* { dg-final { scan-tree-dump-times "temp_struct" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031216-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031216-1.c
index 0e97833fea0..d3d39df3b11 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20031216-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20031216-1.c
@@ -17,4 +17,3 @@ foo (int b)
 /* The comparison should be eliminated, there should be no reference
    to link_error.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
index 77a0c128238..de2ae0fc0f4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
@@ -34,4 +34,3 @@ void test55 (int x, int y)
    by teaching dom to look through && and register all components
    as true.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail { ! "alpha*-*-* arm*-*-* aarch64*-*-* powerpc*-*-* cris-*-* crisv32-*-* hppa*-*-* i?86-*-* mmix-*-* mips*-*-* m68k*-*-* moxie-*-* nds32*-*-* sh*-*-* sparc*-*-* spu-*-* visium-*-* x86_64-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040210-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040210-1.c
index 990cb80756f..b5d253bae69 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040210-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040210-1.c
@@ -30,4 +30,3 @@ main(){
 
 /* Should have no more than two ifs left after straightening.  */
 /* { dg-final { scan-tree-dump-times "if " 2 "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
index 1ca231656ad..d289e5d0f55 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040211-1.c
@@ -36,4 +36,3 @@ com (rtx insn, int blah)
 /* Cddce cannot remove possibly infinite loops and there is no way how to
    determine whether the loop in can_move_up ends.  */
 /* { dg-final { scan-tree-dump "if " "cddce2"} } */
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040216-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040216-1.c
index a2edc9904ef..41bd868c8a2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040216-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040216-1.c
@@ -16,4 +16,3 @@ foo(int *z, int *y, int xx)
 
 /* We should convert two COND_EXPRs into straightline code.  */
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1"} } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040305-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040305-1.c
index 8e9f61da60a..d00acba07e4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040305-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040305-1.c
@@ -24,9 +24,7 @@ void foo(int edx, int eax)
 
 /* Verify that we did a forward propagation.  */
 /* { dg-final { scan-tree-dump-times "Replaced" 1 "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
 
 /* After cddce we should have two IF statements remaining as the other
    two tests can be threaded.  */
 /* { dg-final { scan-tree-dump-times "if " 2 "cddce2"} } */
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040430-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040430-1.c
index 4bc1f85ae94..4fbd950f3dd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040430-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040430-1.c
@@ -23,4 +23,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "if " 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040513-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040513-1.c
index bc65b979dd9..c001faa0118 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040513-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040513-1.c
@@ -14,4 +14,3 @@ foo (unsigned int a)
 /* There should be no casts to a _Bool since we can use the temporary
    holding (a>>5)&1 directly.  */
 /* { dg-final { scan-tree-dump-times "\\(_Bool\\)" 0 "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c
index a3edf9b8040..acd6c68652f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040513-2.c
@@ -22,4 +22,3 @@ int t(int i)
 /* There should be no link_error calls, if there is any, the
    optimization has failed */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040514-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040514-1.c
index 4c283507598..91fa65d070b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040514-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040514-1.c
@@ -16,4 +16,3 @@ end:
 
 /* Should have no ifs left after straightening.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040514-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20040514-2.c
index d518cacd07d..11f76671604 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040514-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040514-2.c
@@ -14,5 +14,4 @@ foo2 (distance, i, j)
 /* There should be one ABS_EXPR and no conditionals.  */
 /* { dg-final { scan-tree-dump-times "ABS_EXPR " 1 "phiopt1"} } */
 /* { dg-final { scan-tree-dump-times "if " 0 "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040517-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040517-1.c
index b49cf648c7d..6cfdbb1e252 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040517-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040517-1.c
@@ -19,4 +19,3 @@ void bar (void)
    Hence, we must have a VDEF for a before and after the call to foo().
    And one after the call to abort().  */
 /* { dg-final { scan-tree-dump-times "VDEF" 3 "alias"} } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040518-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040518-1.c
index 315a5ebf8d1..f80a74a14ea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040518-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040518-1.c
@@ -10,4 +10,3 @@ int f(int a, int b)
 
 /* Should have no ifs left after straightening.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040518-2.c b/gcc/testsuite/gcc.dg/tree-ssa/20040518-2.c
index 62f66232dc5..009dce45efa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040518-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040518-2.c
@@ -14,4 +14,3 @@ int t( int i)
 /* We should convert one COND_EXPRs into straightline code with ABS.  */
 /* { dg-final { scan-tree-dump-times "straightline" 1 "phiopt1"} } */
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c
index 5bb7a4d7fab..2473038403a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040615-1.c
@@ -14,4 +14,3 @@ foo (unsigned int a, unsigned int b)
 }
 
 /* { dg-final { scan-tree-dump-times "bar2" 0 "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c
index eb8e210951c..adccf9a790d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040624-1.c
@@ -18,4 +18,3 @@ foo (unsigned int a, unsigned int b)
    conditional.  */
 
 /* { dg-final { scan-tree-dump-times "if " 1 "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c
index ad96198a4e1..25e470a59b6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040703-1.c
@@ -10,4 +10,3 @@ float foo(float x)
 
 /* We should *not* fold the arithmetic.  */
 /* { dg-final { scan-tree-dump-times "0\\.0" 0 "dom2"} } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c
index 147584983d4..6e7ffbb8fac 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040729-1.c
@@ -17,4 +17,3 @@ foo ()
    operands.  But 'p' itself is not volatile and taking the address of
    a volatile does not constitute a volatile operand.  */
 /* { dg-final { scan-tree-dump-times "&x" 0 "dce2"} } */
-/* { dg-final { cleanup-tree-dump "dce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040911-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040911-1.c
index f17e98aed80..e1b49e449f6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040911-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040911-1.c
@@ -19,4 +19,3 @@ int foo (int i)
 }
 
 /* { dg-final { scan-tree-dump-not "VUSE <c" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20041002-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20041002-1.c
index 9a07877fb1a..7f38f80f8df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20041002-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20041002-1.c
@@ -21,4 +21,3 @@ bar (int i)
 }
 
 /* { dg-final { scan-tree-dump-times "if" 0 "ssa" } } */
-/* { dg-final { cleanup-tree-dump "ssa" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c
index 80068b86de7..e4a6f16f91b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20041122-1.c
@@ -35,4 +35,3 @@ find_unreachable_blocks (void)
    modify e or e->dest if we can assert strict-aliasing rules.
    The net result is that we only need one load of e->dest.  */
 /* { dg-final { scan-tree-dump-times "->dest" 1 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050128-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050128-1.c
index 7197ec8b2c7..3ef0ac9a367 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050128-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050128-1.c
@@ -11,4 +11,3 @@ foo (int align)
 /* We should have optimized away the mod operator before we gimpleized
    the code.  */
 /* { dg-final { scan-tree-dump-times "%" 0 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050215-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050215-1.c
index b9bb3a749e6..6ce588038aa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050215-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050215-1.c
@@ -11,4 +11,3 @@ int foo (void)
 /* Make sure the optimizers don't introduce overflow where one
    did not exist in the original.  */
 /* { dg-final { scan-tree-dump-times "-0+4" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
index 8f0778132c8..fe220cd7056 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050314-1.c
@@ -18,4 +18,3 @@ void xxx (void)
    cannot read nor write the memory.  */
 
 /* { dg-final { scan-tree-dump-times "Moving statement" 1 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20050412-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20050412-1.c
index 9c172d769a4..4efae82b6df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20050412-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20050412-1.c
@@ -13,4 +13,3 @@ void foo (int a) {
 /* Make sure we do not have an assignment a = 0 in the resulting
    optimized dump.  */
 /* { dg-final { scan-tree-dump-times "a.* = 0;" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20080530.c b/gcc/testsuite/gcc.dg/tree-ssa/20080530.c
index bf222fee155..8583574266e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/20080530.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20080530.c
@@ -19,4 +19,3 @@ baz (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Inlining foo into baz" 0 "einline"} } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-10.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-10.c
index 03956100a2c..d643aa8c357 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-10.c
@@ -16,5 +16,4 @@ int foo(int i)
 }
 
 /* { dg-final { scan-tree-dump "return 3;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-11.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-11.c
index 1f8a12d85e2..c4607ebfe69 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-11.c
@@ -18,4 +18,3 @@ int bar(void)
    the latter is an ssa temporary.  */
 /* { dg-final { scan-tree-dump "= a.0.;" "optimized" } } */
 /* { dg-final { scan-tree-dump "= \\*\[^\r\n\]*_.;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-12.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-12.c
index b1fb7997f3c..b542e493f5d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-12.c
@@ -14,5 +14,4 @@ int foo(int i)
 }
 
 /* { dg-final { scan-tree-dump "VDEF" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
index 48e72ffee2f..62ef7762200 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-17.c
@@ -15,4 +15,3 @@ int foo(int x)
 }
 
 /* { dg-final { scan-tree-dump-not "NOTE: no flow-sensitive alias info for" "ccp2" } } */
-/* { dg-final { cleanup-tree-dump "ccp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-18.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-18.c
index 69c2e23c915..57f322c8e79 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-18.c
@@ -86,5 +86,3 @@ int test8 (struct A *p, int *q)
 /* { dg-final { scan-tree-dump-not "return 6;" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "return 7;" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "return -1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c
index ce36d2c225d..330ec001705 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c
@@ -26,4 +26,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "q_. = { a b }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-2.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-2.c
index ecd0fdc9fde..e10a25d6c13 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-2.c
@@ -25,4 +25,3 @@ int foo()
 /* We should have removed the link_error on the tree level as GCC can tell that
    a is not touched by the calling bar at all. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-20.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-20.c
index 7991c52fd0a..278d199f272 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-20.c
@@ -21,4 +21,3 @@ int foo(struct S *s, struct R *r)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0;" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-21.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-21.c
index 4175588121e..cc290944596 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-21.c
@@ -11,5 +11,4 @@ int f(int *r)
 
 
 /* { dg-final { scan-tree-dump-times "return 0;" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-22.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-22.c
index 8c808fe430f..dc60392d15e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-22.c
@@ -11,5 +11,4 @@ int f(int *r)
 
 
 /* { dg-final { scan-tree-dump-times "return 0;" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-23.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-23.c
index 9d0dd32061f..a37ca1db4bd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-23.c
@@ -14,5 +14,4 @@ void f1 (const char *c)
 }
 
 /* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-24.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-24.c
index 0edd51f85cd..3f5d6c0c8dd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-24.c
@@ -18,5 +18,4 @@ void g (const char *c, int *i)
 
 /* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
 /* { dg-final { scan-tree-dump "keepit" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-25.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-25.c
index f5705d03cd9..8637be0f7cd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-25.c
@@ -8,5 +8,4 @@ void f (long *p) {
 }
 
 /* { dg-final { scan-tree-dump-not "= 42" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-26.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-26.c
index a1eb8f7d0a8..4c8f1c5fdcb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-26.c
@@ -9,5 +9,4 @@ void f (const char *c, int *i)
 }
 
 /* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-27.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-27.c
index 91c737eae25..f2b11fc4228 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-27.c
@@ -8,4 +8,3 @@ void f (long *p) {
 }
 
 /* { dg-final { scan-tree-dump-not "= 42" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-29.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-29.c
index b23bdea612e..605ce48c0ce 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-29.c
@@ -25,4 +25,3 @@ void foo (union X *x)
    baz makes sure that ystruct has its address taken.  */
 
 /* { dg-final { scan-tree-dump-not "ystruct" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-3.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-3.c
index 3d8587da89b..03892a30786 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-3.c
@@ -16,5 +16,4 @@ int foo(void)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-30.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-30.c
index 7ef830d1937..779a7f443da 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-30.c
@@ -19,4 +19,3 @@ int foo (float *p)
 /* We should be able to CSE the load from *p in the return stmt.  */
 
 /* { dg-final { scan-tree-dump "Replaced \\\*p" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-31.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-31.c
index 622df80a9c4..c4cdd1c9ab8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-31.c
@@ -21,4 +21,3 @@ int foo (float *p)
    other loads should be removed.  */
 
 /* { dg-final { scan-tree-dump-times "\\\*\[^ \]" 1 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-32.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-32.c
index 5d0dcc2937e..7ac8e81e3f2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-32.c
@@ -17,4 +17,3 @@ int bar (short *p)
 
 /* { dg-final { scan-tree-dump-times "\\\*\[^ \]" 1 "cddce1" } } */
 /* { dg-final { scan-tree-dump-not "aligned_alloc" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-33.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-33.c
index cbc0812a238..c694bfd4652 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-33.c
@@ -17,4 +17,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump "Replaced j with 0" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-4.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-4.c
index e0394327d91..a68eece61ac 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-4.c
@@ -17,5 +17,4 @@ int foo(void)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-5.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-5.c
index f1faae52c9c..ce7ce535921 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-5.c
@@ -19,5 +19,4 @@ int foo(void)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-6.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-6.c
index 9a41920e76f..bcff6ed6ea9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-6.c
@@ -18,4 +18,3 @@ int bar(void)
    the latter is an ssa temporary.  */
 /* { dg-final { scan-tree-dump "= a.0.;" "optimized" } } */
 /* { dg-final { scan-tree-dump "= \\*\[^\r\n\]*_.;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias_bug.c b/gcc/testsuite/gcc.dg/tree-ssa/alias_bug.c
index 64fef27874a..ade985e6eb4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/alias_bug.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/alias_bug.c
@@ -58,4 +58,3 @@ void keyboard_set_repeat(void)
 
 /* { dg-final { scan-tree-dump-times "ireg.*ax" 1 "optimized"} } */
  
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andor-1.c b/gcc/testsuite/gcc.dg/tree-ssa/andor-1.c
index 1a53857401c..3beecb0cf3d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andor-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andor-1.c
@@ -61,5 +61,4 @@ int test10(int j)
 /* { dg-final { scan-tree-dump-times "h \\| 1" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "i \& 2 \\| 1" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "j \& 2 \\| 1" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andor-2.c b/gcc/testsuite/gcc.dg/tree-ssa/andor-2.c
index cdc00b7a4e9..2c61e2cca90 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andor-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andor-2.c
@@ -49,4 +49,3 @@ int test8(int o, int p)
 /* { dg-final { scan-tree-dump-times "return k;" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return m;" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return o;" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andor-3.c b/gcc/testsuite/gcc.dg/tree-ssa/andor-3.c
index 8b2f206a142..929d9958dc8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andor-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andor-3.c
@@ -21,4 +21,3 @@ int f3(int y, int x)
 
 /* { dg-final { scan-tree-dump-times "~x" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "x_..D. \& y_..D." 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andor-4.c b/gcc/testsuite/gcc.dg/tree-ssa/andor-4.c
index 46a48262760..172c29e8b71 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andor-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andor-4.c
@@ -21,4 +21,3 @@ int f3(int y, int x)
 
 /* { dg-final { scan-tree-dump-times "~x" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "x_..D. \\\| y_..D." 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/andor-5.c b/gcc/testsuite/gcc.dg/tree-ssa/andor-5.c
index 929851ca4f0..8a2a457b252 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/andor-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/andor-5.c
@@ -47,4 +47,3 @@ int f7(int y, int x)
 /* { dg-final { scan-tree-dump-times "\\\|" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\&" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "return x_..D.;" 8 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asm-1.c b/gcc/testsuite/gcc.dg/tree-ssa/asm-1.c
index fe275701391..4dd019bcf92 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asm-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asm-1.c
@@ -14,4 +14,3 @@ void f()
 
 /* { dg-final { scan-tree-dump-times "42" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "63" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c b/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
index 96d8ba624e4..4dc4a9d6c6a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asm-2.c
@@ -18,4 +18,3 @@ void baz(void)
 }
 
 /* { dg-final { scan-tree-dump-times "asm\[^\\r\\n\]*xyzzy" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c b/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
index a32dbc0f8d7..9e493030d12 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asm-3.c
@@ -36,4 +36,3 @@ void test(void)
 /* In particular, hardreg should *not* appear in the call to bar.  */
 /* { dg-final { scan-tree-dump-times "bar \[(\]\[^\n\r\]*_.\[)\]" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/asmgoto-1.c b/gcc/testsuite/gcc.dg/tree-ssa/asmgoto-1.c
index 9dd549906b6..03675aadacd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/asmgoto-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/asmgoto-1.c
@@ -92,4 +92,3 @@ bad:
 }
 
 /* { dg-final { scan-tree-dump-times "XYZZY" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/assign-1.c b/gcc/testsuite/gcc.dg/tree-ssa/assign-1.c
index f95f03ff428..0daaada91fc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/assign-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/assign-1.c
@@ -9,4 +9,3 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-times "count =" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/assign-2.c b/gcc/testsuite/gcc.dg/tree-ssa/assign-2.c
index 47c38225b67..6db0a0c4efe 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/assign-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/assign-2.c
@@ -9,5 +9,4 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-times "count =" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/assign-3.c b/gcc/testsuite/gcc.dg/tree-ssa/assign-3.c
index e5426d781e5..f86f2b15d62 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/assign-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/assign-3.c
@@ -21,4 +21,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times " = count;" 3 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/attr-alias-2.c b/gcc/testsuite/gcc.dg/tree-ssa/attr-alias-2.c
index b7c4831ae02..39bdba63868 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/attr-alias-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/attr-alias-2.c
@@ -9,4 +9,3 @@ main()
    return b+a;
 }
 /* { dg-final { scan-tree-dump "return 8" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/attr-alias.c b/gcc/testsuite/gcc.dg/tree-ssa/attr-alias.c
index 3dee34c24f7..dedd50c9c41 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/attr-alias.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/attr-alias.c
@@ -25,4 +25,3 @@ main()
 /* { dg-final { scan-tree-dump-times "  test4 " 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "  test1 " "optimized" } } */
 /* { dg-final { scan-tree-dump-not "  test2 " "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/attr-hotcold-2.c b/gcc/testsuite/gcc.dg/tree-ssa/attr-hotcold-2.c
index d0225ec164e..10b8f0edb19 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/attr-hotcold-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/attr-hotcold-2.c
@@ -25,4 +25,3 @@ void f(int x, int y)
    the testcase around too much.  */
 /* { dg-final { scan-ipa-dump-times "block 5, loop depth 0, count 0, freq \[6-9\]\[0-9\]\[0-9\]\[0-9\]" 1 "profile_estimate" } } */
 
-/* { dg-final { cleanup-ipa-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bitwise-sink.c b/gcc/testsuite/gcc.dg/tree-ssa/bitwise-sink.c
index 1de04bc8431..1332718df17 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bitwise-sink.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bitwise-sink.c
@@ -8,4 +8,3 @@ foo (_Bool x)
 }
 
 /* { dg-final { scan-tree-dump-times "~x" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
index d6e121ae07b..401357f2f2f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
@@ -16,4 +16,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c
index 58d064539a7..df740322762 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-10.c
@@ -11,4 +11,3 @@ int f(_Bool x)
 /* { dg-final { scan-tree-dump-times "!= 1" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "~x" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c
index ee266c79cb9..363a51661b2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-11.c
@@ -11,4 +11,3 @@ int f(_Bool x)
 /* { dg-final { scan-tree-dump-times "== 0" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "~x" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
index 0f88b096505..add9cca1e21 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
@@ -19,4 +19,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c
index 8fa2a57c412..ff5271553e8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-3.c
@@ -15,4 +15,3 @@ int f(_Bool x)
    fold its tree forwprop is able to clean up the mess.  */
 /* { dg-final { scan-tree-dump-times "== 0" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
index b06182e2ac4..d8b1d0a1f5e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
@@ -14,4 +14,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
index e33ce9c73b5..ca03f4aa064 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
@@ -16,4 +16,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
index cc77591c937..3982e676710 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
@@ -19,4 +19,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c
index b798710644a..542fce72ea4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-7.c
@@ -14,4 +14,3 @@ int f(_Bool x)
 /* There should be no != 1. Fold changes x != 1 to ! x.  */
 /* { dg-final { scan-tree-dump-times "!= 1" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
index 52752527083..3a545d93cc5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
@@ -14,4 +14,3 @@ int f(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
index 2660b258041..7bd063d7299 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
@@ -14,4 +14,3 @@ _Bool f1(_Bool x)
    away the comparison.  */
 /* { dg-final { scan-assembler-times "subfe" 0 { target powerpc*-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-1.c
index 696ef269ced..67d56849aed 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-1.c
@@ -11,4 +11,3 @@ f (int i, float j, int i2, float j2)
 } 
 
 /* { dg-final { scan-tree-dump-times {builtin_expect[^\n]*, 0\);\n[^\n]*if} 2 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-2.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-2.c
index 9267084de3e..c9d01e05ff5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-2.c
@@ -13,4 +13,3 @@ f (int i, float j, int i2, float j2)
 } 
 
 /* { dg-final { scan-tree-dump-times {builtin_expect[^\n]*, 0\);\n[^\n]*if} 2 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-3.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-3.c
index 548d6745eb9..d2842b91bae 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-3.c
@@ -14,4 +14,3 @@ f (int i, float j, int i2, float j2)
 } 
 
 /* { dg-final { scan-tree-dump-times {builtin_expect[^\n]*, 0\);\n[^\n]*if} 2 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-4.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-4.c
index 103d531d13c..09005767a62 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-4.c
@@ -14,4 +14,3 @@ f (int i, float j, int i2, float j2)
 } 
 
 /* { dg-final { scan-tree-dump-times {builtin_expect[^\n]*, 0\);\n[^\n]*if} 2 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-5.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-5.c
index 4adc0cc403b..78bc665958b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-expect-5.c
@@ -16,4 +16,3 @@ f (int i, float j, int i2, float j2)
 /* { dg-final { scan-tree-dump-times { if } 2 "forwprop1"} } */
 /* { dg-final { scan-tree-dump {builtin_expect[^\n]*, 0\);\n[^\n]*if} "forwprop1"} } */
 /* { dg-final { scan-tree-dump {builtin_expect[^\n]*, 1\);\n[^\n]*if} "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop?" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c
index b69cb9055a6..9e4501490db 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-1.c
@@ -38,4 +38,3 @@ void test (void)
 /* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi8.*fprintf.*fp.*\"%d%d\".*vi9" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c
index 201186bc419..f3de73acd86 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-fprintf-chk-1.c
@@ -38,4 +38,3 @@ void test (void)
 /* { dg-final { scan-tree-dump "vi6.*fputc.*fp.*vi7" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi7.*fputc.*fp.*vi8" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi8.*__fprintf_chk.*fp.*1.*\"%d%d\".*vi9" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-free.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-free.c
index 67dd071406d..55b4111f917 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-free.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-free.c
@@ -17,4 +17,3 @@ void foo(unsigned n)
 /* We should remove the redundant call to free.  */
 
 /* { dg-final { scan-tree-dump-times "free" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c
index f6bde472d4b..bd119e0e55b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-1.c
@@ -39,4 +39,3 @@ void test (void)
 /* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c
index c7e931366c9..a0c0ef946f3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-printf-chk-1.c
@@ -39,4 +39,3 @@ void test (void)
 /* { dg-final { scan-tree-dump "vi7 ={v} 0\[^\(\)\]*vi8 ={v} 0" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi8.*putchar.*vi9" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi9.*puts.*\"hello\\\\n\".*via" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c
index 60cbe4fc7bf..29b4a4b4ebe 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-1.c
@@ -36,4 +36,3 @@ test (va_list ap1, va_list ap2, va_list ap3, va_list ap4, va_list ap5,
 /* { dg-final { scan-tree-dump "vi4.*vfprintf.*\"%s\".*vi5" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi5.*vfprintf.*\"%c\".*vi6" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi6.*vfprintf.*\"%s\\\\n\".*vi7" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c
index ead09cedafd..c91c70921b5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vfprintf-chk-1.c
@@ -36,4 +36,3 @@ test (va_list ap1, va_list ap2, va_list ap3, va_list ap4, va_list ap5,
 /* { dg-final { scan-tree-dump "vi4.*__vfprintf_chk.*fp.*1.*\"%s\".*vi5" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi5.*__vfprintf_chk.*fp.*1.*\"%c\".*vi6" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi6.*__vfprintf_chk.*fp.*1.*\"%s\\\\n\".*vi7" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c
index f87186dd8af..023384a3b81 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-1.c
@@ -34,4 +34,3 @@ test (va_list ap1, va_list ap2, va_list ap3, va_list ap4, va_list ap5,
 /* { dg-final { scan-tree-dump "vi4.*vprintf.*\"%s\".*vi5" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi5.*vprintf.*\"%c\".*vi6" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi6.*vprintf.*\"%s\\\\n\".*vi7" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c
index 3ffb51b8d6e..2b21f7b70e2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-vprintf-chk-1.c
@@ -34,4 +34,3 @@ test (va_list ap1, va_list ap2, va_list ap3, va_list ap4, va_list ap5,
 /* { dg-final { scan-tree-dump "vi4.*__vprintf_chk.*1.*\"%s\".*vi5" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi5.*__vprintf_chk.*1.*\"%c\".*vi6" "fab1"} } */
 /* { dg-final { scan-tree-dump "vi6.*__vprintf_chk.*1.*\"%s\\\\n\".*vi7" "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-1.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-1.c
index cfeee33f831..f6ff9a0da14 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/calloc-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-1.c
@@ -26,4 +26,3 @@ void* g(void)
 /* { dg-final { scan-tree-dump-times "calloc" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "malloc" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "memset" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-2.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-2.c
index 10f9d18d60f..3e5504e763e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/calloc-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-2.c
@@ -24,4 +24,3 @@ void* g(int m1, int m2)
 /* { dg-final { scan-tree-dump-times "malloc" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "calloc" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "memset" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c b/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c
index 3b3b3d625f1..88d91776753 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/calloc-3.c
@@ -11,4 +11,3 @@ void*f(){
 /* { dg-final { scan-tree-dump-not "malloc" "optimized" } } */
 /* { dg-final { scan-tree-dump-times "calloc" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "memset" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c b/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c
index e86a6484e37..4d22a42814a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cfgcleanup-1.c
@@ -16,4 +16,3 @@ cleanup (int a, int b)
 }
 /* Dce should get rid of the initializers and cfgcleanup should elliminate ifs  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dce1"} } */
-/* { dg-final { cleanup-tree-dump "dce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/coalesce-1.c b/gcc/testsuite/gcc.dg/tree-ssa/coalesce-1.c
index 2eedbce8a76..96187d85847 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/coalesce-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/coalesce-1.c
@@ -196,5 +196,4 @@ process_switch (gimple swtch)
    any partition copies inserted.  */
 
 /* { dg-final { scan-rtl-dump-not "partition copy" "expand"} } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/coalesce-2.c b/gcc/testsuite/gcc.dg/tree-ssa/coalesce-2.c
index 56c5ccccc7f..5be67c64df0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/coalesce-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/coalesce-2.c
@@ -13,4 +13,3 @@ void foo(int n)
    any partition copies inserted.  */
 
 /* { dg-final { scan-rtl-dump-not "partition copy" "expand"} } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/col-1.c b/gcc/testsuite/gcc.dg/tree-ssa/col-1.c
index 5838134ad21..9c3d09fcba8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/col-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/col-1.c
@@ -14,4 +14,3 @@ m(int x)
 /* { dg-final { scan-tree-dump-times "10:9.*c = 5" 1 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "10:14.*c . 16" 1 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "10:4.*a =" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-1.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-1.c
index 7c76467f4d7..7dff01ce425 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-1.c
@@ -10,4 +10,3 @@ C foo(C x, float y)
 }
 
 /* { dg-final { scan-tree-dump-times "__mul" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-2.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-2.c
index d2d42b93de2..ce72eb2172f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-2.c
@@ -10,4 +10,3 @@ C foo(C x, float y)
 }
 
 /* { dg-final { scan-tree-dump-times "__div" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-3.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-3.c
index 5f4b110c6f8..558b9785a5c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-3.c
@@ -23,5 +23,4 @@ float imag_part(COMPLEX_FLOAT a)
 
 /* { dg-final { scan-tree-dump-times "REALPART_EXPR" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "IMAGPART_EXPR" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-4.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-4.c
index fa2ad581603..87a26381117 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-4.c
@@ -11,4 +11,3 @@ int f(void)
 }
 
 /* { dg-final { scan-tree-dump-times "__complex__" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-5.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-5.c
index dec394a5f2d..e2cd4039c3b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-5.c
@@ -9,4 +9,3 @@ int f(void)
 }
 
 /* { dg-final { scan-tree-dump-times "__complex__" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/complex-6.c b/gcc/testsuite/gcc.dg/tree-ssa/complex-6.c
index 01d1fd1195d..caa89b55ce1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/complex-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/complex-6.c
@@ -22,4 +22,3 @@ quantum_foo(float _Complex a)
 
 /* { dg-final { scan-tree-dump-times "REALPART_EXPR" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "IMAGPART_EXPR" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/copy-headers.c b/gcc/testsuite/gcc.dg/tree-ssa/copy-headers.c
index 474633eab65..4241b40835e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/copy-headers.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/copy-headers.c
@@ -13,4 +13,3 @@ void bla (void)
 
 /* There should be a header duplicated.  */
 /* { dg-final { scan-tree-dump-times "Duplicating header" 1 "ch"} } */
-/* { dg-final { cleanup-tree-dump "ch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c b/gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c
index ec1d28fe329..87ed7bba517 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cswtch-2.c
@@ -18,4 +18,3 @@ int h1 (X x)
 }
 
 /* { dg-final { scan-tree-dump-times "CSWTCH" 0 "switchconv" } } */
-/* { dg-final { cleanup-tree-dump "switchconv" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c b/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
index 06710f21793..80f92f7799f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cswtch.c
@@ -78,4 +78,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump "Switch converted" "switchconv" } } */
-/* { dg-final { cleanup-tree-dump "switchconv" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-1.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-1.c
index e1281fd7d87..23cacab6f96 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-1.c
@@ -11,4 +11,3 @@ test(int c)
 /* Array bounds says the loop will not roll much.  */
 /* { dg-final { scan-tree-dump "loop with 3 iterations completely unrolled" "cunrolli"} } */
 /* { dg-final { scan-tree-dump "Last iteration exit edge was proved true." "cunrolli"} } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-10.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-10.c
index f2cd904efc6..f392fbeb6e6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-10.c
@@ -11,4 +11,3 @@ foo (int n)
      a[i]++;
 }
 /* { dg-final { scan-tree-dump-times "Forced statement unreachable" 2 "cunroll" } } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-11.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-11.c
index a26cb22d35d..d7d22c0282c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-11.c
@@ -15,4 +15,3 @@ extern void foo (s1 *x1, s1 *x2, int a, int b)
 }
 
 /* { dg-final { scan-tree-dump "Loop 1 iterates at most 3 times" "cunroll" } } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
index 09605b2c1bc..2e8be848175 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-2.c
@@ -15,4 +15,3 @@ test(int c)
 }
 /* We are not able to get rid of the final conditional because the loop has two exits.  */
 /* { dg-final { scan-tree-dump "loop with 2 iterations completely unrolled" "cunroll"} } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-3.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-3.c
index 72e9f1bddda..d95d4498b97 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-3.c
@@ -13,4 +13,3 @@ test(int c)
 /* If we start duplicating headers prior curoll, this loop will have 0 iterations.  */
 
 /* { dg-final { scan-tree-dump "loop with 2 iterations completely unrolled" "cunrolli"} } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-4.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-4.c
index ce2fc5af1eb..a923ceec1ba 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-4.c
@@ -20,4 +20,3 @@ test(int c)
    from the last iteration.  */
 /* { dg-final { scan-tree-dump "loop turned into non-loop; it never loops." "ivcanon"} } */
 /* { dg-final { scan-tree-dump "Last iteration exit edge was proved true." "ivcanon"} } */
-/* { dg-final { cleanup-tree-dump "ivcanon" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-5.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-5.c
index da890193219..b61b570491a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-5.c
@@ -12,4 +12,3 @@ test(int c)
 /* { dg-final { scan-tree-dump "loop with 6 iterations completely unrolled" "cunroll"} } */
 /* { dg-final { scan-tree-dump "Exit condition of peeled iterations was eliminated." "cunroll"} } */
 /* { dg-final { scan-tree-dump "Last iteration exit edge was proved true." "cunroll"} } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
index f6d5c605a1a..0e4407dcbd7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/cunroll-9.c
@@ -21,4 +21,3 @@ t (int n)
   return sum;
 }
 /* { dg-final { scan-tree-dump-times "Removed pointless exit:" 1 "cunrolli" } } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/dce-1.c b/gcc/testsuite/gcc.dg/tree-ssa/dce-1.c
index 12612e54680..42d9407e290 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/dce-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/dce-1.c
@@ -15,5 +15,4 @@ int foo (int b, int j)
    the exit condition after the loop.  */
 /* { dg-final { scan-tree-dump-not "999" "cddce1"} } */
 /* { dg-final { scan-tree-dump-not "1000" "cddce1"} } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/divide-1.c b/gcc/testsuite/gcc.dg/tree-ssa/divide-1.c
index 66bc3745bcc..b6beea20164 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/divide-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/divide-1.c
@@ -10,5 +10,4 @@ int f(int a)
 /* { dg-final { scan-tree-dump-times "-a" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "a_..D. / -10" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/divide-2.c b/gcc/testsuite/gcc.dg/tree-ssa/divide-2.c
index 6cd86b21f97..73f390fbddb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/divide-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/divide-2.c
@@ -10,5 +10,4 @@ int f(int a)
 /* { dg-final { scan-tree-dump-times "10 / -a" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "-10 / a" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/divide-3.c b/gcc/testsuite/gcc.dg/tree-ssa/divide-3.c
index 12fa09b9536..87604ff3fc3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/divide-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/divide-3.c
@@ -9,6 +9,5 @@ int f(int a)
 /* { dg-final { scan-tree-dump-times "a_\[0-9()D\]* / 10" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "a_..D. / -10" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/divide-4.c b/gcc/testsuite/gcc.dg/tree-ssa/divide-4.c
index 734acad69a7..5ff8d326d46 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/divide-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/divide-4.c
@@ -9,6 +9,5 @@ int f(int a)
 /* { dg-final { scan-tree-dump-times "-a" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "a_..D. / 10" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c b/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c
index e55084899f6..dfa395f4004 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/dump-1.c
@@ -6,4 +6,3 @@ int f(void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/fnsplit-1.c b/gcc/testsuite/gcc.dg/tree-ssa/fnsplit-1.c
index 0c81d92bfa9..ad5fc101cd8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/fnsplit-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/fnsplit-1.c
@@ -20,4 +20,3 @@ main(void)
 }
 /* { dg-final { scan-tree-dump-times "Splitting function at:" 1 "fnsplit"} } */
 
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldaddr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/foldaddr-1.c
index d74022e4b52..aa5605f6144 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldaddr-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldaddr-1.c
@@ -12,5 +12,4 @@ int foo(char *b)
    not identical and thus collapsed the function into a trivial
    "return 0".  */
 /* { dg-final { scan-tree-dump-times "return 0" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldcast-1.c b/gcc/testsuite/gcc.dg/tree-ssa/foldcast-1.c
index 9444f0be204..dae004a9db5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldcast-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldcast-1.c
@@ -13,4 +13,3 @@ char *bar (char *x)
 }
 
 /* { dg-final { scan-tree-dump-times "return x;" 2 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-1.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-1.c
index 10414a2a50c..cd785990f39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-1.c
@@ -23,4 +23,3 @@ foo (void)
 /* The switch should be switch converted and later constant propagated.  */
 /* { dg-final { scan-tree-dump-not "CSWTCH" "optimized"} } */
 /* { dg-final { scan-tree-dump-not "switch" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-2.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-2.c
index 9d4e0256e55..eb1e6dea3d9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-2.c
@@ -57,4 +57,3 @@ emit_support_tinfos (void)
 /* We should copy loop header to fundamentals[0] and then fold it way into
    known value.  */
 /* { dg-final { scan-tree-dump-not "fundamentals.0" "ch"} } */
-/* { dg-final { cleanup-tree-dump "ch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-3.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-3.c
index a6bb4312eea..ab80f02e140 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-3.c
@@ -75,4 +75,3 @@ int_fits_type_p (const_tree c, const_tree type)
 }
 /* The switch should be switch converted and later constant propagated.  */
 /* { dg-final { scan-tree-dump-not "tree_code_type" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
index 445d415cf54..0e9b676f66b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-4.c
@@ -11,4 +11,3 @@ test()
   return a.a+b[c];
 }
 /* { dg-final { scan-tree-dump "return 0;" "ccp2" } } */
-/* { dg-final { cleanup-tree-dump "ccp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-5.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-5.c
index 68b29a3c377..d429055565a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-5.c
@@ -11,5 +11,4 @@ test()
   return a[2]+b[1]+b[3]+c.b;
 }
 /* { dg-final { scan-tree-dump "return 11;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-6.c b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-6.c
index 92424b8106a..2a21b8cb9d0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldconst-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldconst-6.c
@@ -11,4 +11,3 @@ void f (vec *r)
 }
 
 /* { dg-final { scan-tree-dump-not "2, 666" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/foldstring-1.c b/gcc/testsuite/gcc.dg/tree-ssa/foldstring-1.c
index b49bb3f8ee9..25e136fb8b3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/foldstring-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/foldstring-1.c
@@ -10,4 +10,3 @@ arf ()
     blah ();
 }
 /* { dg-final { scan-tree-dump-times "= 0;" 1 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-1.c
index 955e7679134..c105635a0c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-1.c
@@ -15,4 +15,3 @@ void f(struct a * b, __SIZE_TYPE__ i)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\[\[^\n\r\]*\\\] = 1;" 0 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-10.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-10.c
index 5ca8060c8b3..3c481924341 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-10.c
@@ -19,4 +19,3 @@ void test2(void)
    the rhs of the store to b by 1.  */
 
 /* { dg-final { scan-tree-dump "Replaced\[^\\n\]*with 1" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-11.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-11.c
index 7252801e423..2fe721637aa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-11.c
@@ -17,4 +17,3 @@ int g(int *p, int n)
 }
 
 /* { dg-final { scan-tree-dump-times "= MEM\\\[\\\(int \\\*\\\)\[ap\]_\[0-9\]+(?:\\(D\\))? \\\+ 4B\\\];" 2 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-12.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-12.c
index 1c5ea02ba78..de16c6848f2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-12.c
@@ -19,4 +19,3 @@ int bar(struct X *p, int i)
    address arithmetic into the memory access as an array access.  */
 
 /* { dg-final { scan-tree-dump-times "->a\\\[D\\\." 2 "forwprop1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-13.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-13.c
index aab4ff6febe..05d6d98df47 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-13.c
@@ -13,4 +13,3 @@ foo (struct B *b)
 }
 
 /* { dg-final { scan-tree-dump-not "\\\(unsigned" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-14.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-14.c
index 7432e0d5405..353af135ddc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-14.c
@@ -15,4 +15,3 @@ foo (unsigned int eax)
 
 /* { dg-final { scan-tree-dump-times " & " 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\\| " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-15.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-15.c
index b7a3a31f020..637facd5268 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-15.c
@@ -11,4 +11,3 @@ foo (_Bool a, _Bool b, _Bool c)
 
 /* { dg-final { scan-tree-dump-times " == " 0 "forwprop1" } } */
 /* { dg-final { scan-tree-dump-times " != " 0 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-16.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-16.c
index b47edea0c18..1bef7e7a31f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-16.c
@@ -11,4 +11,3 @@ int foo (double xx, double xy)
 }
 
 /* { dg-final { scan-tree-dump "if \\\(x" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-17.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-17.c
index a85d0eb9c50..6f5d9e44561 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-17.c
@@ -9,4 +9,3 @@ int foo (int xx, int xy)
 }
 
 /* { dg-final { scan-tree-dump-times " & 1" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-18.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-18.c
index b0445fd20fb..e068c8ae1e6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-18.c
@@ -21,4 +21,3 @@ signed char g2(unsigned long long n)
 
 /* { dg-final { scan-tree-dump-times "\\\(float\\\)" 2 "cddce1" } } */
 /* { dg-final { scan-tree-dump-not "\\\(long double\\\)" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-19.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-19.c
index f309e3c7b4e..4d77138b206 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-19.c
@@ -12,4 +12,3 @@ void f (vec *x1, vec *x2)
 }
 
 /* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-2.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-2.c
index bcdd78d108e..6c43f95d1c1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-2.c
@@ -17,4 +17,3 @@ void f(__SIZE_TYPE__ i)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\[\[^\n\r\]*\\\] = 1;" 0 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop?" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-20.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-20.c
index b1daa91335e..f21f5b41137 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-20.c
@@ -67,4 +67,3 @@ void l (double d, vecf* r)
 }
 
 /* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-21.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-21.c
index e6133325f40..bd0136a7918 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-21.c
@@ -13,4 +13,3 @@ test (v4si *x, v4si *y)
 /* Optimization in forwprop1, cleanup in cddce1.  */
 
 /* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-23.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-23.c
index 52049933633..49b03af4eee 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-23.c
@@ -12,4 +12,3 @@ long f (long d, long e)
 
 
 /* { dg-final { scan-tree-dump-not "BIT_FIELD_REF" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-24.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-24.c
index 74207cf1a81..b519efad318 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-24.c
@@ -15,4 +15,3 @@ foo (unsigned char x, unsigned short y)
    as in (x ^ (char) y) & 1.  */
 
 /* { dg-final { scan-tree-dump-times " & " 1 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-25.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-25.c
index 16743b0541f..888a7ed09d2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-25.c
@@ -38,7 +38,6 @@ convert_move (rtx to, rtx from, int unsignedp)
 }
 
 /* { dg-final { scan-tree-dump "Replaced.*!=.*with.*!=.* " "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
 
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-26.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-26.c
index 676f7b57821..2f82a1b6ae2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-26.c
@@ -63,4 +63,3 @@ function_and_variable_visibility (unsigned char whole_program)
 }
 
 /* { dg-final { scan-tree-dump-not "& 255" "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-27.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-27.c
index 9e1b0763b44..9775a4c6367 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-27.c
@@ -36,5 +36,4 @@ void i (V *v1, V *v2){
 /* { dg-final { scan-tree-dump-not "\\\+" "forwprop1"} } */
 /* { dg-final { scan-tree-dump "{ 0, 4 }" "forwprop1"} } */
 /* { dg-final { scan-tree-dump "{ 37, -5 }" "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-28.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-28.c
index 1824131086a..a566f1ee6a4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-28.c
@@ -85,5 +85,4 @@ test_8 (int code)
    we do that we even generate better code on x86 at least.  */
 
 /* { dg-final { scan-tree-dump-times "simplified to if \\\(\[^ ]* <" 4 "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-3.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-3.c
index dbb6e420ef6..4aa68c64950 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-3.c
@@ -15,4 +15,3 @@ int foo(struct bar *x)
 }
 
 /* { dg-final { scan-tree-dump "Replaced .p_. < q_.. with .1." "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-30.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-30.c
index 96554f2c70a..2c707ee040d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-30.c
@@ -12,4 +12,3 @@ int *foo (int *q, int i, int j)
    need q + i as well.  */
 
 /* { dg-final { scan-tree-dump-times "\\+" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-31.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-31.c
index ddb376f5598..e146ade61af 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-31.c
@@ -13,4 +13,3 @@ int foo (int x)
 /* { dg-final { scan-tree-dump-times "= 0;" 2 "forwprop1" } } */
 /* { dg-final { scan-tree-dump-times "-" 0 "forwprop1" } } */
 /* { dg-final { scan-tree-dump-times "\\+" 1 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-32.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-32.c
index 93851a1e152..c1cef3ac9fc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-32.c
@@ -14,5 +14,3 @@ int bar (int x)
 
 /* { dg-final { scan-tree-dump "x_.\\(D\\) / 15" "forwprop1" } } */
 /* { dg-final { scan-tree-dump "return 0;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-4.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-4.c
index 7eabd1a7bd8..c313a94dde3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-4.c
@@ -15,4 +15,3 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-5.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-5.c
index 033c60dae0a..9c35f3eb4a0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-5.c
@@ -17,4 +17,3 @@ vector float foo( vector float v )
 }
 
 /* { dg-final { scan-tree-dump-times "disappear" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-6.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-6.c
index 79f0a8d2683..3f502430333 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-6.c
@@ -25,4 +25,3 @@ void f(void)
    value-numbering, removing the load altogether.
    ???  We now do this after CPP re-writes a into SSA form.  */
 /* { dg-final { scan-tree-dump-times "VIEW_CONVERT_EXPR" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-7.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-7.c
index 0d2bac52176..46c085dc401 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-7.c
@@ -13,4 +13,3 @@ int foo(void)
 
 /* { dg-final { scan-tree-dump-times "VIEW_CONVERT_EXPR" 0 "forwprop1"} } */
 /* { dg-final { scan-tree-dump-times "={v}" 2 "forwprop1"} } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-8.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-8.c
index 1c780c834c5..f618ff82bcf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-8.c
@@ -12,4 +12,3 @@ int foo(struct X *q)
 
 /* We should have propragated &q->a into (*pointer).  */
 /* { dg-final { scan-tree-dump "q_.\\\(D\\\)\\\]\\\[0\\\];" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-9.c b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-9.c
index d02a62d3d34..26ae9c8c4f4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/forwprop-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/forwprop-9.c
@@ -17,5 +17,3 @@ void f(void)
 
 /* { dg-final { scan-tree-dump-times " = 1" 2 "optimized"} } */
 /* { dg-final { scan-tree-dump-not " = a;" "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/fre-vce-1.c b/gcc/testsuite/gcc.dg/tree-ssa/fre-vce-1.c
index c6c142b4eaf..4610c8677ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/fre-vce-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/fre-vce-1.c
@@ -34,4 +34,3 @@ void a2 (struct s1 sv, int i)
 
 /* { dg-final { scan-tree-dump-times "sv_\[0-9\]\\\(D\\\)->i" 2 "fre1" } } */
 /* { dg-final { scan-tree-dump-times "sv.i" 2 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11.c
index e5019c01259..bb5f248a622 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11.c
@@ -31,4 +31,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11a.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11a.c
index 8344fdf59f3..e2fb3623614 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11a.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11a.c
@@ -39,4 +39,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11b.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11b.c
index 41d0e0c8005..d0028bd70db 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11b.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11b.c
@@ -32,4 +32,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11c.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11c.c
index cf0aef792f4..236d3a5f11f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11c.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-11c.c
@@ -40,4 +40,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-2.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-2.c
index 0888ecf59a3..a2691294b07 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-2.c
@@ -38,4 +38,3 @@ int main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-25.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-25.c
index 85bbc0b76f3..5e3ef8dd777 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-25.c
@@ -56,4 +56,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-26.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-26.c
index dadeb073d3a..8e5f1410612 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-26.c
@@ -32,4 +32,3 @@ int main ()
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-28.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-28.c
index f314b28d3d4..ce97e0970b5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-28.c
@@ -40,4 +40,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-32.c b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-32.c
index 1b7101125ee..8fce4385d0b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/gen-vect-32.c
@@ -31,4 +31,3 @@ int main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { ! avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-1.c
index e7b13b54096..7a8e7a5a796 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-1.c
@@ -33,4 +33,3 @@ int main1 ()
 
 
 /* { dg-final { scan-tree-dump-times "Applying if-conversion" 1 "ifcvt" } } */
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-2.c
index f37a4d3361a..b084e7b10a8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ifc-20040816-2.c
@@ -37,4 +37,3 @@ void foo(const int * __restrict__ zr_in,
 
 
 /* { dg-final { scan-tree-dump-times "Applying if-conversion" 1 "ifcvt" } } */
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ifc-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ifc-4.c
index 4f7c3ab6c82..058fd84b8f0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ifc-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ifc-4.c
@@ -51,4 +51,3 @@ create_iso_definition (cpp_reader *pfile, cpp_macro *macro)
 
 /* This cannot be if-converted because the stores are to aggregate types.  */
 /* { dg-final { scan-tree-dump-times "Applying if-conversion" 0 "ifcvt" } } */
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ifc-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ifc-5.c
index a9cc8168ebf..875d2d3541f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ifc-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ifc-5.c
@@ -21,4 +21,3 @@ dct_unquantize_h263_inter_c (short *block, int n, int qscale, int nCoeffs)
 }
 
 /* { dg-final { scan-tree-dump-times "Applying if-conversion" 1 "ifcvt" } } */
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ifc-cd.c b/gcc/testsuite/gcc.dg/tree-ssa/ifc-cd.c
index 8d45bba43fc..f800f72cf69 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ifc-cd.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ifc-cd.c
@@ -26,4 +26,3 @@ void foo (int *x1, int *x2, int *x3, int *x4, int *y)
 }
 
 /* { dg-final { scan-tree-dump-times "Use predicate of bb" 8 "ifcvt" } } */
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-1.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-1.c
index 030181404d1..c9398edfb54 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-1.c
@@ -21,5 +21,4 @@ interval foo (interval a, interval b, interval c)
 
 
 /* { dg-final { scan-tree-dump-times "\\(struct interval\\)" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-10.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-10.c
index fe6c77f0850..118e19e85b6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-10.c
@@ -36,4 +36,3 @@ main()
 /* { dg-final { scan-tree-dump-times "do_something3" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "do_something \\(5\\)" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "do_something \\(70\\)" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-11.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-11.c
index 7d45ec135eb..6f0ff681fe4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-11.c
@@ -11,4 +11,3 @@ void foo()
   bar();
 }
 /* { dg-final { scan-tree-dump-times "function body can be overwritten at link time" 1 "einline" } } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-3.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-3.c
index 35c3ebbdaf7..29989899315 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-3.c
@@ -29,4 +29,3 @@ inline_me_too (void)
 }
 /* { dg-final { scan-tree-dump-times "Inlining inline_me " 1 "einline"} } */
 /* { dg-final { scan-tree-dump-times "Inlining inline_me_too " 1 "einline"} } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-4.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-4.c
index 1e700ef0227..c9f79782744 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-4.c
@@ -24,4 +24,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "Inlining get_data_for into main" "einline" } } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-5.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-5.c
index dfaf7dc2e25..117a0784726 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-5.c
@@ -36,4 +36,3 @@ test(struct a *a)
   do_something (a);
 }
 /* { dg-final { scan-tree-dump-times "do_inc" 12 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-6.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-6.c
index aa9656d4bd9..f6a5f597ea8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-6.c
@@ -40,4 +40,3 @@ test(struct a *a)
   do_something (a);
 }
 /* { dg-final { scan-tree-dump-times "do_inc" 12 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-7.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-7.c
index 7d7f49c9b68..c796f54f97e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-7.c
@@ -6,4 +6,3 @@ inline void bar0() { foo0(); }
 void foobar() { bar0(); bar0(); bar0(); }
 
 /* { dg-final { scan-tree-dump "Iterations: 1" "einline" } } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-8.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-8.c
index 3215473ec1a..6da886e8863 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-8.c
@@ -28,4 +28,3 @@ int bar5() { return 0; }
 int foobar5() { return bar5(); }
 
 /* { dg-final { scan-tree-dump-times "Inlining" 5 "einline" } } */
-/* { dg-final { cleanup-tree-dump "einline" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline-9.c b/gcc/testsuite/gcc.dg/tree-ssa/inline-9.c
index 45f0fecdb49..6beec16eaf8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline-9.c
@@ -22,4 +22,3 @@ main()
 }
 /* { dg-final { scan-tree-dump-times "q \\(15\\)" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "t \\(20\\)" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-1.c b/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-1.c
index 0c84ed3fa83..fae18a675b4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-1.c
@@ -13,8 +13,6 @@ char f(char *a)
 
 /* test_function should be called twice as the inline-asm changes memory. */
 /* { dg-final { scan-tree-dump-times "test_function" 2 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 /* There should a VDEF for the inline-asm.  */
 /* { dg-final { scan-tree-dump-times "VDEF" 1 "alias"} } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-2.c b/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-2.c
index 6b347c41ebf..d318ecd7e71 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/inline_asm-2.c
@@ -15,4 +15,3 @@ void f(char *a)
 
 /* There should a VDEF for the inline-asm and one for the link_error.  */
 /* { dg-final { scan-tree-dump-times "VDEF" 2 "alias"} } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/integer-addr.c b/gcc/testsuite/gcc.dg/tree-ssa/integer-addr.c
index b102a7a52e7..a8a9de4ef55 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/integer-addr.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/integer-addr.c
@@ -26,4 +26,3 @@ int foobar(void)
 }
 
 /* { dg-final { scan-tree-dump-times "= func" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/interposition.c b/gcc/testsuite/gcc.dg/tree-ssa/interposition.c
index 3ce3365c2d0..574475c0d93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/interposition.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/interposition.c
@@ -10,4 +10,3 @@ int q(void)
   return t();
 }
 /* { dg-final { scan-tree-dump-times "return 1" 2 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-cp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-cp-1.c
index 9fbacdeb81e..d9175dc0b25 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-cp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-cp-1.c
@@ -18,4 +18,3 @@ blah ()
 }
 /* One appearance for dump, one self recursive call and one call from main.  */
 /* { dg-final { scan-tree-dump-times "very_long_function.constprop \\(\\)" 3 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-reference-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-reference-1.c
index c15a8b60991..58f5db96586 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-reference-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-reference-1.c
@@ -12,4 +12,3 @@ int f(void)
    inlined the 0 as IPA reference should have marked the variable as a const
    as it is not set in the IR.  */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c
index e1efa4e4f17..ed7b4800615 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-1.c
@@ -30,4 +30,3 @@ test()
   test2(20);
 }
 /* { dg-final { scan-tree-dump-times "Splitting function" 1 "fnsplit"} } */
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c
index b2d50a4c373..c9bc2900947 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-2.c
@@ -41,4 +41,3 @@ main()
   split_me (5);
 }
 /* { dg-final { scan-tree-dump-times "Splitting function" 1 "fnsplit"} } */
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-4.c
index 9d5864bad3c..437ddec966f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-4.c
@@ -26,4 +26,3 @@ test(void)
   return split_me (0)+split_me(1)+split_me(2);
 }
 /* { dg-final { scan-tree-dump-times "Splitting function" 1 "fnsplit"} } */
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-5.c
index aacf369291a..1278e6e275a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-5.c
@@ -33,6 +33,4 @@ test()
   split_me (val);
 }
 /* { dg-final { scan-tree-dump-times "Splitting function" 1 "fnsplit"} } */
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
 /* { dg-final { scan-tree-dump "part" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-6.c
index fcdf79d7027..40997c3ccb7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ipa-split-6.c
@@ -5,6 +5,4 @@
 #include "ipa-split-5.c"
 
 /* { dg-final { scan-tree-dump-times "Splitting function" 1 "fnsplit"} } */
-/* { dg-final { cleanup-tree-dump "fnsplit" } } */
 /* { dg-final { scan-tree-dump "part" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-1.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-1.c
index be67e4ed127..51ee328a088 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-1.c
@@ -53,7 +53,6 @@ d_type (struct d_info *di)
 /* { dg-final { scan-tree-dump-times "->type = 42" 1 "isolate-paths"} } */
 /* { dg-final { scan-tree-dump-times "->type ={v} 0" 1 "isolate-paths"} } */
 /* { dg-final { scan-tree-dump-times "->zzz" 1 "isolate-paths"} } */
-/* { dg-final { cleanup-tree-dump "isolate-paths" } } */
 
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
index a7e7514c5fc..b8838e1833c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-2.c
@@ -38,7 +38,5 @@ bar (void)
    return statement so that it returns &z directly.
 /* { dg-final { scan-tree-dump-times "__builtin_trap" 2 "isolate-paths"} } */
 /* { dg-final { scan-tree-dump-times "return &z;" 1 "phicprop1"} } */
-/* { dg-final { cleanup-tree-dump "isolate-paths" } } */
-/* { dg-final { cleanup-tree-dump "phicprop1" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c
index 0fe7e62111d..ae30a10636e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-3.c
@@ -63,6 +63,5 @@ init_alias_analysis (void)
    started with a PHI, but by the time the path isolation code runs
    its explicit in the IL.  */
 /* { dg-final { scan-tree-dump-times "__builtin_trap" 1 "isolate-paths"} } */
-/* { dg-final { cleanup-tree-dump "isolate-paths" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
index 0da4134fd06..b76adf0a113 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-4.c
@@ -27,7 +27,5 @@ bar (void)
    return statement so that it returns &z directly.
 /* { dg-final { scan-tree-dump-times "__builtin_trap" 2 "isolate-paths"} } */
 /* { dg-final { scan-tree-dump-times "foo .&z.;" 1 "phicprop1"} } */
-/* { dg-final { cleanup-tree-dump "isolate-paths" } } */
-/* { dg-final { cleanup-tree-dump "phicprop1" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/isolate-5.c b/gcc/testsuite/gcc.dg/tree-ssa/isolate-5.c
index 2978413cc37..7ae00d920d7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/isolate-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/isolate-5.c
@@ -52,5 +52,3 @@ d_type (struct d_info *di)
 /* { dg-final { scan-tree-dump-times "->type" 1 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "\\.type" 1 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "->zzz" 1 "isolate-paths"} } */
-/* { dg-final { cleanup-tree-dump "isolate-paths" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_1.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_1.c
index 74b73da6875..8ecf78cc100 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_1.c
@@ -15,4 +15,3 @@ void foo (int i_width, TYPE dst, TYPE src1, TYPE src2)
 
 
 /* { dg-final { scan-tree-dump-times "ivtmp.\[0-9_\]* = PHI <" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_2.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_2.c
index f27b9007295..3ff2458fbf9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_2.c
@@ -14,4 +14,3 @@ void foo (int i_width, TYPE dst, TYPE src1, TYPE src2)
 }
 
 /* { dg-final { scan-tree-dump-times "ivtmp.\[0-9_\]* = PHI <" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_3.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_3.c
index b548e8f0fb6..2745b25b356 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_3.c
@@ -17,4 +17,3 @@ void foo (int i_width, char* dst, char* src1, char* src2)
 }
 
 /* { dg-final { scan-tree-dump-times "ivtmp.\[0-9_\]* = PHI <" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_4.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_4.c
index 330b3bf53ed..034ea8a75cf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_4.c
@@ -16,4 +16,3 @@ void foo (int i_width, TYPE dst, TYPE src1, TYPE src2)
 }
 
 /* { dg-final { scan-tree-dump-times "ivtmp.\[0-9_\]* = PHI <" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_1.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_1.c
index 076f5118e99..a57a3bf9a87 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_1.c
@@ -22,4 +22,3 @@ void foo (int i_width, TYPE dst, TYPE src1, TYPE src2)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_2.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_2.c
index c0f6398d827..8f119c69820 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_infer_2.c
@@ -23,4 +23,3 @@ void foo (unsigned int i_width, TYPE dst)
 }
 
 /* { dg-final { scan-tree-dump-times "\[^:\]*if \\(.*j_\[0-9\]+.*\\)" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_1.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_1.c
index 4e19dfd01e5..68d339fd9ea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_1.c
@@ -21,4 +21,3 @@ long foo(long* p, long* p2, int N1, int N2)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_2.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_2.c
index 5e38df67be4..b3fa4339621 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_2.c
@@ -22,4 +22,3 @@ long foo(long* p, long* p2, int N1, int N2)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing" 2 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_3.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_3.c
index 25ae845f71e..47473a9e104 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_3.c
@@ -19,4 +19,3 @@ long foo(long* p, long* p2, int N1, int N2)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing exit test: if \\(.*p2.*\\)" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_4.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_4.c
index d2aa78d61e3..8abccf8bb28 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopt_mult_4.c
@@ -22,4 +22,3 @@ long foo(long* p, long* p2, int N1, int N2)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing" 0 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-2.c
index dbeaff29e0f..b02a5f5b645 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-2.c
@@ -23,4 +23,3 @@ f ()
 
 /* We should only have two IVs.  */
 /* { dg-final { scan-tree-dump-not "\\n  candidates \\d+, \\d+,\[^\\n\]*\\n\[^\\n\]*\\nFinal cost" "ivopts" } }  */
-/* { dg-final { cleanup-tree-dump "ivopts" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-3.c
index 94e3c52ed7e..214e6a710a6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-3.c
@@ -11,4 +11,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "!= 0" 5 "ivopts" } }  */
-/* { dg-final { cleanup-tree-dump "ivopts" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lower_base.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lower_base.c
index 3b2b81f46a4..1dca97d0ec6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lower_base.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lower_base.c
@@ -58,4 +58,3 @@ sort_pointers (size_t n, void **pointers, void **work)
 }
 
 /* { dg-final { scan-tree-dump-not "base \[^\\n\]*&MEM\\\[" "ivopts" } }  */
-/* { dg-final { cleanup-tree-dump "ivopts" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt-2.c
index 177e0689248..0f3f301d773 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt-2.c
@@ -17,4 +17,3 @@ f1 (int *p, unsigned int i)
 /* { dg-final { scan-tree-dump-times "PHI" 1 "ivopts" } } */
 /* { dg-final { scan-tree-dump-times "PHI <p_" 1 "ivopts"} } */
 /* { dg-final { scan-tree-dump-times "p_\[0-9\]* <" 1 "ivopts" } } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt.c b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt.c
index 5188fed2c21..171c85ab38d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ivopts-lt.c
@@ -20,4 +20,3 @@ f1 (char *p, uintptr_t i, uintptr_t n)
 /* { dg-final { scan-tree-dump-times "PHI" 1 "ivopts" } } */
 /* { dg-final { scan-tree-dump-times "PHI <p_" 1 "ivopts"} } */
 /* { dg-final { scan-tree-dump-times "p_\[0-9\]* <" 1 "ivopts" } } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-1.c
index 43c10466525..638499e2f34 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-1.c
@@ -35,4 +35,3 @@ void foo (int * __restrict__ ia,
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-10.c
index 0790c18a9da..e35e8bbd79d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-10.c
@@ -21,4 +21,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-11.c
index 902c25b1553..754c7fd2954 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-11.c
@@ -30,4 +30,3 @@ void foo (int * __restrict__ ia,
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 1 loops and 1 library calls" 1 "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memset zero" 1 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-12.c
index 1e555fe26ad..53551cabd1e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-12.c
@@ -19,4 +19,3 @@ int foo (int * __restrict__ ia,
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 1 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-13.c
index 9841569543e..ba39d4dfce7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-13.c
@@ -19,4 +19,3 @@ float foo (int n)
 /* We should apply loop distribution.  */
 
 /* { dg-final { scan-tree-dump "Loop 1 distributed: split to 2 loops" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-14.c
index 700599f1ccb..48c1040f4b3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-14.c
@@ -24,4 +24,3 @@ float foo (int n)
 /* We should apply loop distribution.  */
 
 /* { dg-final { scan-tree-dump "Loop 1 distributed: split to 2 loops" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-15.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-15.c
index 7ce3b956b96..6807bf93f58 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-15.c
@@ -20,4 +20,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump-not "distributed: split to" "ldist" } } */
 /* { dg-final { scan-tree-dump-not "__builtin_memset" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-16.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-16.c
index 53a9fa4f9e3..f43b64ead62 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-16.c
@@ -18,4 +18,3 @@ void foo (int n)
 
 /* { dg-final { scan-tree-dump "Loop 1 is the same" "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memset zero" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-17.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-17.c
index bbf54db2be9..4efc0a4a696 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-17.c
@@ -47,4 +47,3 @@ mad_synth_mute (struct mad_synth *synth)
 
 /* { dg-final { scan-tree-dump "distributed: split to 0 loops and 4 library calls" "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memset zero" 4 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-18.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-18.c
index 893ab8b703b..dcc0aba2cf6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-18.c
@@ -9,4 +9,3 @@ void foo (int *p, int n)
 }
 
 /* { dg-final { scan-tree-dump "generated memset zero" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-19.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-19.c
index 9ab681f3d69..6208c2f72c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-19.c
@@ -68,4 +68,3 @@ int main()
 
 /* { dg-final { scan-tree-dump-times "generated memset zero" 1 "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memset" 5 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-1a.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-1a.c
index 623aacfdbf5..cb56df9334c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-1a.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-1a.c
@@ -19,4 +19,3 @@ int foo (int * __restrict__ ia,
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-2.c
index de98ccc4c30..0dcf3ab0758 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-2.c
@@ -28,4 +28,3 @@ void foo (int * __restrict__ a,
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-20.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-20.c
index 95ae2c04c13..aa0a8309ca9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-20.c
@@ -34,4 +34,3 @@ void my_memmove (unsigned int n)
 
 /* { dg-final { scan-tree-dump-times "generated memcpy" 2 "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memmove" 1 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-21.c
index 5401dcf0414..35f01aba2a6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-21.c
@@ -9,4 +9,3 @@ void bar(char *p, int n)
 }
 
 /* { dg-final { scan-tree-dump "generated memmove" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-22.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-22.c
index afc792f6503..1f0f08c7616 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-22.c
@@ -29,4 +29,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "generated memset zero" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c
index 0e7609bdb57..d58914eee16 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-23.c
@@ -31,4 +31,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "split to 1 loops and 1 library call" "ldist" } } */
 /* { dg-final { scan-tree-dump "generated memcpy" "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-3.c
index 40adfe1a981..5f595a7c147 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-3.c
@@ -31,4 +31,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 3 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-4.c
index 80626bdacac..c36daf0714b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-4.c
@@ -24,4 +24,3 @@ int loop1 (int k)
    similar memory accesses.  */
 /* { dg-final { scan-tree-dump "similar memory accesses" "ldist" } } */
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-5.c
index 9a03dc17173..97f51a338d4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-5.c
@@ -30,4 +30,3 @@ int loop1 (int k)
    problem: the dependence test fails with a "don't know" relation.  */
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 1 "ldist" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-6.c
index 7a38c86832b..8eb1c628837 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-6.c
@@ -35,4 +35,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-7.c
index 124fcdedd03..f31d051984a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-7.c
@@ -29,4 +29,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-8.c
index 4a8e0660061..699e066b62e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-8.c
@@ -31,4 +31,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-9.c
index ee8d023dee3..a61f32957d9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-9.c
@@ -23,4 +23,3 @@ int loop1 (int k)
 }
 
 /* { dg-final { scan-tree-dump-times "distributed: split to 2 loops" 0 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c
index f25a9106430..ee2f2832ab4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c
@@ -20,4 +20,3 @@ foo (int i, int n)
 
 /* { dg-final { scan-tree-dump "distributed: split to 0 loops and 2 library calls" "ldist" } } */
 /* { dg-final { scan-tree-dump-times "generated memset zero" 2 "ldist" } } */
-/* { dg-final { cleanup-tree-dump "ldist" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/leaf.c b/gcc/testsuite/gcc.dg/tree-ssa/leaf.c
index 936523a930d..b885fd0d415 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/leaf.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/leaf.c
@@ -17,4 +17,3 @@ test (void)
 }
 /* { dg-final { scan-tree-dump-times "return 9" 1 "optimized"} } */
  
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre1.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre1.c
index ce78f02c66b..1890a5195ee 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre1.c
@@ -15,4 +15,3 @@ int foo(int *a, int argc)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre10.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre10.c
index 4147a702ae4..543e1a69294 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre10.c
@@ -45,5 +45,4 @@ L23:
   return expr; 
 } 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre11.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre11.c
index eb6089c4b90..195eafe4895 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre11.c
@@ -10,5 +10,4 @@ int f(int tt)
     return g(*t1);
 } 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre12.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre12.c
index 94a3d00bd2e..3d063a98da1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre12.c
@@ -12,4 +12,3 @@ int f(int tt)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre13.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre13.c
index 420ad7162bc..40852cd1f59 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre13.c
@@ -10,4 +10,3 @@ int f(int tt)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre14.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre14.c
index 11bfd00605d..989d9332662 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre14.c
@@ -16,4 +16,3 @@ int foo(type *a, int argc)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre15.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre15.c
index b04c7621b65..94f77cfda26 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre15.c
@@ -16,4 +16,3 @@ int foo(type *a, int argc, int t)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre16.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre16.c
index 193ae52d540..878e8d11c78 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre16.c
@@ -13,4 +13,3 @@ int foo(type *a, int argc)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre17.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre17.c
index ec0f6ec2fa7..aafb3cdd3a1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre17.c
@@ -13,4 +13,3 @@ int foo(type *a, int argc)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre18.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre18.c
index 21a1d067008..54f651facab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre18.c
@@ -13,4 +13,3 @@ int main(type *a, int argc)
   return d + e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre19.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre19.c
index 0ad8988f702..74bc99ec344 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre19.c
@@ -13,4 +13,3 @@ int foo(type *a, int argc)
   return e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"  } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre2.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre2.c
index 8d6557a9e88..7e699c92068 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre2.c
@@ -15,4 +15,3 @@ int main(int *a, int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre20.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre20.c
index 92a235325ac..458f1e1a2df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre20.c
@@ -13,4 +13,3 @@ int foo(type *a, int argc)
   return e;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"  } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre21.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre21.c
index 77caef6ded6..3ee16c30fee 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre21.c
@@ -16,4 +16,3 @@ int main(type *a, int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre22.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre22.c
index 3c03c9b12f6..acd389bb239 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre22.c
@@ -16,4 +16,3 @@ int main(type *a, int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre23.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre23.c
index 2273accbaa7..1a62bc4bf85 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre23.c
@@ -22,4 +22,3 @@ int foo(int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"  } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre24.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre24.c
index 31fcc9f8b74..5bf7b509572 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre24.c
@@ -21,4 +21,3 @@ int foo(int argc)
 /* We will move the load of a out of the loop.  */
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre25.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre25.c
index aaf09313e79..9cdb003fa8d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre25.c
@@ -17,4 +17,3 @@ int foo(struct X *a, int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"  } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre3.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre3.c
index 4bda8f6445d..c2fc3a1028c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre3.c
@@ -21,4 +21,3 @@ int foo(int **a,int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre4.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre4.c
index 1e2660317ba..48630c8abbf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre4.c
@@ -16,4 +16,3 @@ int main(int *a, int argc)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"  } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre5.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre5.c
index 475050a6f85..22c8a18e6c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre5.c
@@ -21,4 +21,3 @@ int foo(int argc)
   return q + a();
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre6.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre6.c
index bcd72c5ef22..22248910086 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre6.c
@@ -76,5 +76,3 @@ main (void)
 /* { dg-final { scan-tree-dump-not "= unexpanded_var_list;" "fre1" } } */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
 /* { dg-final { scan-tree-dump-times "Insertions: 2" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre7.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre7.c
index 7e67c9d2c77..52903dde497 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre7.c
@@ -17,4 +17,3 @@ enormlz (x)
     }
 }
 /* { dg-final { scan-tree-dump-not "Eliminated:" "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loadpre8.c b/gcc/testsuite/gcc.dg/tree-ssa/loadpre8.c
index 0dfc2b04e4a..db5937fc031 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loadpre8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loadpre8.c
@@ -94,4 +94,3 @@ rewrite_add_phi_arguments (basic_block bb)
     }
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/local-pure-const.c b/gcc/testsuite/gcc.dg/tree-ssa/local-pure-const.c
index 356ad7b2c78..3c358e01393 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/local-pure-const.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/local-pure-const.c
@@ -14,4 +14,3 @@ t(int a, int b, int c)
 }
 /* { dg-final { scan-tree-dump-times "local memory is OK" 1 "local-pure-const1"} } */
 /* { dg-final { scan-tree-dump-times "found to be const" 1 "local-pure-const1"} } */
-/* { dg-final { cleanup-tree-dump "local-pure-const1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
index f63c8a7ab6a..9d18dd7efdc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
@@ -34,11 +34,8 @@ int xxx(void)
 /* We should be able to find out that the loop iterates four times and unroll it completely.  */
 
 /* { dg-final { scan-tree-dump-times "Added canonical iv to loop 1, 4 iterations" 1 "ivcanon"} } */
-/* { dg-final { cleanup-tree-dump "ivcanon" } } */
 /* { dg-final { scan-tree-dump-times "loop with 5 iterations completely unrolled" 1 "cunroll"} } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
 /* { dg-final { scan-tree-dump-times "foo" 5 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 /* Because hppa, ia64 and Windows targets include an external declaration
    for foo as well as the calls we need to look for something more specific
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-10.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-10.c
index c8d118e3771..a29c9fb2501 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-10.c
@@ -30,4 +30,3 @@ void foo (void)
 /* { dg-final { scan-tree-dump-times "if " 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "bar " 2 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-11.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-11.c
index d6c656f31f0..8bbceabb85c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-11.c
@@ -24,5 +24,4 @@ void foo (void)
 
 /* { dg-final { scan-tree-dump-times "if " 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-14.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-14.c
index 987c7dea805..4ab17a9510d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-14.c
@@ -16,4 +16,3 @@ int bla(void)
 }
 
 /* { dg-final { scan-tree-dump-times "\\+ 100" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-15.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-15.c
index aa0747b6e7e..829a6d8a0ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-15.c
@@ -24,4 +24,3 @@ int bla(void)
 
 /* The if from the loop header copying remains in the code.  */
 /* { dg-final { scan-tree-dump-times "if " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
index 68ef26d1191..6bcb56cf3a9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-16.c
@@ -21,4 +21,3 @@ void foo(unsigned n)
 /* { dg-final { scan-tree-dump-times "MEM" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\[^\\n\\r\]*= \\* " 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c
index 0e856d8d54f..588cf4c8f23 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-17.c
@@ -16,4 +16,3 @@ int foo (int *p)
 }
 
 /* { dg-final { scan-tree-dump "# of iterations 1, bounded by 1" "sccp" } } */
-/* { dg-final { cleanup-tree-dump "sccp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
index b36d84dcb44..93eccf1b16f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-18.c
@@ -21,4 +21,3 @@ void foo(unsigned *p, unsigned n)
 /* { dg-final { scan-tree-dump-times "MEM" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\[^\\n\\r\]*= \\* " 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-19.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-19.c
index 49163c2431b..af7a3daddec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-19.c
@@ -25,4 +25,3 @@ void tuned_STREAM_Copy()
 /* { dg-final { scan-tree-dump-times "MEM.(base: &|symbol: )a," 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "MEM.(base: &|symbol: )c," 2 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-2.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-2.c
index f43a6d8eb77..bda25167353 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-2.c
@@ -41,4 +41,3 @@ void xxx(void)
 /* { dg-final { scan-tree-dump-times "= 99" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "< 100" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-20.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-20.c
index 6f2b5d0f919..4d7b23d1976 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-20.c
@@ -24,4 +24,3 @@ gfc_conv_array_transpose (gfc_se * se) {
 /* Ivopts should not produce multiplication by a pointer constant.  */
 
 /* { dg-final { scan-tree-dump-times "\\* \[0-9\]*B;" 0 "ivopts" } } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-21.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-21.c
index f53407d9b02..22ff136e8bf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-21.c
@@ -14,4 +14,3 @@ void foo(int f0, int f1, int e0, int e1)
 }
 
 /* { dg-final { scan-tree-dump-times "~" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-22.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-22.c
index fa7da712b6a..86dd3eabaca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-22.c
@@ -14,4 +14,3 @@ void test (int n)
    correct, this transformation is obviously harmful.  */
 
 /* { dg-final { scan-tree-dump-times "/" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-23.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-23.c
index 5bdc35fbd4c..3c884849c5f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-23.c
@@ -26,4 +26,3 @@ int foo(void)
 
 /* { dg-final { scan-tree-dump-times "loop with 4 iterations completely unrolled" 1 "cunroll" } } */
 
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-24.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-24.c
index 5632b067990..7936f4896ac 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-24.c
@@ -14,4 +14,3 @@ void foo4(int*a, int*b)
 { for(;a!=b;a++); }
 
 /* { dg-final { scan-tree-dump-not "if" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c
index c2fb74e5871..939ca8bfe26 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-25.c
@@ -126,4 +126,3 @@ void test5 (void)
 /* { dg-final { scan-tree-dump-times "3 loops found" 2 "profile_estimate" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "2 loops found" 1 "profile_estimate" { xfail *-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "profile_estimate" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-26.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-26.c
index f8bc8e010ae..13de68cd48b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-26.c
@@ -26,4 +26,3 @@ int foo0(int i0, int i1)
 }
 
 /* { dg-final { scan-tree-dump-times "if" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
index 479355eb664..3668bc23ed8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-28.c
@@ -19,5 +19,3 @@ void foo(int n)
 /* There should be no i_a = i_b assignments.  */
 /* { dg-final { scan-tree-dump-times "i_.*= i_\[0-9\]*;" 0 "aprefetch" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-29.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-29.c
index c900dbf9bfb..5cfc36727f5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-29.c
@@ -18,4 +18,3 @@ foo (struct s *p)
 }
 
 /* { dg-final { scan-tree-dump-not "if" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-3.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-3.c
index 9868c078df2..d3b26b7ad19 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-3.c
@@ -27,4 +27,3 @@ void xxx(void)
 
 /* { dg-final { scan-tree-dump-times "int iter" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-31.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-31.c
index fa18f5e0421..b735792d42b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-31.c
@@ -18,4 +18,3 @@ short foo (int len, int v)
 /* { dg-final { scan-tree-dump-times " \\+ 2;" 1 "optimized" { target arm*-*-* } } } */
 /* { dg-final { scan-tree-dump-times " \\+ 2;" 1 "optimized" { target { ia64-*-* && ilp32 } } } } */
 /* { dg-final { scan-tree-dump-times " \\+ 2;" 2 "optimized" { target { ia64-*-* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c
index f0c8d30575e..9953bb5aa62 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-32.c
@@ -43,4 +43,3 @@ void test3(struct a *A)
 }
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of" 3 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c
index bf16b1398c9..2cf4c5a67bb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-33.c
@@ -37,4 +37,3 @@ void test5(struct a *A, unsigned b)
 }
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of" 4 "lim1" { xfail { lp64 || llp64 } } } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c
index 125a2202d19..67493a527ee 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-34.c
@@ -18,4 +18,3 @@ void f (int n)
 
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of r" 6 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c
index 2d2db701a32..70557c55b4c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-35.c
@@ -69,4 +69,3 @@ void test4(struct a *A, unsigned LONG b)
 /* long index not hoisted for avr target PR 36561 */
 /* { dg-final { scan-tree-dump-times "Executing store motion of" 8 "lim1" { xfail { "avr-*-*" } } } } */
 /* { dg-final { scan-tree-dump-times "Executing store motion of" 6 "lim1" { target { "avr-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c
index 9e917376581..d92299143d0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-36.c
@@ -19,4 +19,3 @@ float foobar () {
 /* The temporary structure should have been promoted to registers
    by FRE after the loops have been unrolled by the early unrolling pass.  */
 /* { dg-final { scan-tree-dump-not "c\.array" "dce2" } } */
-/* { dg-final { cleanup-tree-dump "dce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-37.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-37.c
index 46b26bb873f..ec7bf7a58db 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-37.c
@@ -24,4 +24,3 @@ int f1 (int a [])
 int main() { }
 
 /* { dg-final { scan-tree-dump-not "my_array" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-38.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-38.c
index 3c515aa1e79..7ca1e470975 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-38.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-38.c
@@ -16,4 +16,3 @@ t(int n)
   return sum;
 }
 /* { dg-final { scan-tree-dump "Loop 1 iterates at most 11 times" "cunrolli" } } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c
index 1f6bba42fd4..53680dd2349 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-39.c
@@ -23,4 +23,3 @@ foo (unsigned int n)
 }
 
 /* { dg-final { scan-tree-dump "# of iterations \[^\n\r]*, bounded by 8" "sccp" } } */
-/* { dg-final { cleanup-tree-dump "sccp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-4.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-4.c
index 4313fca50e7..f0770abdbbc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-4.c
@@ -43,4 +43,3 @@ void xxx(void)
 
 /* { dg-final { scan-tree-dump-times "iter" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c
index 803e5b61e79..83973961911 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-40.c
@@ -11,4 +11,3 @@ int mymax2(int *it, int *end)
 }
 
 /* { dg-final { scan-tree-dump "Duplicating header" "ch" } } */
-/* { dg-final { cleanup-tree-dump "ch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-5.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-5.c
index e9ff9fcfe38..5f42857fe13 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-5.c
@@ -27,4 +27,3 @@ void xxx(void)
 
 /* { dg-final { scan-tree-dump-times " \\+ 2" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-6.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-6.c
index 992f671e4e0..60447601238 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-6.c
@@ -20,9 +20,7 @@ void xxx(void)
 /* Loop should be unswitched.  */
 
 /* { dg-final { scan-tree-dump-times "Unswitching loop" 1 "unswitch" } } */
-/* { dg-final { cleanup-tree-dump "unswitch" } } */
 
 /* In effect there should be exactly three conditional jumps in the final program.  */
 
 /* { dg-final { scan-tree-dump-times "else" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c
index 38e19e6aa5c..26fb4ec5288 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-7.c
@@ -32,4 +32,3 @@ int xxx (void)
    with k = 0 may be invalid.  */
 
 /* { dg-final { scan-tree-dump-times "Moving statement" 2 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-8.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-8.c
index de439c7199f..f107397ef07 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-8.c
@@ -22,4 +22,3 @@ void xxx (void)
 /* { dg-final { scan-tree-dump-times "step \\* \[^0-9\]" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\[^0-9\] \\* step" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/negate.c b/gcc/testsuite/gcc.dg/tree-ssa/negate.c
index 12e2cdf7127..ad61bc65078 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/negate.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/negate.c
@@ -24,4 +24,3 @@ int g (int a, int b)
 
 /* There should be an addition now.  */
 /* { dg-final { scan-tree-dump-times "\\+" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
index b295169365e..6e2e1013c16 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-1.c
@@ -16,4 +16,3 @@ temp:
    optimize this before because PHI-OPT did not look at 
    PHIs which have more than two arguments.  */
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-10.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-10.c
index 62d007d4548..4c190e6af7d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-10.c
@@ -8,4 +8,3 @@ int spaceship1 (long a) { return a > 0 ? 1 : a < 0 ? -1 : 0; }
 int spaceship2 (long a) { return a > 0 ? 1 : a == 0 ? 0 : -1; }
 
 /* { dg-final { scan-tree-dump-times " = -\[^\r\n\]*_.;" 4 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
index 7c83007e7f1..cda3abf9ec5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-11.c
@@ -22,4 +22,3 @@ int h(int a, int b, int c, int d)
  return a;
 }
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-12.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-12.c
index b52c6d711a7..f00d0fcc474 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-12.c
@@ -20,4 +20,3 @@ unsigned m(unsigned a, unsigned b) {
 }
 
 /* { dg-final { scan-tree-dump-times "goto" 2 "phiopt1" } } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-13.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-13.c
index 3e09c218890..b72f39e19ae 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-13.c
@@ -8,4 +8,3 @@ long f(long a, long b) {
 }
 
 /* { dg-final { scan-tree-dump-times "goto " 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
index 3d34ef3f638..140812272b8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-2.c
@@ -22,4 +22,3 @@ _Bool f1(_Bool a, _Bool b)
    Test this only when known to be !LOGICAL_OP_NON_SHORT_CIRCUIT,
    otherwise ifcombine may convert this into return a & b;.  */
 /* { dg-final { scan-tree-dump-times "if" 1 "optimized" { target { i?86-*-* x86_64-*-* mips*-*-* s390*-*-* avr*-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
index 54970ad80e0..9c8ebaf02dc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-3.c
@@ -14,4 +14,3 @@ int f(int a, int b)
    optimize this before because PHI-OPT did not look at 
    PHIs which have more than two arguments.  */
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
index efd9228b610..3bdb8560932 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-4.c
@@ -14,4 +14,3 @@ _Bool f1()
    value of b (except that we don't fold ! (b != 0) into b
    which means that we miss a sib calling opportunity).  */
 /* { dg-final { scan-tree-dump-times "if " 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
index 7a930dd455e..37041d7dabb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c
@@ -56,4 +56,3 @@ float repl3 (float varz, float vara, float varb)
 
 /* { dg-final { scan-tree-dump "if .*varz" "phiopt1"} } */
 /* { dg-final { scan-tree-dump "vara.*MAX_EXPR" "phiopt1"} } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-6.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-6.c
index 6ec7b72247f..780530d1e42 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-6.c
@@ -10,4 +10,3 @@ int *g(struct C *p)
 }
 
 /* { dg-final { scan-tree-dump-not "if" "phiopt1" } } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-7.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-7.c
index bd897554e2a..18ecbd52aa2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-7.c
@@ -19,5 +19,4 @@ int f(int t, int c)
    a conditional and the other should be there still.  */
 /* { dg-final { scan-tree-dump-times "if" 1 "optimized" }  }*/
 /* { dg-final { scan-tree-dump-times "\[^\r\n\]*_. = c_\[0-9\]*.D. != 0" 1 "optimized"  } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-8.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-8.c
index 775926da980..e3b2771dbb2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-8.c
@@ -22,5 +22,3 @@ int f(int t, int c)
 /* { dg-final { scan-tree-dump-not "if" "phiopt1" } } */
 /* { dg-final { scan-tree-dump "g .t_\[0-9\]*.D.," "optimized" } } */
 /* { dg-final { scan-tree-dump-not "PHI" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "phiopt1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-9.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-9.c
index a224788f5d8..7528abe3f3b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-9.c
@@ -19,4 +19,3 @@ int f(int t, int c)
 /* The value e should have been replaced with t and there should be only one PHI. */
 /* { dg-final { scan-tree-dump "g .t_\[0-9\]*.D.," "optimized" } } */
 /* { dg-final { scan-tree-dump-times "PHI" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr13146.c b/gcc/testsuite/gcc.dg/tree-ssa/pr13146.c
index b556457678c..f709390131e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr13146.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr13146.c
@@ -19,4 +19,3 @@ int foo (struct A *p, struct B *q)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14341.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14341.c
index 0287a25cc38..4950d28d034 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14341.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14341.c
@@ -14,4 +14,3 @@ void t()
 }
 
 /* { dg-final { scan-tree-dump-times "fn_call \\(1\\)" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-1.c
index b69bb70d305..072929e071e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-1.c
@@ -7,5 +7,4 @@ int g(int x)
 /* There should be only x <= 9 and no x - 10. */
 /* { dg-final { scan-tree-dump-times "<= 9" 1 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "\\+ -10" 0 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-2.c
index 925442bb4f2..12518ed40a6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-2.c
@@ -7,4 +7,3 @@ int g(int x)
 /* There should be no x >= 9 and one x - 10. */
 /* { dg-final { scan-tree-dump-times "<= 9" 0 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "\\+ -10" 1 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-3.c
index bf63d3afc79..7f294d13916 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-3.c
@@ -7,4 +7,3 @@ int g(int x)
 /* There should be only x < -10 and no x + 10. */
 /* { dg-final { scan-tree-dump-times "< -10" 1 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "\\+ 10" 0 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-4.c
index 90a49bbdd64..4603389f33a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14490-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14490-4.c
@@ -7,4 +7,3 @@ int g(int x)
 /* There should be no x < -10 and one x + 10. */
 /* { dg-final { scan-tree-dump-times "< -10" 0 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "\\+ 10" 1 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c b/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
index 20608156f3c..60d9649a189 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr14814.c
@@ -19,4 +19,3 @@ int foo(const struct XX* r) {
 }
 
 /* { dg-final { scan-tree-dump-times "= &" 0 "forwprop2" } } */
-/* { dg-final { cleanup-tree-dump "forwprop2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c b/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
index 26c1938424a..e8c01b1de64 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr15349.c
@@ -23,4 +23,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "PHI" 1 "mergephi2"} } */
-/* { dg-final { cleanup-tree-dump "mergephi2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-3.c
index 2fd03e2e0cb..d70b08d4ff0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-3.c
@@ -10,4 +10,3 @@ int f(int i, unsigned j)
 }
 
 /* { dg-final { scan-tree-dump-times "i == j" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-4.c
index 82be2e33a9a..bc53eb43f7b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-4.c
@@ -10,4 +10,3 @@ int f(int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "i == j" 0 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-5.c b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-5.c
index 06ce523a7ae..69fcf7ea315 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr15791-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr15791-5.c
@@ -10,4 +10,3 @@ int foo(int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "i == j" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr16721.c b/gcc/testsuite/gcc.dg/tree-ssa/pr16721.c
index eec753405c7..869ab96497e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr16721.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr16721.c
@@ -13,4 +13,3 @@ int test()
 
 /* The load from p->addr should not disappear.  */
 /* { dg-final { scan-tree-dump-times "\->addr" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr17141-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr17141-1.c
index 853fe70c623..e33571da156 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr17141-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr17141-1.c
@@ -14,4 +14,3 @@ foo(struct A *locp, int str)
 /* We should have propagated &locp->i into its dereference.  */
 
 /* { dg-final { scan-tree-dump "locp_\[^\\n\]* =" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr17141-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr17141-2.c
index 37782cafe8f..550ca7edde2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr17141-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr17141-2.c
@@ -27,4 +27,3 @@ l2:
 
 /* { dg-final { scan-tree-dump-times "&" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "abort" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr17598.c b/gcc/testsuite/gcc.dg/tree-ssa/pr17598.c
index ac912a2b19b..d27fdccd298 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr17598.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr17598.c
@@ -39,4 +39,3 @@ int foobar2(struct g *x)
 /* { dg-final { scan-tree-dump-times "x == &y" 2 "gimple" } } */
 /* { dg-final { scan-tree-dump "x->k" "gimple" } } */
 /* { dg-final { scan-tree-dump "yy.k" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
index 8bae0145d79..3ffd27e412e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-1.c
@@ -25,4 +25,3 @@ return;
    scan for 3 instances of "FALLTHRU".  */
 
 /* { dg-final { scan-tree-dump-times "FALLTHRU" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
index 9d04ded45da..8717640e327 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18133-2.c
@@ -40,4 +40,3 @@ bar (int a)
    computed goto.  */
 
 /* { dg-final { scan-tree-dump-times "ab" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
index 783d598a0ed..cd40ab2c162 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18134.c
@@ -23,4 +23,3 @@ return 0;
    computed gotos.  */
 
 /* { dg-final { scan-tree-dump-times "ab" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-1.c
index 48c904d0f8f..40019b82780 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-1.c
@@ -7,4 +7,3 @@ double baz (double x, double y)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-10.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-10.c
index 4a6120abd6d..3b529bb8e3f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-10.c
@@ -8,4 +8,3 @@ double baz (double x, double y, double z)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-2.c
index d8b7fca00ee..bcda56d8e6a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-2.c
@@ -7,4 +7,3 @@ double baz (double x, double y)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-3.c
index 26c1893bae7..5f6f7e229e1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-3.c
@@ -7,4 +7,3 @@ double baz (double x, double y, double z)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-4.c
index 55c2d43b397..f192d3591fd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-4.c
@@ -7,4 +7,3 @@ double baz (double x, double y, double z, double u)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 6 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-5.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-5.c
index ea60f8eca1c..165d9b24016 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-5.c
@@ -7,4 +7,3 @@ double baz (double x, double y, double z, double u)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 6 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-6.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-6.c
index 5044020cf44..ece01a89246 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-6.c
@@ -7,4 +7,3 @@ double baz (double x, double y)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-7.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-7.c
index d4c5241583a..d9c6667382d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-7.c
@@ -7,4 +7,3 @@ float baz (float x, float y)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-8.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-8.c
index 5335fa229e8..7341bc895f4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-8.c
@@ -7,4 +7,3 @@ long double baz (long double x, long double y)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-9.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-9.c
index 08d5798e2cd..8db92452aa6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18589-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18589-9.c
@@ -8,4 +8,3 @@ double baz (double x, double y, double z)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 6 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr18908.c b/gcc/testsuite/gcc.dg/tree-ssa/pr18908.c
index 3707efe36c3..fd8ce425a86 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr18908.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr18908.c
@@ -6,4 +6,3 @@ _Bool f3(_Bool *p) { *p ^= 1; }
 /* We should be able to canonicalize the above to use bitwise not.  */
 /* { dg-final { scan-tree-dump "~\[^\n\r\]*_.;" "forwprop1" } } */
 /* { dg-final { scan-tree-dump-not "\\\^ 1" "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19055-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19055-2.c
index 739d69c0e83..2bc2f9bdfc2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19055-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19055-2.c
@@ -24,4 +24,3 @@ int f4(int a,int b,int c,int d)
 /* { dg-final { scan-tree-dump-times "\\^" 0 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "~" 4 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "&" 12 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19055.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19055.c
index 055a96c1c25..48484c67c39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19055.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19055.c
@@ -20,4 +20,3 @@ int f4(int a,int b)
 /* { dg-final { scan-tree-dump-times "\\^" 0 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "~" 4 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "&" 4 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19431.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19431.c
index 08972063e0d..2f656ceccbc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19431.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19431.c
@@ -25,4 +25,3 @@ int f(int k, int i1, int j1)
 }
 
 /* { dg-final { scan-tree-dump "\[^\r\n\]*_. = PHI <i1_\[^,\]*, j1_\[^>\]*>" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19590.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19590.c
index 1be1119dac0..2c6cfc6f831 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19590.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19590.c
@@ -34,4 +34,3 @@ void vnum_test8(int *data)
 
 /* { dg-final { scan-tree-dump-times "= 0;" 1 "ivopts"} } */
 /* { dg-final { scan-tree-dump-times "= 2;" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19633.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19633.c
index 01c7eec3129..88cbfe222d7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19633.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19633.c
@@ -23,4 +23,3 @@ foo (int a, struct T b)
 /* Make sure that .GLOBAL_VAR is not created when there are no
    clobbering calls.  */
 /* { dg-final { scan-tree-dump-times "GLOBAL_VAR" 0 "ssa"} } */
-/* { dg-final { cleanup-tree-dump "ssa" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-1.c
index 1c8f9722708..9d6e233a51e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-1.c
@@ -29,4 +29,3 @@ void test4(int b)
 
 /* { dg-final { scan-tree-dump-times "free" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "malloc" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-2.c
index bc7c4cc3182..55b4fd07580 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-2.c
@@ -12,4 +12,3 @@ void test1(void)
 
 /* { dg-final { scan-tree-dump-times "free" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "malloc" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-3.c
index 02b55726a99..f78a17ff468 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr19831-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr19831-3.c
@@ -36,4 +36,3 @@ void test6(void)
 
 /* { dg-final { scan-tree-dump-times "free" 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "malloc" 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20139.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20139.c
index 016ad004ee8..6253de428ef 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20139.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20139.c
@@ -20,4 +20,3 @@ foo (double x)
 }
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
index f36184b9208..41f569ef001 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20318.c
@@ -15,5 +15,3 @@ void h () {
 
 /* { dg-final { scan-tree-dump-times "== 0" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate\[^\\n\]*to 0" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
index b0d7492de98..97015110a59 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20470.c
@@ -12,4 +12,3 @@ void f1()
 }
 
 /* { dg-final { scan-tree-dump-times "ABS_EXPR" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
index 1c3dbf9fd66..c1317a705b7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20657.c
@@ -15,4 +15,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20701.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20701.c
index c49ff7a7ba3..2f914589e32 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20701.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20701.c
@@ -38,4 +38,3 @@ can_combine_p (rtx insn, rtx elt)
 /* Target disabling -fdelete-null-pointer-checks should not fold checks */
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 0" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 0" 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
index 8313f1aea78..cc7370cad4e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr20702.c
@@ -28,4 +28,3 @@ foo (int *p, int b)
 /* Target disabling -fdelete-null-pointer-checks should not fold checks */
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate" 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
index 888d609aea4..05b495bd575 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21001.c
@@ -18,4 +18,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21031.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21031.c
index 1ff18205536..f39c1276c7e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21031.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21031.c
@@ -17,4 +17,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Replaced" 2 "forwprop1" } } */
-/* { dg-final { cleanup-tree-dump "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
index 6f96f40cbf4..26ea8177583 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
@@ -20,5 +20,3 @@ foo (int *p)
 /* { dg-final { scan-tree-dump-times "Folding predicate " 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-not "b_. =" "dce1" { target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump "b_. =" "dce1" { target { avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "dce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
index 30abc2034a5..26d0d559031 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21090.c
@@ -20,4 +20,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 1" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21171.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21171.c
index 9f7278378b6..0c07e7ea58d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21171.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21171.c
@@ -26,4 +26,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "SVR" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
index 567e6366ad4..f694fb2caf0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21294.c
@@ -20,4 +20,3 @@ foo (struct f *p)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c
index 4a2c82143ec..b67dd184fb5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21417.c
@@ -50,5 +50,4 @@ L23:
    execute the if (expr->common.code != 142) test once per loop
    iteration.  */
 /* { dg-final { scan-tree-dump-times "Threaded jump" 1 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
index 01777f6e64d..20ec9c9e9cf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21458.c
@@ -17,4 +17,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21463.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21463.c
index 3f63cdd8e8c..ed0829a038c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21463.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21463.c
@@ -17,4 +17,3 @@ int g(int i, int c, struct f *ff, int g)
 }
 
 /* { dg-final { scan-tree-dump-times "Inserting PHI for result of load" 1 "phiprop" } } */
-/* { dg-final { cleanup-tree-dump "phiprop" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
index a991e049035..0906351350e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21559.c
@@ -41,5 +41,4 @@ void foo (void)
    entering while loop and thread over it.  */
 /* { dg-final { scan-tree-dump-times "Threaded jump" 3 "vrp1" } } */
 
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
index 8e6c57850b5..2cc2599700c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21563.c
@@ -14,4 +14,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21574.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21574.c
index dcfa131510c..c4158f73a2a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21574.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21574.c
@@ -10,4 +10,3 @@ foo (int *p)
 
 /* The store to *p should be propagated to the load statement.  */
 /* { dg-final { scan-tree-dump "Replaced \\\*p_.\\\(D\\\) with 0" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21582.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21582.c
index 8675fbff3b1..93f14d5f845 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21582.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21582.c
@@ -28,4 +28,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
index c1a48c04b96..cfd22177012 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21658.c
@@ -18,4 +18,3 @@ f (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Folded into: if " 1 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
index c95714ab9fb..8f5ae5127e3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21829.c
@@ -19,4 +19,3 @@ int test(int v)
 /* This should be unrolled and optimized into conditional set of return value "v < 0".  */
 
 /* { dg-final { scan-tree-dump-not "if \\(" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21959.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21959.c
index decbcaf3adc..6416f4b74a8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21959.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21959.c
@@ -17,4 +17,3 @@ void f(void)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate " 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21985.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21985.c
index 19ad0f1132b..dd4a1c5428c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr21985.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21985.c
@@ -31,4 +31,3 @@ main (void)
 /* Two of the calls to foo should be folded to just foo(constant).  */
 
 /* { dg-final { scan-tree-dump-times "foo \\(\[0-9\]*\\)" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr22026.c b/gcc/testsuite/gcc.dg/tree-ssa/pr22026.c
index 7e6914d9d6b..3a89608b526 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr22026.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr22026.c
@@ -46,4 +46,3 @@ mult (unsigned x, unsigned y)
 
 /* None of the predicates can be folded in these functions.  */
 /* { dg-final { scan-tree-dump-times "Folding predicate" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr22051-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr22051-1.c
index 73bda118fe5..e01f39216c4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr22051-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr22051-1.c
@@ -18,6 +18,5 @@ foo()
    are complete so that function pointer canonicalization works on those
    targets which require it.  */
 /* { dg-final { scan-tree-dump-times "= \\(void \\(\\*<.*>\\) \\(void\\)\\) p_" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr22051-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr22051-2.c
index bcbbb73c659..cae9a06323a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr22051-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr22051-2.c
@@ -21,5 +21,4 @@ foo()
    so that we do not try to canonicalize a function pointer for the
    comparison when no such canonicalization is wanted.  */
 /* { dg-final { scan-tree-dump-times "r_. = \\(int\\) q" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr22117.c b/gcc/testsuite/gcc.dg/tree-ssa/pr22117.c
index 377539f892d..7efdd634fff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr22117.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr22117.c
@@ -22,4 +22,3 @@ foo (int *p, int q)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate r_.* != 0B to 0" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr22321.c b/gcc/testsuite/gcc.dg/tree-ssa/pr22321.c
index 64a94ab2d76..9f6855530f7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr22321.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr22321.c
@@ -16,5 +16,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23086.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23086.c
index 206b92de147..d55be14c04c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23086.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23086.c
@@ -32,4 +32,3 @@ int main(void)
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c
index 73fd84d9282..8281a9840b4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23109.c
@@ -31,6 +31,4 @@ int main()
    this is not wrongly optimized.  */
 /* { dg-final { scan-tree-dump-not "reciptmp" "lim1" } } */
 /* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23294.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23294.c
index ed890fa5514..8f9fffb1647 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23294.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23294.c
@@ -34,4 +34,3 @@ int f6(int a, int b)
 /* { dg-final { scan-tree-dump-times "a_..D. \\\* 5" 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\\* 2" 3 "optimized" } } */
 /* { dg-final { scan-tree-dump-not "\\\* 6" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
index 1d30ac7519f..fb8aebff525 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23401.c
@@ -21,4 +21,3 @@ int ffff(int i)
 
 /* { dg-final { scan-tree-dump-times "int" 5 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23455.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23455.c
index 6522f99f9b0..fec3540df2d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23455.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23455.c
@@ -27,4 +27,3 @@ bi_windup(unsigned int *outbuf, unsigned int bi_buf)
    one add involving outcnt and outbuf.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 3" 1 "pre" {target { ! avr-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Eliminated: 4" 1 "pre" {target {   avr-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
index 23fc3a24a46..9d662f25c31 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23744.c
@@ -18,4 +18,3 @@ int g (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23777.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23777.c
index c2ad9b70707..56752f2ee29 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23777.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23777.c
@@ -16,4 +16,3 @@ void g (char **o)
     multilib_exclusions_raw.  */
 
 /* { dg-final { scan-tree-dump-not "multilib_exclusions_raw" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-1.c
index 08916e4e5dd..c80ed85e830 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-1.c
@@ -29,4 +29,3 @@ void foo2 (int size)
 
 /* { dg-final { scan-tree-dump-not "__builtin_stack_save" "optimized"} } */
 /* { dg-final { scan-tree-dump-not "__builtin_stack_restore" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-2.c
index c9691469dbf..cdbf7b00031 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-2.c
@@ -22,4 +22,3 @@ void foo (int size)
 
 /* { dg-final { scan-tree-dump-times "__builtin_stack_save" 1 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "__builtin_stack_restore" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-3.c
index d2555049b7f..3232f3447f9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-3.c
@@ -25,4 +25,3 @@ void foo (int size)
 
 /* { dg-final { scan-tree-dump-times "__builtin_stack_save" 1 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "__builtin_stack_restore" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-4.c
index 66b21b81e89..f32e8fab861 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr23848-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr23848-4.c
@@ -22,4 +22,3 @@ void foo (int size)
 
 /* { dg-final { scan-tree-dump-times "__builtin_stack_save" 1 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "__builtin_stack_restore" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr24117.c b/gcc/testsuite/gcc.dg/tree-ssa/pr24117.c
index df19d976c68..45f3417c671 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr24117.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr24117.c
@@ -23,4 +23,3 @@ void foo(void)
     link_error ();
 }
 /* { dg-final { scan-tree-dump-times "link_error" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr24287.c b/gcc/testsuite/gcc.dg/tree-ssa/pr24287.c
index c264fbcb25c..6fc6be1edea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr24287.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr24287.c
@@ -26,4 +26,3 @@ int g(void)
 }
 /* We are allowed to optimize the first two link_error calls.  */
 /* { dg-final { scan-tree-dump-times "link_error" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr24689.c b/gcc/testsuite/gcc.dg/tree-ssa/pr24689.c
index 4fe74b65882..d3eb3471f85 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr24689.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr24689.c
@@ -21,4 +21,3 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr24990-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr24990-1.c
index a518df025f6..ff2aed28314 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr24990-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr24990-1.c
@@ -17,5 +17,4 @@ int f1(int x)
 /* { dg-final { scan-tree-dump-times "== 0" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "== -1" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c b/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
index daff68ee92b..dcf91480673 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr25382.c
@@ -16,4 +16,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate b_.* > 300 to 0" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr25485.c b/gcc/testsuite/gcc.dg/tree-ssa/pr25485.c
index 93f583cc34a..dda71eabfe9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr25485.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr25485.c
@@ -14,4 +14,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "if" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c b/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
index 1fb2c7eba80..5fcb315b15d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr25501.c
@@ -33,4 +33,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Removing basic block" 0 "mergephi1"} } */
-/* { dg-final { cleanup-tree-dump "mergephi1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c b/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
index 70f123158af..e670a349a32 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr26421.c
@@ -19,4 +19,3 @@ int foo(void)
 /* Verify the call clobbers all of a.  */
 
 /* { dg-final { scan-tree-dump-not "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr26899.c b/gcc/testsuite/gcc.dg/tree-ssa/pr26899.c
index 2e994106095..87d8a3c52ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr26899.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr26899.c
@@ -6,5 +6,4 @@ int foo (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump "j >= i" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27236.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27236.c
index 389b652069d..f69585a0f39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27236.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27236.c
@@ -17,4 +17,3 @@ unsigned int foo(volatile int *mem)
 }
 
 /* { dg-final { scan-tree-dump-times "foo_read" 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27498.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27498.c
index 75d3d4bacd8..c8ffabc48da 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27498.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27498.c
@@ -14,4 +14,3 @@ void zconfdump(void)
 }
 
 /* { dg-final { scan-tree-dump-not "goto" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
index 233c93dac38..2a489012e6c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27781.c
@@ -14,4 +14,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "func \\(\\);" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
index c7da3bd5d06..84dfcc9ed91 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr27810.c
@@ -15,4 +15,3 @@ int qqq (int a)
 
 /* { dg-final { scan-tree-dump-times "int" 3 "gimple" } } */
 /* { dg-final { scan-tree-dump-times "int D\\\." 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c b/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c
index 50b3bfd565a..699d2df14f2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr30375.c
@@ -23,4 +23,3 @@ void test_signed_msg_encoding(void)
 }
 
 /* { dg-final { scan-tree-dump-times "signInfo = {}" 1 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse*" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr30978.c b/gcc/testsuite/gcc.dg/tree-ssa/pr30978.c
index ee45e5b4fe8..4bf81bd7afd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr30978.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr30978.c
@@ -14,4 +14,3 @@ int foo(int a)
 /* One comparison and one extension to int.  */
 /* { dg-final { scan-tree-dump " = a_..D. > 0;" "optimized" } } */
 /* { dg-final { scan-tree-dump "e_. = \\\(int\\\)" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr31261.c b/gcc/testsuite/gcc.dg/tree-ssa/pr31261.c
index 54f677ba8ca..127300fdd24 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr31261.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr31261.c
@@ -38,4 +38,3 @@ f5 (int e)
 /* { dg-final { scan-tree-dump-times "return \\(int\\) \\(12 - \\(unsigned int\\) d\\) \& 7;" 1 "original" { target { ! int16 } } } } */
 /* { dg-final { scan-tree-dump-times "return \\(int\\) \\(12 - \\(unsigned short\\) d\\) \& 7;" 1 "original" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "return 12 - \\(e \& 7\\) \& 15;" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr31521.c b/gcc/testsuite/gcc.dg/tree-ssa/pr31521.c
index 4f54cc07716..cad50f0a222 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr31521.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr31521.c
@@ -17,4 +17,3 @@ int foo(int x) {
 }
 
 /* { dg-final { scan-tree-dump-times " = i_.* >> 2" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c b/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c
index 58a62662b4f..745a5e4db01 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr32044.c
@@ -51,4 +51,3 @@ int baz (int n)
 /* { dg-final { scan-tree-dump-times "/" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "%" 0 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr32821.c b/gcc/testsuite/gcc.dg/tree-ssa/pr32821.c
index 2195739404d..800ac98577f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr32821.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr32821.c
@@ -12,4 +12,3 @@ main1 (int *arr, int n, int a, int b)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "ifcvt" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr32901.c b/gcc/testsuite/gcc.dg/tree-ssa/pr32901.c
index c0ba060e115..b1802a237dc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr32901.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr32901.c
@@ -27,4 +27,3 @@ void setup_foo(void)
 /* { dg-final { scan-tree-dump-times "thefoo.* = 1" 1 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "thefoo.* = 5" 1 "gimple"} } */
 /* { dg-final { scan-tree-dump-times "theotherfoo = volinit" 1 "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr32964.c b/gcc/testsuite/gcc.dg/tree-ssa/pr32964.c
index 18e73f939cd..3d587119de9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr32964.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr32964.c
@@ -23,4 +23,3 @@ float t(float a)
 }
 
 /* { dg-final { scan-tree-dump-times "union" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr33172.c b/gcc/testsuite/gcc.dg/tree-ssa/pr33172.c
index 17a40d4a33d..79e1810d01d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr33172.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr33172.c
@@ -39,4 +39,3 @@ void func(void)
 }
 
 /* { dg-final { scan-tree-dump-not "call_func" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr33723.c b/gcc/testsuite/gcc.dg/tree-ssa/pr33723.c
index 7b5aefcedad..bc2a1807fd2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr33723.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr33723.c
@@ -71,4 +71,3 @@ baz3 (void)
 }
 
 /* { dg-final { scan-tree-dump-not "t = D" "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr34146-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr34146-2.c
index 2378e3e64fd..a4cd9509b82 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr34146-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr34146-2.c
@@ -52,4 +52,3 @@ baz (void)
 /* { dg-final { scan-tree-dump-not "t = D" "gimple"} } */
 /* { dg-final { scan-tree-dump-not "t\.c\.h\[12\] = D" "gimple"} } */
 /* { dg-final { scan-tree-dump-not "\.g\[12\] = D" "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr34146.c b/gcc/testsuite/gcc.dg/tree-ssa/pr34146.c
index 73894a0ccd3..d324879be04 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr34146.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr34146.c
@@ -52,4 +52,3 @@ baz (void)
 /* { dg-final { scan-tree-dump-not "t = D" "gimple"} } */
 /* { dg-final { scan-tree-dump-not "t\.c\.h\[12\] = D" "gimple"} } */
 /* { dg-final { scan-tree-dump-not "\.g\[12\] = D" "gimple"} } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr35286.c b/gcc/testsuite/gcc.dg/tree-ssa/pr35286.c
index 8601cabeca4..c1240478862 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr35286.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr35286.c
@@ -20,4 +20,3 @@ int foo(int a, int b)
 /* We will eliminate the g1.a from the return statement as fully redundant,
    and remove one calculation of a + b. */
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr35287.c b/gcc/testsuite/gcc.dg/tree-ssa/pr35287.c
index 1e976628096..09182e3db58 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr35287.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr35287.c
@@ -12,4 +12,3 @@ int foo(int p)
 
 /* We will eliminate one load of gp and one indirect load of *gp. */
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c b/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c
index 0611f7d8499..df6cbee24e8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr36326.c
@@ -10,4 +10,3 @@ int foo (union X *p)
 }
 
 /* { dg-final { scan-tree-dump-not "x.0" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr36881.c b/gcc/testsuite/gcc.dg/tree-ssa/pr36881.c
index 96922e3a62f..3f3249e015d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr36881.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr36881.c
@@ -23,4 +23,3 @@ const char *foo (int i)
 
 /* { dg-final { scan-assembler-not "CSWTCH" } } */
 /* { dg-final { scan-tree-dump "need runtime relocations" "switchconv" } } */
-/* { dg-final { cleanup-tree-dump "switchconv" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c b/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
index 19b54fe16e9..aa33626a658 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr37508.c
@@ -45,4 +45,3 @@ int test4 (struct foo2 *x)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr38533.c b/gcc/testsuite/gcc.dg/tree-ssa/pr38533.c
index a80a5a81390..ac8dfb96aaf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr38533.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr38533.c
@@ -27,4 +27,3 @@ main (void)
    be exactly 2 (first) __asm__ stmts with no intervening stmts,
    all others should have some bitwise or in between.  */
 /* { dg-final { scan-tree-dump-times "__asm__\[^;\n]*;\n *__asm__" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr38699.c b/gcc/testsuite/gcc.dg/tree-ssa/pr38699.c
index 21b33513061..ae82036fdfd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr38699.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr38699.c
@@ -78,4 +78,3 @@ void makeUseOfTimerWait( unsigned char val ) {
 /* We should not inline the delay loops.  */
 /* { dg-final { scan-tree-dump "delay_wait_us" "optimized"} } */
 /* { dg-final { scan-tree-dump "delay_wait_us_ms" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr38895.c b/gcc/testsuite/gcc.dg/tree-ssa/pr38895.c
index 0a96e53348a..171745f58c2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr38895.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr38895.c
@@ -21,4 +21,3 @@ int foo(struct C *c, struct B *b)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr41469-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr41469-1.c
index cee2c08228f..6be7cd96557 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr41469-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr41469-1.c
@@ -13,4 +13,3 @@ bf (void)
 
 /* { dg-final { scan-tree-dump-not "__builtin_stack_save" "optimized"} } */
 /* { dg-final { scan-tree-dump-not "__builtin_stack_restore" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr42585.c b/gcc/testsuite/gcc.dg/tree-ssa/pr42585.c
index 082b276398c..b2aa1743b98 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr42585.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr42585.c
@@ -37,4 +37,3 @@ Cyc_string_ungetc (int ignore, struct _fat_ptr *sptr)
    not take place when using small values for MOVE_RATIO.  */
 /* { dg-final { scan-tree-dump-times "struct _fat_ptr _ans" 0 "optimized" { target { ! "aarch64*-*-* alpha*-*-* arm*-*-* avr-*-* nds32*-*-* powerpc*-*-* s390*-*-* sh*-*-*" } } } } */
 /* { dg-final { scan-tree-dump-times "struct _fat_ptr _T2" 0 "optimized" { target { ! "aarch64*-*-* alpha*-*-* arm*-*-* avr-*-* nds32*-*-* powerpc*-*-* s390*-*-* sh*-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr42893.c b/gcc/testsuite/gcc.dg/tree-ssa/pr42893.c
index b3fbd765403..293098d0bc5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr42893.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr42893.c
@@ -26,5 +26,4 @@ tui_registers_changed_hook (void)
 /* No references to tui_refreshing_registers should remain.  */
 /* { dg-final { scan-tree-dump-not "tui_refreshing_registers" "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr43378.c b/gcc/testsuite/gcc.dg/tree-ssa/pr43378.c
index 1861b4515d1..ce604c3a39c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr43378.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr43378.c
@@ -14,4 +14,3 @@ void foo (int left, int rite, int element)
 
 /* { dg-final { scan-tree-dump-times "rite_\[0-9\]* = rite_\[0-9\]* - element" 1 "ivopts"} } */
 /* { dg-final { scan-tree-dump-times "left_\[0-9\]* = left_\[0-9\]* \\+ element|left_\[0-9\]* = element_\[0-9\]*\\(D\\) \\+ left" 1 "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr43491.c b/gcc/testsuite/gcc.dg/tree-ssa/pr43491.c
index 44dc5f2d3cf..b4964342ebf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr43491.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr43491.c
@@ -39,4 +39,3 @@ long foo(long data, long v)
    a single assignment.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre" { target { arm*-*-* i?86-*-* mips*-*-* x86_64-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "Eliminated: 3" 1 "pre" { target { ! { arm*-*-* i?86-*-* mips*-*-* x86_64-*-* } } } } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr44258.c b/gcc/testsuite/gcc.dg/tree-ssa/pr44258.c
index 6dc233b3231..0d91fc73520 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr44258.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr44258.c
@@ -42,4 +42,3 @@ int foo (int b)
 /* Epiphany has struct alignment/padding that avoids the overlap of
    str.b1 and val.b2.  */
 /* { dg-final { scan-tree-dump-times "Created a replacement" 0 "esra" { target { ! "epiphany-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c b/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
index cadcfcd93a7..1c6fe9f6a58 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr44423.c
@@ -44,4 +44,3 @@ int main()
   }
 
 /* { dg-final { scan-tree-dump-times "Created a replacement" 0 "esra"} } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr45144.c b/gcc/testsuite/gcc.dg/tree-ssa/pr45144.c
index af23fb5970b..e799039b631 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr45144.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr45144.c
@@ -44,4 +44,3 @@ bar (unsigned orig, unsigned *new)
 }
 
 /* { dg-final { scan-tree-dump-not "unnamed-unsigned:19" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr45427.c b/gcc/testsuite/gcc.dg/tree-ssa/pr45427.c
index 0bd1a188278..2f86f02a30c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr45427.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr45427.c
@@ -26,4 +26,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "bounded by 0x0\[^0-9a-f\]" 0 "cunrolli"} } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr47286.c b/gcc/testsuite/gcc.dg/tree-ssa/pr47286.c
index b03c59b832b..6c42260813c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr47286.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr47286.c
@@ -17,4 +17,3 @@ void testcase(void)
    to globals and thus the store not optimized away.  */
 
 /* { dg-final { scan-tree-dump "->preempt_count =" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr47392.c b/gcc/testsuite/gcc.dg/tree-ssa/pr47392.c
index 20161363fbd..c7b32ec1ef0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr47392.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr47392.c
@@ -39,4 +39,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr47477.c b/gcc/testsuite/gcc.dg/tree-ssa/pr47477.c
index 104cb6f595c..e8576743e87 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr47477.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr47477.c
@@ -17,6 +17,5 @@ toto_t add (toto_t a, toto_t b) {
 /* { dg-final { scan-tree-dump-times "= \\(int\\)" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= \\(unsigned int\\)" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= \\(struct toto_s \\*\\)" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
index 3500dbf2ac9..e1fee0839ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49039.c
@@ -28,4 +28,3 @@ foo (unsigned int x, unsigned int y)
 /* { dg-final { scan-tree-dump "Folding predicate minv_\[0-9\]* == 6 to 0" "vrp1" } } */
 /* { dg-final { scan-tree-dump "Folding predicate maxv_\[0-9\]* == 5 to 0" "vrp1" } } */
 /* { dg-final { scan-tree-dump "Folding predicate maxv_\[0-9\]* == 6 to 0" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49642-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49642-1.c
index 487c42bf832..ecf7e0d9293 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49642-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49642-1.c
@@ -48,4 +48,3 @@ int y(struct ehca_shca *shca)
 }
 
 /* { dg-final { scan-tree-dump-times "____ilog2_NaN" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49642-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49642-2.c
index 8c8d5e98a28..c3347d22f91 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49642-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49642-2.c
@@ -50,4 +50,3 @@ int y(struct ehca_shca *shca)
 }
 
 /* { dg-final { scan-tree-dump-times "____ilog2_NaN" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49671-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49671-1.c
index acc9980dbda..fc78b870c15 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49671-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49671-1.c
@@ -12,6 +12,5 @@ void f(void)
 }
 
 /* { dg-final { scan-tree-dump "\{v\}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr49671-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr49671-2.c
index ba5a9d99cf7..3073ee3d286 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr49671-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr49671-2.c
@@ -12,6 +12,5 @@ void f(void)
 }
 
 /* { dg-final { scan-tree-dump "\{v\}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr52631.c b/gcc/testsuite/gcc.dg/tree-ssa/pr52631.c
index 21b2f3fed95..59523ae0ddf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr52631.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr52631.c
@@ -14,5 +14,4 @@ unsigned f(unsigned a)
 /* We want to verify that we replace the b & 1 with b.  */
 /* { dg-final { scan-tree-dump-times "Replaced b_\[0-9\]+ & 1 with b_\[0-9\]+ in" 1 "fre1"} } */
  
-/* { dg-final { cleanup-tree-dump "fre1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr54245.c b/gcc/testsuite/gcc.dg/tree-ssa/pr54245.c
index daca0423a1d..b96e3e51f5b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr54245.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr54245.c
@@ -46,4 +46,3 @@ int main(void)
    take place in a smaller type than originally.  This test may be deleted
    in future when this case is handled more precisely.  */
 /* { dg-final { scan-tree-dump-times "Inserting initializer" 0 "slsr" { target { ! int16 } } } } */
-/* { dg-final { cleanup-tree-dump "slsr" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr55579.c b/gcc/testsuite/gcc.dg/tree-ssa/pr55579.c
index 16807cf66c6..8cb18f04d4b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr55579.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr55579.c
@@ -12,4 +12,3 @@ foo (int x)
 }
 
 /* { dg-final { scan-tree-dump "Created a debug-only replacement for s" "esra" } } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr57361.c b/gcc/testsuite/gcc.dg/tree-ssa/pr57361.c
index bc265db6ff4..81f27b3cd1f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr57361.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr57361.c
@@ -7,4 +7,3 @@ void f (struct A *a) {
 }
 
 /* { dg-final { scan-tree-dump "Deleted dead store" "dse1"} } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c b/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
index 90e4cc0aeb3..7df8f8affbd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr58480.c
@@ -16,4 +16,3 @@ void g2 (void*p, void*q){
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate\[^\\n\]*to 0" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c b/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
index faf377fb87e..91d11e24f6c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr58958.c
@@ -9,4 +9,3 @@ int f(int n){
 }
 
 /* { dg-final { scan-tree-dump " == 9" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c b/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
index 989e5f1ac3f..b7760167f04 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr59597.c
@@ -55,5 +55,4 @@ main (int argc, char argv[])
 }
 
 /* { dg-final { scan-tree-dump "Cancelling" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
index 4f1fec86e38..429eafc2ccf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61144.c
@@ -6,4 +6,3 @@ 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" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c
index 924d686c34e..bf46198f75f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61607.c
@@ -25,5 +25,4 @@ void f2(int dst[3], int R)
    the second conditional after the loop.  */
 /* { dg-final { scan-tree-dump-times "if" 2 "dom1"} } */
 
-/* { dg-final { cleanup-tree-dump "dom1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61743-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61743-1.c
index 5e45c2d90ed..2c8db1a01bb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61743-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61743-1.c
@@ -50,4 +50,3 @@ int foo1 (e_u8 a[4][N], int b1, int b2, e_u8 b[M+1][4][N])
 
 /* { dg-final { scan-tree-dump-times "loop with 4 iterations completely unrolled" 2 "cunroll" } } */
 /* { dg-final { scan-tree-dump-times "loop with 8 iterations completely unrolled" 2 "cunroll" } } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr61743-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr61743-2.c
index 7bc8e353f12..92b02f5a98c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr61743-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr61743-2.c
@@ -50,4 +50,3 @@ int foo1 (e_u8 a[4][N], int b1, int b2, e_u8 b[M+1][4][N])
 
 /* { dg-final { scan-tree-dump-times "loop with 4 iterations completely unrolled" 2 "cunroll" } } */
 /* { dg-final { scan-tree-dump-times "loop with 8 iterations completely unrolled" 2 "cunroll" } } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr62112-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr62112-1.c
index ea3f29b3a6f..8334bd46787 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr62112-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr62112-1.c
@@ -20,4 +20,3 @@ char*i(){
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead call" 4 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr62112-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr62112-2.c
index c5bc9222896..c4cc4b0ae48 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr62112-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr62112-2.c
@@ -14,4 +14,3 @@ void h(){
 }
 
 /* { dg-final { scan-tree-dump-not "Deleted dead" "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr64183.c b/gcc/testsuite/gcc.dg/tree-ssa/pr64183.c
index 0563739c169..1c87d6ac586 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr64183.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr64183.c
@@ -18,4 +18,3 @@ test ()
 }
 
 /* { dg-final { scan-tree-dump "Loop 2 iterates at most 4 times" "cunroll"} } */
-/* { dg-final { cleanup-tree-dump "cunroll" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr64705.c b/gcc/testsuite/gcc.dg/tree-ssa/pr64705.c
index 35a696168f5..7850e015012 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr64705.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr64705.c
@@ -24,4 +24,3 @@ int foo(char *flags, long len, long i, long steps)
 /* Don't expand iv {base+step, step}_loop into {base+x+y, step}_loop
    even if "step == x + y".  */
 /* { dg-final { scan-tree-dump "base step_\[0-9\]* \\+ iter|base iter_\[0-9\]* \\+ step" "ivopts"} } */
-/* { dg-final { cleanup-tree-dump "ivopts" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr64801.c b/gcc/testsuite/gcc.dg/tree-ssa/pr64801.c
index ad2743420ce..ef3698964e9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr64801.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr64801.c
@@ -18,4 +18,3 @@ psmouse_extensions (void)
   a = b ();
 }
 /* { dg-final { scan-tree-dump-not "fsp_detect" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr65136.c b/gcc/testsuite/gcc.dg/tree-ssa/pr65136.c
index 4238bcbb8d7..b07dbb75f54 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr65136.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr65136.c
@@ -13,4 +13,3 @@ int foo(unsigned int cc )
 }
 
 /* { dg-final { scan-rtl-dump-not "_\[0-9\]* = 1;" "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr65447.c b/gcc/testsuite/gcc.dg/tree-ssa/pr65447.c
index c5bddbfba92..5f89a684dbc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr65447.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr65447.c
@@ -51,4 +51,3 @@ void foo (double *p)
 
 /* We should groups address type IV uses.  */
 /* { dg-final { scan-tree-dump-not "\\nuse 2\\n" "ivopts" } }  */
-/* { dg-final { cleanup-tree-dump "ivopts" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-1.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-1.c
index f1e52e5d8c2..062b3da71ce 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-1.c
@@ -48,4 +48,3 @@ int main(void)
 /* Also check that we undid the transformation previously made by PRE.  */
 /* { dg-final { scan-tree-dump-times "looparound ref" 1 "pcom"} } */
 
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
index 27e53ee65cf..72539218a94 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-2.c
@@ -44,4 +44,3 @@ int main(void)
 
 /* Verify that both loops were transformed and unrolled.  */
 /* { dg-final { scan-tree-dump-times "Unrolling 2 times." 2 "pcom"} } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-3.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-3.c
index 5dfe38424bf..bfddb793e53 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-3.c
@@ -13,4 +13,3 @@ void test(void)
 
 /* Verify that we used 3 temporary variables for the loop.  */
 /* { dg-final { scan-tree-dump-times "Unrolling 3 times." 1 "pcom"} } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
index c29a46ac2e7..3244c1d0227 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-4.c
@@ -27,4 +27,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "Combination" 1 "pcom"} } */
 /* { dg-final { scan-tree-dump-times "Unrolling 3 times." 1 "pcom"} } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
index 29444abe579..7ad0d79e398 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-5.c
@@ -27,4 +27,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "Combination" 2 "pcom"} } */
 /* { dg-final { scan-tree-dump-times "Unrolling 3 times." 1 "pcom"} } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/predcom-7.c b/gcc/testsuite/gcc.dg/tree-ssa/predcom-7.c
index e7ae87ccc7a..683fb9b5d35 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/predcom-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/predcom-7.c
@@ -15,4 +15,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump "Executing predictive commoning" "pcom" } } */
-/* { dg-final { cleanup-tree-dump "pcom" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c
index dc19150ecfb..746d74bd589 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-3.c
@@ -19,4 +19,3 @@ double test(void)
 }
 
 /* { dg-final { scan-tree-dump-times "unroll factor 4" 1 "aprefetch" } } */
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c
index 11fd41f0b93..5ac62e9b184 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-4.c
@@ -14,4 +14,3 @@ void foo (int n)
 }
 
 /* { dg-final { scan-tree-dump-times "prefetch" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
index 1ccf50693eb..f2b1d08d0ec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-5.c
@@ -56,4 +56,3 @@ int loop5 (int n, struct tail5 *x)
 
 /* { dg-final { scan-tree-dump-times "Issued prefetch" 2 "aprefetch" } } */
 /* { dg-final { scan-tree-dump-times "Not prefetching" 1 "aprefetch" } } */
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c
index 176830580a9..4425c7e5c6a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-6.c
@@ -51,4 +51,3 @@ double test(void)
 /* { dg-final { scan-assembler-times "prefetcht" 5 } } */
 /* { dg-final { scan-assembler-times "prefetchnta" 3 } } */
 
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c
index 5c469ba00e5..713dee6e121 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-7.c
@@ -44,5 +44,3 @@ void test(int *p)
 /* { dg-final { scan-assembler-times "prefetcht" 1 } } */
 /* { dg-final { scan-assembler-times "prefetchnta" 1 } } */
 
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c
index 705d35fe24f..c25bbe83c13 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-8.c
@@ -23,5 +23,3 @@ void test()
 /* { dg-final { scan-assembler "movnti" } } */
 /* { dg-final { scan-assembler-times "mfence" 1 } } */
 
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c
index f78bea3a49b..a4f3fa46c0a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/prefetch-9.c
@@ -27,5 +27,3 @@ void test()
 /* { dg-final { scan-assembler "movnti" } } */
 /* { dg-final { scan-assembler-times "mfence" 1 } } */
 
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c
index 9c8ec3034f3..59408fa0671 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c
@@ -23,5 +23,4 @@ int bar (int b)
 }
 
 /* { dg-final { scan-tree-dump "CALLUSED = { ESCAPED NONLOCAL f.* i q }" "alias" } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-1.c
index f02d32a479b..fcb1c74d53c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-1.c
@@ -35,4 +35,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "ESCAPED = { NULL ESCAPED NONLOCAL x }" "alias" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump "ESCAPED = { ESCAPED NONLOCAL x }" "alias" { target { keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-2.c
index b97e515ba3d..425278eecc0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-2.c
@@ -36,4 +36,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "ESCAPED = { NULL ESCAPED NONLOCAL x }" "alias" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump "ESCAPED = { ESCAPED NONLOCAL x }" "alias" { target { keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-3.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-3.c
index 280b4b221e2..b0f36ed8186 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-escape-3.c
@@ -40,4 +40,3 @@ int main()
 
 /* { dg-final { scan-tree-dump "ESCAPED = { NULL ESCAPED NONLOCAL x }" "alias" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump "ESCAPED = { ESCAPED NONLOCAL x }" "alias" { target { keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c
index 022783df135..1ff007e505d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-fp.c
@@ -23,4 +23,3 @@ double f(double a)
 /* The points-to set of the final function pointer should be "sin cos" */
 
 /* { dg-final { scan-tree-dump-times "{ sin cos }" 1 "alias"} } */
-/* { dg-final { cleanup-tree-dump "alias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-1.c
index d4121122bbc..b56d589d7b7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-1.c
@@ -23,4 +23,3 @@ foo(int i, int j, int k, int off)
 }
 
 /* { dg-final { scan-tree-dump "q_. = { k }" "ealias" } } */
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-2.c
index 430f216da9d..be06a75ed8d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-ptrarith-2.c
@@ -23,4 +23,3 @@ foo(int i, int j, int k, int off)
 }
 
 /* { dg-final { scan-tree-dump "q_. = { i }" "ealias" } } */
-/* { dg-final { cleanup-tree-dump "ealias" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c
index 43ccd8eaab1..289e2a26e81 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-1.c
@@ -21,4 +21,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "b.._. \\\+ a.._." 1 "optimized" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times " \\\+ " 2 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c
index cdc277431ea..70794d25189 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-10.c
@@ -8,4 +8,3 @@ int main(int a, int b, int c, int d)
   return e & f;
 }
 /* { dg-final { scan-tree-dump-times "\\\& " 3 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c
index f48f04e9980..171dcc77e7d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-11.c
@@ -8,4 +8,3 @@ int main(int a, int b, int c, int d)
   return e ^ f;
 }
 /* { dg-final { scan-tree-dump-times "= 0" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-12.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-12.c
index 65e2931ad4a..9a138ebcf70 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-12.c
@@ -8,4 +8,3 @@ int f(int a, int b)
   return d;
 }
 /* { dg-final { scan-tree-dump-times "Equivalence:" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-13.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-13.c
index f05401cba1f..799772535cf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-13.c
@@ -11,5 +11,3 @@ double foo(double a)
 
 /* { dg-final { scan-tree-dump-not "\\\+ 0.0" "reassoc1" } } */
 /* { dg-final { scan-tree-dump "return a_..D.;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-14.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-14.c
index 5b57160bcd6..62802d16ed3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-14.c
@@ -22,4 +22,3 @@ unsigned int test2 (unsigned int x, unsigned int y, unsigned int z,
 /* There should be one multiplication left in test1 and three in test2.  */
 
 /* { dg-final { scan-tree-dump-times "\\\*" 4 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-15.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-15.c
index df6fd52136f..3d395757972 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-15.c
@@ -18,4 +18,3 @@ unsigned int test3 (unsigned int x, unsigned int y, unsigned int z,
    ???  This pattern is not recognized currently.  */
 
 /* { dg-final { scan-tree-dump-times "\\\*" 4 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-16.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-16.c
index 4dd54a8cba9..4a78e8e8750 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-16.c
@@ -13,4 +13,3 @@ double test1 (double x, double y, double z, double weight)
    be gone.  */
 
 /* { dg-final { scan-tree-dump-times "/" 1 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-17.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-17.c
index 255c786d737..396c590b291 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-17.c
@@ -13,4 +13,3 @@ double test2 (double x, double y, double ddj, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "/" 1 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-18.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-18.c
index ab7fe295aa3..417fe2b5073 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-18.c
@@ -9,4 +9,3 @@ ETree_nFactorEntriesInFront (unsigned int b, unsigned int m)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\*" 2 "reassoc1" } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-19.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-19.c
index bbaf69b40e2..e911bfcd521 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-19.c
@@ -19,4 +19,3 @@ void foo(char* left, char* rite, int element)
 /* { dg-final { scan-tree-dump-times "= \\\(sizetype\\\) element" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= -" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\\+ " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-2.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-2.c
index c5787ab5a5b..6b97381c91c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-2.c
@@ -17,4 +17,3 @@ int b0, b1, b2, b3, b4,e;
 /* We can't reassociate the expressions due to undefined signed overflow.  */
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-20.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-20.c
index f3f48a1b1b7..3d2ea6b6c75 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-20.c
@@ -17,4 +17,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "\[ab\].._. \\\+ \[ab\].._." 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\\+ " 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-21.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-21.c
index e02de1b4731..99e059c4a4f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-21.c
@@ -16,4 +16,3 @@ unsigned int f (unsigned int a0, unsigned int a1, unsigned int a2,
 }
 
 /* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-22.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-22.c
index 7eb97f45622..131f33279c9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-22.c
@@ -10,4 +10,3 @@ unsigned int foo(unsigned int a, unsigned int b, unsigned int c, unsigned int d)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\+ 8" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-23.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-23.c
index 65aee7237ac..0ab967d20ab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-23.c
@@ -14,4 +14,3 @@ foo(unsigned int a, unsigned int b, unsigned int c, unsigned int d,
 }
 
 /* { dg-final { scan-tree-dump-times "= 20" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-24.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-24.c
index c871628abc6..4503cd74009 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-24.c
@@ -22,4 +22,3 @@ foo (void)
 /* Verify there are two pairs of __asm__ statements with no
    intervening stmts.  */
 /* { dg-final { scan-tree-dump-times "__asm__\[^;\n]*;\n *__asm__" 2 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-25.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-25.c
index 4ff66ef8d05..553736bc391 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-25.c
@@ -16,4 +16,3 @@ foo (int a, int b, int c, int d)
 
 /* Verify reassociation width was chosen to be 2.  */
 /* { dg-final { scan-tree-dump-times "Width = 2" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-27.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-27.c
index f406beb2fd1..05d39c1f173 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-27.c
@@ -8,4 +8,3 @@ double baz (double foo, double bar)
 
 /* We should re-associate this as (foo * bar)**3.  */
 /* { dg-final { scan-tree-dump-times " \\\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
index 42a1c651100..3432a7e5fe0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-32.c
@@ -26,4 +26,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing range tests .* 26" 1 "reassoc1"} }*/
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
index 5985f6019b8..9a5517dc947 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-33.c
@@ -24,4 +24,3 @@ main ()
   return 0;
 }
 /* { dg-final { scan-tree-dump-times "Optimizing range tests" 3 "reassoc1"} }*/
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
index 81fd5685fa0..3b568cb6aed 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-34.c
@@ -21,4 +21,3 @@ int main ()
   return 0;
 }
 /* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
index 6d28b10772e..55902eb0ece 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-35.c
@@ -23,4 +23,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
index 650bef9bb00..800aac0b13c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-36.c
@@ -22,4 +22,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing range tests" 1 "reassoc1"} }*/
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-37.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-37.c
index 5f5d36fbb07..624b2a857ec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-37.c
@@ -14,4 +14,3 @@ foo (int x)
 /* Check if the tests have been folded into a bit test.  */
 /* { dg-final { scan-tree-dump "(8784908|0x0*860c0c)" "optimized" { target i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump "(<<|>>)" "optimized" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-38.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-38.c
index b894339997b..28404adcb04 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-38.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-38.c
@@ -15,4 +15,3 @@ foo (int x)
 /* Check if the tests have been folded into a bit test.  */
 /* { dg-final { scan-tree-dump "(614180323407|0x0*8f0000004f)" "optimized" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
 /* { dg-final { scan-tree-dump "(<<|>>)" "optimized" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 } } } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c
index 8f9de464e8d..4b8519a701c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-4.c
@@ -15,4 +15,3 @@ int main(void)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\+" 2 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c
index 8d168f90f93..1e2adf69879 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-5.c
@@ -14,4 +14,3 @@ int main(int argc, int b)
     }
 }
 /* { dg-final { scan-tree-dump-times "a - i" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c
index 480f7c0161d..c3142768698 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-6.c
@@ -12,4 +12,3 @@ int main(int a, int b, int c, int d)
 /* We cannot re-associate the additions due to undefined signed overflow.  */
 
 /* { dg-final { scan-tree-dump-times "\\\+ 8" 1 "reassoc1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c
index ee9b80fd9c3..6314c7886d6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-7.c
@@ -13,4 +13,3 @@ foo(unsigned int a, unsigned int b, unsigned int c, unsigned int d,
 }
 
 /* { dg-final { scan-tree-dump-times "\\\+ 15" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c
index b2ca4ae0302..3164b1a52f8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-8.c
@@ -10,4 +10,3 @@ int main(int a, int b, int c, int d, int e, int f, int g, int h)
   return e;
 }
 /* { dg-final { scan-tree-dump-times "= 0" 1 "reassoc1"} } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c
index d09303ccfde..bb9d971f904 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/reassoc-9.c
@@ -15,4 +15,3 @@ int main(int a, int b, int c, int d, int e, int f, int g, int h)
    implementation does not allow easy roll-back without IL changes.  */
 
 /* { dg-final { scan-tree-dump-times "= 20" 1 "reassoc1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "reassoc1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-1.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-1.c
index 36f2c23ded7..cbe5478214b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-1.c
@@ -11,4 +11,3 @@ float e(float *x, float *y, float *z)
 
 /* Look for only one division.  */
 /* { dg-final { scan-tree-dump-times "= .* /" 1 "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
index be754145e7d..32820d4ade1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-2.c
@@ -32,4 +32,3 @@ void e(float a, float b, float c, float d, float e, float f)
 
 /* { dg-final { scan-tree-dump-times " / " 2 "recip" } } */
 /* { dg-final { scan-tree-dump-times " \\* " 5 "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c
index 04b40f32a73..638bf38db8c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-3.c
@@ -24,4 +24,3 @@ float h ()
 }
 
 /* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c
index 20d7681d28d..0e2dee58411 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-4.c
@@ -42,4 +42,3 @@ float g ()
 }
 
 /* { dg-final { scan-tree-dump-not "reciptmp" "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c
index aafa98f1653..9a905b37796 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-5.c
@@ -27,6 +27,4 @@ double f1(double y, double z, double w, double j, double k)
 
 /* { dg-final { scan-tree-dump-times " / " 3 "recip" } } */
 /* { dg-final { scan-tree-dump-times " / " 2 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c
index a4cf444b43b..b5d537a6ccd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-6.c
@@ -26,5 +26,4 @@ void f1(double y, double z, double w)
 }
 
 /* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c b/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c
index 98bbdca6e2c..13fca0b0e09 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/recip-7.c
@@ -27,5 +27,4 @@ void f(int x, double z, double w)
 }
 
 /* { dg-final { scan-tree-dump-times " / " 1 "recip" } } */
-/* { dg-final { cleanup-tree-dump "recip" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c
index 95cc1a2e3a2..e9e1438540c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-3.c
@@ -15,4 +15,3 @@ void f(int * __restrict__ r,
 /* We should apply store motion to the store to *r.  */
 
 /* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-4.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-4.c
index 7bcdcdd053a..e140be54d75 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-4.c
@@ -23,4 +23,3 @@ bar (int *x, int y)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1;" 2 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c
index d6c240aae03..6dd4c99bc93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-5.c
@@ -21,4 +21,3 @@ void g(int *r, int a[16][16], int b[16][16], int i, int j)
 /* We should apply store motion to the store to *r.  */
 
 /* { dg-final { scan-tree-dump "Executing store motion of \\\*r" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sccp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/sccp-1.c
index 633a37a35fe..73c10797ae2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sccp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sccp-1.c
@@ -12,4 +12,3 @@ int main(int argc, char* argv[])
 /* There should be no loop left.  */
 
 /* { dg-final { scan-tree-dump-times "goto" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-3.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-3.c
index 4aeb511ef74..dc072a998fa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-3.c
@@ -16,4 +16,3 @@ f(int k)
 }
 
 /* { dg-final { scan-tree-dump-times "&a" 1 "optimized" { xfail { lp64 || llp64 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-4.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-4.c
index a4905f2d082..927b6605e98 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-4.c
@@ -21,4 +21,3 @@ f(int k)
 }
 
 /* { dg-final { scan-tree-dump-times "&a" 1 "optimized" { xfail { lp64 || llp64 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-5.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-5.c
index 8c917aeaf75..3f4a9cde2c2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-5.c
@@ -16,4 +16,3 @@ f(int k)
 }
 
 /* { dg-final { scan-tree-dump-times "&a" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-6.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-6.c
index 3b02374a18b..5d609082498 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-6.c
@@ -20,4 +20,3 @@ int main()
    of the loop.  */
 
 /* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c
index d6ceb208258..5dfc7b11040 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-7.c
@@ -15,4 +15,3 @@ void foo (struct struct_t* sp, int start, int end)
 }
 
 /* { dg-final { scan-tree-dump-times "Simplify PEELED_CHREC into POLYNOMIAL_CHREC" 1 "sccp" } } */
-/* { dg-final { cleanup-tree-dump "sccp" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/scev-cast.c b/gcc/testsuite/gcc.dg/tree-ssa/scev-cast.c
index ff645fac2ca..c569523ffa7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/scev-cast.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/scev-cast.c
@@ -25,4 +25,3 @@ void tst(void)
 /* { dg-final { scan-tree-dump-times "& 255" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "= \\(signed char\\)" 1 "optimized" } } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/shorten-1.c b/gcc/testsuite/gcc.dg/tree-ssa/shorten-1.c
index c9015c58aa6..cecdd44a619 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/shorten-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/shorten-1.c
@@ -76,4 +76,3 @@ pssfubar (int indx)
 /* And two return values should have been casted from unsigned char to
    a normal char.  */
 /* { dg-final {scan-tree-dump-times "\\(signed char\\)" 4 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-1.c
index e8c0ff02133..1a3b28ec54e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-1.c
@@ -19,4 +19,3 @@ f (int *p, unsigned int n)
 /* { dg-final { scan-tree-dump-times "\\+ 32|\\, 32>" 1 "optimized" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 192|\\, 192>" 1 "optimized" { target { int32 } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 96|\\, 96>" 1 "optimized" { target { int16 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-10.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-10.c
index f131dae3b48..2d233be7f89 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-10.c
@@ -20,4 +20,3 @@ f (int s, int c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-11.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-11.c
index 6f77d518574..1483d300c9b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-11.c
@@ -21,4 +21,3 @@ f (int s, long c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-12.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-12.c
index 558b3594e74..f92b70ffafb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-12.c
@@ -27,4 +27,3 @@ f (int s, int c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-13.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-13.c
index 5cdfb9d37a2..4133694174c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-13.c
@@ -22,4 +22,3 @@ f (int s, int c)
 
 /* { dg-final { scan-tree-dump-times " \\* 4" 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 5" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-14.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-14.c
index 19413454944..ffb033471d1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-14.c
@@ -29,4 +29,3 @@ f (int n, int c, int s)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-15.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-15.c
index 98d2df87040..a2e11d2d803 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-15.c
@@ -24,4 +24,3 @@ f (int n, int c, int s)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-16.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-16.c
index 5fe0175cb9e..9e34ed755ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-16.c
@@ -25,4 +25,3 @@ f (int n, int c, int s)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-17.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-17.c
index 3da203c205e..4b2baef7721 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-17.c
@@ -28,4 +28,3 @@ f (int n, int c, int s)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-18.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-18.c
index b8d368ea4b0..79db6a2b4c6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-18.c
@@ -29,4 +29,3 @@ f (int n, int c, int s)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-19.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-19.c
index abbb3c3639e..d943b7c7cd8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-19.c
@@ -18,5 +18,4 @@ f (int c, int s)
 
 /* { dg-final { scan-tree-dump-times " \\* " 2 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 2;" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-2.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-2.c
index 56697ff7f88..ac3eab1f7aa 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-2.c
@@ -15,4 +15,3 @@ f (int *p, int n)
 /* { dg-final { scan-tree-dump-times "\\+ 72|\\, 72>" 1 "optimized" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 96|\\, 96>" 1 "optimized" { target { int32 } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 48|\\, 48>" 1 "optimized" { target { int16 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-20.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-20.c
index cf3e1b3a0e7..a2ea8c94889 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-20.c
@@ -18,4 +18,3 @@ f (int c, int s)
 
 /* { dg-final { scan-tree-dump-times " \\* s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 2" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-21.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-21.c
index c32afb2aac0..506e3d291b1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-21.c
@@ -29,4 +29,3 @@ f (int n, int x, int stride)
 
 /* { dg-final { scan-tree-dump-times " \\* stride" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 3" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-22.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-22.c
index 6e56d9bb451..dfda514414c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-22.c
@@ -26,4 +26,3 @@ f (int n, int x, int stride)
 
 /* { dg-final { scan-tree-dump-times " \\* stride" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 3" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-23.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-23.c
index 88bd087de30..a025cbeec9f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-23.c
@@ -26,4 +26,3 @@ f (int n, int x, int stride)
 
 /* { dg-final { scan-tree-dump-times " \\* stride" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 3" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-24.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-24.c
index 04e093be540..f46c3892d20 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-24.c
@@ -28,4 +28,3 @@ f (int n, int x, int stride)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-25.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-25.c
index 9e16e0476cd..9052e2a9bbb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-25.c
@@ -28,4 +28,3 @@ f (int n, int x, int stride)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-26.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-26.c
index c333e00bb62..e27250a0ea0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-26.c
@@ -29,4 +29,3 @@ f (int n, int x, int stride)
 
 /* { dg-final { scan-tree-dump-times " \\* stride" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 3" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c
index c6642627d1f..ba7b060d599 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-27.c
@@ -20,4 +20,3 @@ f (struct x *p, unsigned int n)
 /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom2" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+;" 1 "dom2" } } */
 /* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 3 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c
index c4dbf54db86..5ea7098492d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-28.c
@@ -24,4 +24,3 @@ f (struct x *p, unsigned int n)
 /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom2" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom2" } } */
 /* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c
index c8e7a5e137b..26d4558481d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-29.c
@@ -26,4 +26,3 @@ f (struct x *p, unsigned int n)
 /* { dg-final { scan-tree-dump-times "\\* 2;" 1 "dom2" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "p_\\d\+\\(D\\) \\+ \[^\r\n\]*_\\d\+" 1 "dom2" } } */
 /* { dg-final { scan-tree-dump-times "MEM\\\[\\(struct x \\*\\)\[^\r\n\]*_\\d\+" 9 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-3.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-3.c
index 89d1d2e73fd..cbf261e5a39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-3.c
@@ -22,4 +22,3 @@ foo (int a[], int b[], int i)
 /* { dg-final { scan-tree-dump-times "\\+ 8|\\, 8>" 1 "optimized" { target { int32plus } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 6|\\, 6>" 1 "optimized" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump-times "\\+ 12|\\, 12>" 1 "optimized" { target { int32 } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c
index 5fea3d3db82..a357239c4f5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-30.c
@@ -21,4 +21,3 @@ f (int s, long c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 3 "dom2" } } */
-/* { dg-final { cleanup-tree-dump "dom2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-31.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-31.c
index edf31294a2e..149db618ca5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-31.c
@@ -24,4 +24,3 @@ f (int s, int c)
 
 /* { dg-final { scan-tree-dump-times " \\* 2" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* -2" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
index 73e67974338..eb0d1377a67 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-32.c
@@ -29,4 +29,3 @@ f (int s, int c, int i)
 
 /* { dg-final { scan-tree-dump-times " \\* s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 2" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
index 5cd4276577b..c8f985db348 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-33.c
@@ -28,4 +28,3 @@ f (int c, int i)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
index 3593f869b6b..d7ede2efe8c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-34.c
@@ -40,4 +40,3 @@ f (int c, int i)
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "PHI" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
index 3f4d136171a..0f57ea20b79 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-35.c
@@ -25,4 +25,3 @@ f (int c, int i)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
index 8cb09e0cf50..448d5d2cff1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-36.c
@@ -26,4 +26,3 @@ f (int s, int c, int i)
 
 /* { dg-final { scan-tree-dump-times " \\* s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 2" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
index fb13b20e142..2c6a4b041b2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-37.c
@@ -30,4 +30,3 @@ f (int s, int c, int i)
 
 /* { dg-final { scan-tree-dump-times " \\* s" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times " \\* 2" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
index 1a0ab79bd55..c6681e901eb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-38.c
@@ -29,4 +29,3 @@ f (int c, int i)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-39.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-39.c
index c1462195c9d..4a27ede1541 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-39.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-39.c
@@ -23,4 +23,3 @@ void foo (arr_2 a2, int v1)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing reference: " 4 "slsr" } } */
-/* { dg-final { cleanup-tree-dump "slsr" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-4.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-4.c
index 413a1cc27ab..17d7b4c6951 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-4.c
@@ -33,5 +33,3 @@ f (int i)
 /* { dg-final { scan-tree-dump-times "\\* 10" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\\+ 200" 1 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "\\+ 40" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "slsr" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-41.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-41.c
index 2c9d90880b8..0c23adaee38 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-41.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-41.c
@@ -21,4 +21,3 @@ void foo (arr_2 a2, int v1)
 }
 
 /* { dg-final { scan-tree-dump-times "Replacing reference: " 5 "slsr" } } */
-/* { dg-final { cleanup-tree-dump "slsr" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-5.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-5.c
index 8612febc4e1..88e36cfff60 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-5.c
@@ -19,4 +19,3 @@ f (int s, int c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-6.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-6.c
index 56b167731c4..56d90e1d3a1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-6.c
@@ -22,4 +22,3 @@ f (int s, char *c, char *x1, char *x2, char *x3)
 
 /* There will be four ' * ' instances for the parms, one in the code.  */
 /* { dg-final { scan-tree-dump-times " \\* " 5 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-7.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-7.c
index ace755f07ab..122cd9c4d47 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-7.c
@@ -19,4 +19,3 @@ f (int s, int c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c
index e78e9c004bd..2bd60aad546 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-8.c
@@ -21,4 +21,3 @@ f (int s, int *c)
    added), 1 parm, 2 in the code.  The second one in the code can be
    a widening mult.  */
 /* { dg-final { scan-tree-dump-times " w?\\* " 7 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/slsr-9.c b/gcc/testsuite/gcc.dg/tree-ssa/slsr-9.c
index 3a388731ee1..29cd9f086b5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/slsr-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/slsr-9.c
@@ -20,4 +20,3 @@ f (int s, int c)
 }
 
 /* { dg-final { scan-tree-dump-times " \\* " 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-1.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-1.c
index fbf7ba65ad7..c207c1f3af2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-1.c
@@ -72,4 +72,3 @@ copystruct111111 (teststruct param)
 
 /* There should be no referenc to link_error. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-10.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-10.c
index 49bfa31fa8e..8dc93e12c93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-10.c
@@ -16,4 +16,3 @@ void foo (struct S *s, int i)
 }
 
 /* { dg-final { scan-tree-dump-times "disappear" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-11.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-11.c
index c8a90eac59d..282f327bbad 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-11.c
@@ -30,4 +30,3 @@ int foo2 (void)
 
 /* { dg-final { scan-tree-dump-times "Created a replacement for s1" 0 "esra"} } */
 /* { dg-final { scan-tree-dump-times "Created a replacement for s2" 1 "esra"} } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-12.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-12.c
index bb70a03ee3a..427f7afefb8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-12.c
@@ -22,4 +22,3 @@ int foo (struct S *p)
 }
 
 /* { dg-final { scan-tree-dump-times "l;" 0 "release_ssa" { target { ! "aarch64*-*-* avr*-*-* nds32*-*-* sh*-*-*" } } } } */
-/* { dg-final { cleanup-tree-dump "release_ssa" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-2.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-2.c
index 5306a3d37b8..e838ea4fba3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-2.c
@@ -25,4 +25,3 @@ copystruct11 (teststruct *param)
 
 /* There should be no reference to link_error. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-3.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-3.c
index d8908152384..e1d7af7775a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-3.c
@@ -25,4 +25,3 @@ copystruct1 (void)
 
 /* There should be no reference to link_error. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-4.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-4.c
index e6ca7561f7f..2ebcb051424 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-4.c
@@ -22,4 +22,3 @@ vector int f(vector int t1, vector int t2)
 }
 
 /* { dg-final { scan-tree-dump-times "st" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-5.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-5.c
index 5ed7a754053..1e82e8fe4ef 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-5.c
@@ -72,4 +72,3 @@ copyunion111111 (testunion param)
 
 /* There should be no reference to link_error. */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-6.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-6.c
index 90d9a7d7cee..0dc8b3233c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-6.c
@@ -34,8 +34,6 @@ void cow (int i)
 /* { dg-final { scan-tree-dump "expr = b.i1"  "esra"} } */
 /* { dg-final { scan-tree-dump "expr = c.d"  "esra"} } */
 /* { dg-final { scan-tree-dump "expr = c.i1"  "esra"} } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
 
 /* There should be no reference to link_error.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-7.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-7.c
index 325a329f343..0ad02179d2f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-7.c
@@ -10,4 +10,3 @@ void a(s *s1, s *s2)
 
 /* Struct copies should not be split into members.  */
 /* { dg-final { scan-tree-dump "\\\*s1_.\\\(D\\\) = \\\*s2"  "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-8.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-8.c
index d43bbe0d8a3..a1c5cae70ae 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-8.c
@@ -32,4 +32,3 @@ void bar2(int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "Created a replacement" 0 "esra"} } */
-/* { dg-final { cleanup-tree-dump "esra" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/sra-9.c b/gcc/testsuite/gcc.dg/tree-ssa/sra-9.c
index 54f42179e68..91983a206fe 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/sra-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/sra-9.c
@@ -17,4 +17,3 @@ int foo (int d)
 
 /* There should be no reference to s.b.  */
 /* { dg-final { scan-tree-dump-times "= s\.b" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-1.c
index 82f37abc875..0038f33e434 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-1.c
@@ -72,4 +72,3 @@ void test11111 (int p, int q, int r)
 /* There should be not link_error calls, if there is any the
    optimization has failed */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c
index 572ad34eed2..d6126a3e8ef 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-10.c
@@ -33,4 +33,3 @@ middle:
 
 /* There should be no calls to strlen.  */
 /* { dg-final { scan-tree-dump-times "strlen" 0 "fab1"} } */
-/* { dg-final { cleanup-tree-dump "fab1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-11.c
index 4eaad28b177..36b8e7fc8fd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-11.c
@@ -39,4 +39,3 @@ int test1111 (int param)
 
 /* All ifs should be eliminated. */
 /* { dg-final { scan-tree-dump-times "if " 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-13.c
index d35adee514d..baaee30fc1b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-13.c
@@ -10,5 +10,4 @@ int foo()
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-14.c
index 3be025f079f..3955bddcf59 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-14.c
@@ -18,4 +18,3 @@ void bar (void)
 
 /* Everything except for the "i = 0" assignment should get removed.  */
 /* { dg-final { scan-tree-dump-times "if" 0 "optimized" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-15.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-15.c
index aaf57126a64..3ee703b7291 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-15.c
@@ -46,4 +46,3 @@ void test3 (int param1, int param2)
 }
 
 /* { dg-final { scan-tree-dump-times "link_error" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-16.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-16.c
index 33f9744d37d..d24746d0e94 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-16.c
@@ -19,4 +19,3 @@ int test2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0;" 2 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-17.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-17.c
index 338d8a86297..b12ef2c22ea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-17.c
@@ -29,4 +29,3 @@ int foobar(void)
 /* { dg-final { scan-tree-dump "= i_.;" "ccp1" } } */
 /* { dg-final { scan-tree-dump "= f.i;" "ccp1" } } */
 /* { dg-final { scan-tree-dump "= g.i;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c
index cbe12598b46..2ab12626088 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-18.c
@@ -17,4 +17,3 @@ void func2(int* val)
 
 /* { dg-final { scan-tree-dump-not "a \\\(" "ccp1" } } */
 /* { dg-final { scan-tree-dump-not "b \\\(" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-19.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-19.c
index c67373f017e..d248126a346 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-19.c
@@ -13,4 +13,3 @@ int g()
 }
 
 /* { dg-final { scan-tree-dump "= MEM\\\[\\\(int \\\*\\\)&a\\\];" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-2.c
index a52fd6e80a7..146b76c49f6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-2.c
@@ -169,4 +169,3 @@ int test99999 (void)
 /* There should be not link_error calls, if there is any the
    optimization has failed */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-20.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-20.c
index 63febd0e04f..9ee03c64643 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-20.c
@@ -12,4 +12,3 @@ int foo (void)
 }
 
 /* { dg-final { scan-tree-dump "return 10;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-21.c
index 3f4adf43483..de57b54da2c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-21.c
@@ -26,4 +26,3 @@ int bar (void)
 
 /* { dg-final { scan-tree-dump-times "a.b.i" 1 "ccp1" } } */
 /* { dg-final { scan-tree-dump-times "MEM\\\[\\\(struct B \\\*\\\)&a\\\].i" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-22.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-22.c
index 01d11ecac87..b4476e6bb30 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-22.c
@@ -12,4 +12,3 @@ int foo (unsigned b)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-23.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-23.c
index 8b95b0c3438..bb131047a0e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-23.c
@@ -17,4 +17,3 @@ int foo (void)
 
 /* { dg-final { scan-tree-dump "MEM\\\[\\\(int \\\*\\\)&a \\\+ 2B\\\]" "ccp1" { target { int16 } } } } */
 /* { dg-final { scan-tree-dump "MEM\\\[\\\(int \\\*\\\)&a \\\+ 4B\\\]" "ccp1" { target { int32 } } } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-24.c
index 84f69e9d3bd..9ee3c39e52f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-24.c
@@ -19,5 +19,4 @@ int bar()
 }
 
 /* { dg-final { scan-tree-dump-times "return 1;" 2 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-27.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-27.c
index c2796345471..243d7217414 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-27.c
@@ -21,4 +21,3 @@ f2 ()
 }
 
 /* { dg-final { scan-tree-dump-times "memcpy\[^\n\]*123456" 2 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-28.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-28.c
index f5dbe70b3d0..99ebbd35ab8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-28.c
@@ -23,4 +23,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "= p;" 0 "ccp1" } } */
 /* { dg-final { scan-tree-dump-times "= q;" 0 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
index 44d2945a311..3c1a848f50b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-29.c
@@ -8,4 +8,3 @@ int foo (void)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "ccp2" } } */
-/* { dg-final { cleanup-tree-dump "ccp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
index 86a706b80ef..1c8c318ce4f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-3.c
@@ -134,4 +134,3 @@ int* test666 (int * __restrict__ rp1, int * __restrict__ rp2, int *p1)
 /* ??? While we indeed don't handle some of these, a couple of the
    restrict tests are incorrect.  */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "ccp2" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "ccp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-30.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-30.c
index 47675ed5d31..d9eb9c397f5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-30.c
@@ -12,4 +12,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate b_.* > 300 to 0" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-31.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-31.c
index d4bc1990526..12d7feb6072 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-31.c
@@ -18,4 +18,3 @@ int g (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 1" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-34.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-34.c
index 5d12beaf4cd..ce8f98535bf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-34.c
@@ -9,4 +9,3 @@ int foo (int x)
 }
 
 /* { dg-final { scan-tree-dump-times "\\+" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-35.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-35.c
index 7cf3a4c844d..2f93ba5fae4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-35.c
@@ -12,4 +12,3 @@ int f5 (int i)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-36.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-36.c
index bd72fbd6697..911038391ab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-36.c
@@ -12,4 +12,3 @@ int foo (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump "return 1;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-37.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-37.c
index 518448273a4..892c1723e56 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-37.c
@@ -11,4 +11,3 @@ int foo (int i)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-7.c
index b3497413064..0fa66969bed 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-7.c
@@ -24,4 +24,3 @@ int test7 (int a)
 /* There should be not link_error calls, if there is any the
    optimization has failed */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-9.c
index af23f8bebd9..d6738667c4a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ccp-9.c
@@ -52,4 +52,3 @@ test99999 (int *arr, int j)
 /* There should be no link_error calls, if there is any, the
    optimization has failed */
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-1.c
index 41ad6ce6e34..ed0dcac1ed5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-1.c
@@ -9,4 +9,3 @@ int foo(A *a, int i)
 }
 
 /* { dg-final { scan-tree-dump "return i" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-2.c
index 9757013918e..e4c9df2b486 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-copyprop-2.c
@@ -10,4 +10,3 @@ f(void)
 }
 
 /* { dg-final { scan-tree-dump-not "PHI" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c
index 80d8d6ba315..4a8c6b6d5cd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-1.c
@@ -11,4 +11,3 @@ q()
 }
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dce2"} } */
-/* { dg-final { cleanup-tree-dump "dce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c
index 5e5302486d0..6281a1e7fa5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-2.c
@@ -14,4 +14,3 @@ void q(void)
 }
 /* There should be no IF conditionals.  */
 /* { dg-final { scan-tree-dump-times "if " 0 "dce2"} } */
-/* { dg-final { cleanup-tree-dump "dce2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-3.c
index 72020aac7f3..64b30ca1eb3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-3.c
@@ -32,4 +32,3 @@ int main(void)
 /* And one if (for the exit condition of the loop):  */
 /* { dg-final { scan-tree-dump-times "if " 1 "cddce1" } } */
 
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-4.c
index 261880cc240..c4e142e35da 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-4.c
@@ -17,4 +17,3 @@ int foo(int b)
 /* Verify DCE removes all accesses to a but the last store and the
    read from a[2].  */
 /* { dg-final { scan-tree-dump-times "a\\\[\[^\n\]\\\]" 2 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-5.c
index 11c9e666b3c..eb1b9dfa7e3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-5.c
@@ -12,4 +12,3 @@ struct X foo(int b)
 }
 
 /* { dg-final { scan-tree-dump-times "x.i =" 1 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-6.c
index 30a06a10256..06c7b42d1a9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-6.c
@@ -21,4 +21,3 @@ void t(int x)
 /* The global store should not prevent deleting the store to p->field.  */
 
 /* { dg-final { scan-tree-dump-not "p_.->field" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-7.c
index 792dfb028af..dac837325e2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-7.c
@@ -30,4 +30,3 @@ int main()
    to the allocated memory.  */
 
 /* { dg-final { scan-tree-dump-times "\\\*D" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-8.c
index 689eb99c289..97d3dcf5520 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dce-8.c
@@ -9,4 +9,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-not "malloc" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-ccp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-ccp-1.c
index b2bcd06bedb..8efb1d88800 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-ccp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-ccp-1.c
@@ -15,4 +15,3 @@ ccp(int b)
 }
 /* We should propagate constant 4 into return.  */
 /* { dg-final { scan-tree-dump-times "return 4" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-1.c
index 70a905819cd..6116ea660c6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-1.c
@@ -13,4 +13,3 @@ threading(int a,int b)
 }
 /* We should thread the jump twice and eliminate it.  */
 /* { dg-final { scan-tree-dump-times "Replaced.* t " 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-2.c
index df1b763449c..9eccdc963e7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-2.c
@@ -21,4 +21,3 @@ foo ()
    DOM is not able to perform this optimization.  */
 
 /* { dg-final { scan-tree-dump "return 28;" "optimized" { xfail aarch64*-*-* alpha*-*-* hppa*-*-* powerpc*-*-* sparc*-*-* s390*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c
index a93eb3c2613..0711ff4e603 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-cse-3.c
@@ -28,4 +28,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump "= PHI <\[01\]\\\(.\\\), \[01\]\\\(.\\\)>" "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-dse-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-dse-1.c
index 504e4bc038d..e9048e586cc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-dse-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-dse-1.c
@@ -16,4 +16,3 @@ bar (int i)
 }
 
 /* { dg-final { scan-tree-dump-not "x =" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c
index 7671e93ad10..5e62fe5a987 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-1.c
@@ -15,4 +15,3 @@ threading(int a,int b)
 }
 /* We should thread the jump twice and elliminate it.  */
 /* { dg-final { scan-tree-dump-times "Threaded" 2 "dom1"} } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2.c
index 6aaea8ecb38..bb697d16979 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-2.c
@@ -115,5 +115,3 @@ void dont_thread_4 (int a, int nfirst)
 /* { dg-final { scan-tree-dump-times "Jumps threaded: 2" 0 "vrp1"} } */
 /* { dg-final { scan-tree-dump-times "Jumps threaded: 1" 0 "dom1"} } */
 /* { dg-final { scan-tree-dump-times "Jumps threaded: 2" 1 "dom1"} } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c
index 510118818b0..3b66d4dfdbc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c
@@ -76,5 +76,4 @@ bitmap_ior_and_compl (bitmap dst, const_bitmap a, const_bitmap b,
 	 skipping the known-true "b_elt && kill_elt" in the second
 	 condition.  */
 /* { dg-final { scan-tree-dump-times "Threaded" 4 "dom1" { target logical_op_short_circuit } } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c
index 9a984d4d558..c76db3c90cd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-5.c
@@ -20,4 +20,3 @@ void f2(int dst[3], int R)
 }
 
 /* { dg-final { scan-tree-dump "Threaded jump" "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c
index bb34a7432e1..bd1301e2934 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-6.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-dom1-details" } */
 /* { dg-final { scan-tree-dump-times "FSM" 6 "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
 
 int sum0, sum1, sum2, sum3;
 int foo (char *s, char **ret)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c
index 21474f0b496..d8be023cd57 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-7.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-dom1-details" } */
 /* { dg-final { scan-tree-dump-times "FSM" 19 "dom1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
 
 enum STATE {
   S0=0,
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-1.c
index d0263e3a287..bc4e4274b11 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-1.c
@@ -23,4 +23,3 @@ foo (int a, int b, int c)
 /* The return *p should be turned into return 4.  */
 /* { dg-final { scan-tree-dump-times " return 4" 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c
index c2e27c82dd6..f97c57503ce 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-10.c
@@ -1520,4 +1520,3 @@ void func_encode(void)
 }
 
 /* { dg-final { scan-tree-dump-times " xxxinfo = {}" 1 "dse1"} } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c
index 6e13e187501..744a8cf6249 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c
@@ -18,4 +18,3 @@ void bar(int *p)
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-12.c
index dd8f69c8aea..03477a5122a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-12.c
@@ -9,4 +9,3 @@ void foo (int *p, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "\\\*p" 1 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-13.c
index 92e0f2b5359..33f100bbe57 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-13.c
@@ -18,4 +18,3 @@ f2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c
index 1c74596adba..14234cc55fd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c
@@ -18,4 +18,3 @@ f2 (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-15.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-15.c
index cfddb30e4fa..43a41c8eb38 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-15.c
@@ -21,4 +21,3 @@ void bar (int *i)
 }
 
 /* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-16.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-16.c
index 1cc512c020f..a44991a6168 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-16.c
@@ -15,4 +15,3 @@ void foo (struct X *x, int i)
 }
 
 /* { dg-final { scan-tree-dump "Deleted dead store" "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-17.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-17.c
index c5657776957..0db5198ac1d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-17.c
@@ -17,4 +17,3 @@ void f1(struct s2 *p)
 }
 
 /* { dg-final { scan-tree-dump-times "f2 =" 1 "dse1" } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-2.c
index 104ef26df40..4270bab1510 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-2.c
@@ -21,4 +21,3 @@ foo ()
 /* { dg-final { scan-tree-dump-times " = 3" 0 "dse1"} } */
 /* { dg-final { scan-tree-dump-times " = 4" 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-3.c
index 4292f2384a5..423cd3a8ace 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-3.c
@@ -12,5 +12,4 @@ void f(void)
 /* { dg-final { scan-tree-dump-times "Bool_Glob = 0" 0 "dse1"} } */
 /* { dg-final { scan-tree-dump-times "Bool_Glob = 1" 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-4.c
index 19b33903021..8f8ad0e3f9d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-4.c
@@ -12,4 +12,3 @@ foo( int *a)
 /* { dg-final { scan-tree-dump-times "= 5" 0 "dse1"} } */
 /* { dg-final { scan-tree-dump-times "= 3" 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-5.c
index 76e2004b0eb..beeff355ad2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-5.c
@@ -29,5 +29,4 @@ f1 (int i, int j, int k)
 /* { dg-final { scan-tree-dump-times "i = 5" 1 "optimized" { xfail *-*-* }} } */
 /* { dg-final { scan-tree-dump-times "<L.*>:;\[\n\t \]*\\*p = 5" 1 "optimized" { xfail *-*-*}} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-6.c
index cf496291f8d..3486724bc64 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-6.c
@@ -16,4 +16,3 @@ int foo11 (int c)
 /* { dg-final { scan-tree-dump-times "local1 = " 1 "dse1"} } */
 /* { dg-final { scan-tree-dump-times "local2 = " 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-7.c
index 77e4a6246f3..5e188fe26c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-7.c
@@ -20,4 +20,3 @@ int foo1 (void)
 /* { dg-final { scan-tree-dump-times "glob2 = " 1 "dse1"} } */
 /* { dg-final { scan-tree-dump-times "return 5" 1 "dse1"} } */
 
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-9.c
index f249b2da3a4..594c20c9f38 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-9.c
@@ -12,4 +12,3 @@ foo ()
 
 /* We should eliminate the first assignment.  */
 /* { dg-final { scan-tree-dump-times "VDEF" 2 "dse1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-1.c
index 058d3373785..dffc08e1f52 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-1.c
@@ -12,4 +12,3 @@ int f(int *a)
 }
 
 /* { dg-final { scan-tree-dump "Replaced \\\*\[ac\]_\[^\n\].*with t_" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c
index 34217a0298a..7f2d1ebd1bb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c
@@ -23,4 +23,3 @@ void __frame_state_for (volatile char *state_in, int x)
    first store.  Thus, this is XFAILed.  */
 
 /* { dg-final { scan-tree-dump "Insertions: 2" "pre" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-11.c
index 7bef07caff6..d1d62f8acf2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-11.c
@@ -23,4 +23,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump "Replaced S\\\[5\\\].x with 4" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-12.c
index 7bef07caff6..d1d62f8acf2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-12.c
@@ -23,4 +23,3 @@ foo (int y)
 }
 
 /* { dg-final { scan-tree-dump "Replaced S\\\[5\\\].x with 4" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-13.c
index cfb72b8bcc5..0489769b78f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-13.c
@@ -24,4 +24,3 @@ void foo(double (*q)[4], struct Foo *tmp1)
 }
 
 /* { dg-final { scan-tree-dump "Replaced tmp1_.\\\(D\\\)->data with &a" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-14.c
index 2b677d5b598..4c4aa1bd6d2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-14.c
@@ -28,4 +28,3 @@ void foo(double (*q)[4])
 }
 
 /* { dg-final { scan-tree-dump "Replaced tmp1.data with &a" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-15.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-15.c
index f24d0f6ab64..c8f2d2c5ab1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-15.c
@@ -27,4 +27,3 @@ void foo(double (*q)[4])
 }
 
 /* { dg-final { scan-tree-dump "Replaced" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-16.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-16.c
index fa5f3719a25..fbf2e8873ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-16.c
@@ -15,4 +15,3 @@ int foo(int b, int c)
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-17.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-17.c
index 01f57ed7e5c..8695bcf6a2c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-17.c
@@ -19,5 +19,4 @@ int foo(int i, int j, int k)
 }
 
 /* { dg-final { scan-tree-dump "Replaced f.doms\\\[0\\\].dom with i_" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-18.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-18.c
index 986fe0781ae..c7349cfbc9b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-18.c
@@ -25,4 +25,3 @@ int f(struct a *c)
 /* We should have CSEd the load from c->a.  */
 
 /* { dg-final { scan-tree-dump-times "c_.*\\\.a" 1 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-19.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-19.c
index c121832de63..0a3e4994963 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-19.c
@@ -28,4 +28,3 @@ int f(struct a *c)
 /* We should have CSEd the load from c->a.  */
 
 /* { dg-final { scan-tree-dump-times "c_.*\\\.a" 1 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-2.c
index f85c06139f2..09e28e73b5a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-2.c
@@ -15,4 +15,3 @@ foo (long a)
 }
 
 /* { dg-final { scan-tree-dump "Replaced \\\(short int\\\) c_.*with b_" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-20.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-20.c
index f73ad36c5b7..0aeda708af7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-20.c
@@ -17,4 +17,3 @@ L2:
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c
index 219c0a926a6..e3375824462 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c
@@ -23,4 +23,3 @@ void g(void)
 }
 
 /* { dg-final { scan-tree-dump-not "a\\\.? = " "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-22.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-22.c
index 3504d1041e9..8ac609309b2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-22.c
@@ -12,4 +12,3 @@ int foo (void)
 /* We should eliminate the redundant load of i.  */
 
 /* { dg-final { scan-tree-dump-not "= i;" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-23.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-23.c
index f21360824cd..41827f6ebe9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-23.c
@@ -18,4 +18,3 @@ int f(int t, int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "PHI" 1 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-24.c
index 833a1b99d38..83bd175522e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-24.c
@@ -31,4 +31,3 @@ int bazzoo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0;" 4 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-25.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-25.c
index 5317a18c5f6..183f0219fa6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-25.c
@@ -15,4 +15,3 @@ int foo (struct X *p)
 /* We should optimize this to return 0.  */
 
 /* { dg-final { scan-tree-dump "return 0;" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-26.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-26.c
index 81d9ea0fa8e..05ce9af48c7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-26.c
@@ -16,4 +16,3 @@ int foo (union U *p)
 
 /* avr has 16 bit int and 32 bit float */
 /* { dg-final { scan-tree-dump "Replaced u.i with 0 in" "fre1" {xfail avr-*-* } } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-27.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-27.c
index ba0710171f2..5c58f7e728b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-27.c
@@ -22,4 +22,3 @@ int foo(int which_p)
 }
 
 /* { dg-final { scan-tree-dump "Replaced x with 0" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-3.c
index 762a15059dd..a287dad07f6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-3.c
@@ -19,4 +19,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump "Replaced \\\(int\\\) aa_.*with a_" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-30.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-30.c
index bfbef804d3a..26f958fb546 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-30.c
@@ -9,4 +9,3 @@ float foo(float x, float y, float z)
 }
 
 /* { dg-final { scan-tree-dump "return 0" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
index bddf78ef261..6402c81e6ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-31.c
@@ -44,4 +44,3 @@ void test4 (unsigned char x)
 
 /* { dg-final { scan-tree-dump-times "Replaced \{" 4 "fre1" } } */
 /* { dg-final { scan-tree-dump-times "Deleted redundant store" 4 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-32.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-32.c
index 792b4ab686d..8952fa49997 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-32.c
@@ -27,4 +27,3 @@ bar (_Complex float x)
 
 /* We should CSE all the way to replace the stored value with x.  */
 /* { dg-final { scan-tree-dump-times "m = x_\\d\+\\(D\\);" 2 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
index ead6a183d02..d9e53448297 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-33.c
@@ -19,4 +19,3 @@ int main(int argc)
 }
 
 /* { dg-final { scan-tree-dump "Replaced BIT_FIELD_REF.*with 2" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
index f3cefa583df..18be69349d6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-34.c
@@ -16,4 +16,3 @@ float foo(float f)
 }
 
 /* { dg-final { scan-tree-dump "Replaced BIT_FIELD_REF.*with f" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-35.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-35.c
index dfbd7c1bb48..59c61ddb5c9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-35.c
@@ -14,4 +14,3 @@ float a1 (float dd)
 }
 
 /* { dg-final { scan-tree-dump "Replaced REALPART_EXPR.*with dd" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-36.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-36.c
index a8a2dbaadbe..7ff88de8817 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-36.c
@@ -23,4 +23,3 @@ void PreEvaluate(int wtm)
 /* We should be able to CSE the second load of opening.  */
 
 /* { dg-final { scan-tree-dump "Replaced opening" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-37.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-37.c
index bd4c5ef8a28..d847e8d98ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-37.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-37.c
@@ -12,4 +12,3 @@ void foo (int i, int j)
 /* We should remove the redundant address computation.  */
 
 /* { dg-final { scan-tree-dump-times " = &a" 1 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-38.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-38.c
index 2b342db5247..c10201affb2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-38.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-38.c
@@ -18,4 +18,3 @@ int foo (int n, int i, int j)
 /* We should remove the redundant load.  */
 
 /* { dg-final { scan-tree-dump-not "= u.a\\\[n_2\\(D\\)\\\].i" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-39.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-39.c
index 4c5ed0b7895..2ced372acc9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-39.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-39.c
@@ -16,4 +16,3 @@ int foo (int i)
 /* We should be able to value-number the final assignment to k to 1.  */
 
 /* { dg-final { scan-tree-dump "return 1;" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-4.c
index 74e751072a1..02b6719ea85 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-4.c
@@ -12,4 +12,3 @@ char bar(char f)
 }
 
 /* { dg-final { scan-tree-dump "Replaced \\\(char\\\) .*with " "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-40.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-40.c
index 577f9fe8e5e..dd085a08770 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-40.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-40.c
@@ -14,4 +14,3 @@ int foo (int *p)
    aliasing store via *p is not reachable.  */
 
 /* { dg-final { scan-tree-dump-not "= x;" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-41.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-41.c
index 82ca746e173..e3e392aea66 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-41.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-41.c
@@ -9,4 +9,3 @@ int foo (void)
 }
 
 /* { dg-final { scan-tree-dump-not "ffs" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-42.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-42.c
index c90bb0de957..a87fb1c424b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-42.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-42.c
@@ -31,4 +31,3 @@ int main()
 /* { dg-final { scan-tree-dump "b = A;" "fre1" } } */
 /* Verify we have propagated the element read all the way to the return.  */
 /* { dg-final { scan-tree-dump "return 2" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-43.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-43.c
index e79e7c402c8..af6adbda43e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-43.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-43.c
@@ -26,4 +26,3 @@ L10:
 
 /* { dg-final { scan-tree-dump-times "Removing dead stmt" 15 "fre1" } } */
 /* { dg-final { scan-tree-dump-not "Not changing value number" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-44.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-44.c
index 7d5f7137295..f79b4c142ae 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-44.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-44.c
@@ -58,4 +58,3 @@ f4 (struct B *x, int y)
 }
 
 /* { dg-final { scan-tree-dump-times "return 3.0" 4 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-5.c
index 968e3778d69..157ab87a9e8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-5.c
@@ -11,4 +11,3 @@ bar (unsigned int t)
 }
 
 /* { dg-final { scan-tree-dump "Replaced \\\(unsigned int\\\) a_.*with t_" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-6.c
index 18a9d9b895a..932676a278a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-6.c
@@ -3,4 +3,3 @@
 
  int i; int foo(void) { i = 2; int j = i * 2; int k = i + 2; return j == k; }
 /* { dg-final { scan-tree-dump-times "Replaced " 6 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-7.c
index a758efe5dda..9a555f14b39 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-7.c
@@ -34,5 +34,3 @@ intflt foo(intflt j)
 /* { dg-final { scan-tree-dump-times "Replaced a.u.k with j" 1 "fre1" } } */
 /* { dg-final { scan-tree-dump "= VIEW_CONVERT_EXPR<float>\\\(j_" "fre1" } } */
 /* { dg-final { scan-tree-dump "return j" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-8.c
index d6ab2ef247f..c04f69927de 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-8.c
@@ -30,4 +30,3 @@ intflt foo(int i, int b)
 
 /* { dg-final { scan-tree-dump-times "Replaced u.f with pretmp" 2 "fre1" } } */
 /* { dg-final { scan-tree-dump-times "Inserted pretmp" 2 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-9.c
index d3986f5ba17..d2fd50b2690 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-9.c
@@ -25,4 +25,3 @@ void __frame_state_for1 (volatile char *state_in)
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 2 "fre1" } } */
 /* { dg-final { scan-tree-dump-times "Insertions: 1" 2 "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c
index 20854813d1e..edbe287d1db 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-1.c
@@ -14,4 +14,3 @@ int foo (int x, int a, int b)
 }
 
 /* { dg-final { scan-tree-dump "\\|" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c
index c2b1c19d0e7..94221d0983f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-10.c
@@ -17,4 +17,3 @@ int f(int x, int a, int b)
   return t;
 }
 /* { dg-final { scan-tree-dump "& 5" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c
index d024df85acc..d192911c4ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-11.c
@@ -18,4 +18,3 @@ int f(int x, int a, int b)
 }
 
 /* { dg-final { scan-tree-dump "& 5" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c
index 5893ba7be79..88502c3278b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-12.c
@@ -17,4 +17,3 @@ int f(int x, int a, int b)
   return t;
 }
 /* { dg-final { scan-tree-dump "& 5" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c
index 43b92c11569..bbafe7b82db 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-13.c
@@ -18,4 +18,3 @@ _Bool f1(_Bool a, _Bool b)
 /* For LOGICAL_OP_NON_SHORT_CIRCUIT, this should be optimized
    into return a & b;, with no ifs.  */
 /* { dg-final { scan-tree-dump-not "if" "optimized" { target { i?86-*-* x86_64-*-* s390*-*-* avr*-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c
index dab30addd59..c2a1a087c44 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-2.c
@@ -20,4 +20,3 @@ doit:
 }
 
 /* { dg-final { scan-tree-dump "\\|" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c
index 79fec8ba90e..ff543c17acb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-3.c
@@ -20,4 +20,3 @@ doit:
 }
 
 /* { dg-final { scan-tree-dump ">=" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c
index da477867ef3..83171940b1a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-4.c
@@ -18,4 +18,3 @@ void foo (int x, int a)
 }
 
 /* { dg-final { scan-tree-dump "!=" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c
index 88bd81e2596..d8349c1a5d7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-5.c
@@ -17,4 +17,3 @@ int f(int *i, int *j)
 }
 
 /* { dg-final { scan-tree-dump ">=" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c
index 90abc8debc9..55450abd205 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-6.c
@@ -34,4 +34,3 @@ foo2 (unsigned int a)
 
 /* { dg-final { scan-tree-dump "optimizing bits or bits test" "ifcombine" } } */
 /* { dg-final { scan-tree-dump "optimizing double bit test" "ifcombine" } } */
-/* { dg-final { cleanup-tree-dump "ifcombine" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c
index 617cb585a94..20530900544 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-7.c
@@ -12,4 +12,3 @@ int test1 (int i, int j)
 /* The above should be optimized to a i > j test by ifcombine.  */
 
 /* { dg-final { scan-tree-dump " > " "ifcombine" } } */
-/* { dg-final { cleanup-tree-dump "ifcombine" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c
index a6c4282ef63..c89d264d465 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-8.c
@@ -22,4 +22,3 @@ plouf:
    Instead we get u<=, which is acceptable with -fno-trapping-math.  */
 
 /* { dg-final { scan-tree-dump " u<= " "ifcombine" } } */
-/* { dg-final { cleanup-tree-dump "ifcombine" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c
index cb575022715..c4c55732e45 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-9.c
@@ -19,4 +19,3 @@ void g (double x)
    The transformation would also be legal with -ftrapping-math.  */
 
 /* { dg-final { scan-tree-dump "optimizing.* < " "ifcombine" } } */
-/* { dg-final { cleanup-tree-dump "ifcombine" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-1.c
index f2bcfec59cf..6a0d0c0e397 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-1.c
@@ -11,4 +11,3 @@ int t (int a, int b)
   return 1;
 }
 /* { dg-final { scan-tree-dump "\&" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-2.c
index f3ea44b788e..3e6600f2669 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-2.c
@@ -14,4 +14,3 @@ L1:
   return 1;
 }
 /* { dg-final { scan-tree-dump "\|" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-3.c
index c6857691ce3..aafb281f268 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-3.c
@@ -17,4 +17,3 @@ L2:
   return 6;
 }
 /* { dg-final { scan-tree-dump "\|" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-4.c
index 37bf25302d9..774d93c7ccc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-4.c
@@ -15,4 +15,3 @@ L2:
   return 1;
 }
 /* { dg-final { scan-tree-dump "\&" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-5.c
index ad51a1e24d7..2cd0dcc3ed9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-5.c
@@ -10,4 +10,3 @@ int t (int a, int b, int c)
   return 1;
 }
 /* { dg-final { scan-tree-dump-times "\&" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-6.c
index 50a5102e478..a692a74db9a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-ifcombine-ccmp-6.c
@@ -10,4 +10,3 @@ int t (int a, int b, int c)
   return 1;
 }
 /* { dg-final { scan-tree-dump-times "\\|" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c
index 3952a9a38ac..1b387cd4275 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-1.c
@@ -19,4 +19,3 @@ quantum_toffoli (int control1, int control2, int target,
 }
 
 /* { dg-final { scan-tree-dump-times "1 <<" 3 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c
index bc149265dd7..79ea0428223 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-10.c
@@ -28,4 +28,3 @@ int test_func(void)
 }
 
 /* { dg-final { scan-tree-dump "Executing store motion of pos" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
index ea91a612376..64e71eb620d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-11.c
@@ -22,4 +22,3 @@ void access_buf(struct thread_param* p)
 }
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of __gcov0.access_buf\\\[\[01\]\\\] from loop 1" 2 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c
index e0d93a993d2..35f17d50b53 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-12.c
@@ -24,4 +24,3 @@ void bar (int x, int z)
 }
 
 /* { dg-final { scan-tree-dump-times "!= 0 ? " 2 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c
index 2106b62323f..8e72f7820a8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-2.c
@@ -19,4 +19,3 @@ int size)
 }
 
 /* { dg-final { scan-tree-dump-times "1 <<" 3 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
index a81857c0c3d..20352159af4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-3.c
@@ -11,4 +11,3 @@ void foo(int n)
 
 /* { dg-final { scan-tree-dump "Executing store motion of global.y" "lim1" } } */
 /* { dg-final { scan-tree-dump "Moving statement.*global.x.*out of loop 1" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c
index 100a2302736..283d2063710 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-6.c
@@ -11,4 +11,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump "Executing store motion of y" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c
index f8e15f34486..f9d685ef5ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-7.c
@@ -12,4 +12,3 @@ void foo (int *srcdata, int *dstdata)
 }
 
 /* { dg-final { scan-tree-dump "Moving statement" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c
index 551b68ff2de..aaad0f00ba7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-8.c
@@ -17,4 +17,3 @@ void foo (int n, int m)
 }
 
 /* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim1"  } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c
index c5a67653bad..8abc2c7ba43 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-9.c
@@ -17,4 +17,3 @@ void foo (int n, int m)
 }
 
 /* { dg-final { scan-tree-dump-times "Moving PHI node" 1 "lim1"  } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-1.c
index 3bc0f5e3e6e..b02057459a5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-1.c
@@ -18,4 +18,3 @@ int foo(int argc, char **argv)
 /* We should eliminate one evaluation of b + c along the main path,
    causing one reload. */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-10.c
index 8cb1bebde43..f3e6182a1c8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-10.c
@@ -12,4 +12,3 @@ void f(double a)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-11.c
index 26c47b1830b..070468a0e08 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-11.c
@@ -18,4 +18,3 @@ double f(double a)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-12.c
index fd80e3d8d50..261635c526e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-12.c
@@ -24,4 +24,3 @@ double f(double a)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-13.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-13.c
index dfce46b9907..48864fd9463 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-13.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-13.c
@@ -23,4 +23,3 @@ double f(double a)
 }
 
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-14.c
index 8c9285bfbe2..0bf00a094b8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-14.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-14.c
@@ -12,4 +12,3 @@ foo (const char *str)
     link_error ();
 }
 /* { dg-final { scan-tree-dump-times "link_error" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-15.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-15.c
index ed3b2f7840f..67ec3100dac 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-15.c
@@ -13,4 +13,3 @@ __SIZE_TYPE__ mystrlen (const char *s)
 }
 
 /* { dg-final { scan-rtl-dump "PART.. = 0" "expand" } } */
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-16.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-16.c
index b087dc1b45c..f2ec5d7eda2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-16.c
@@ -12,4 +12,3 @@ int foo(int k, int *x)
   return res;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-17.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-17.c
index d4274dbe081..09313716598 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-17.c
@@ -15,4 +15,3 @@ int foo(U *u, int b, int i)
 }
 
 /* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-18.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-18.c
index 5e92934f052..483f8228260 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-18.c
@@ -18,4 +18,3 @@ int bar (int b)
 }
 
 /* { dg-final { scan-tree-dump "Replaced foo \\(f.y\\)" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-19.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-19.c
index 0fd0dc5425c..bb6300d5c8d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-19.c
@@ -36,4 +36,3 @@ int foo (int i, int j, int k, int b)
 
 /* All three loads should be eliminated.  */
 /* { dg-final { scan-tree-dump "Eliminated: 3" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c
index 311f127812b..3a071ff8fea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-2.c
@@ -21,4 +21,3 @@ int motion_test1(int data, int data_0, int data_3, int v)
    the main path. */
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-20.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-20.c
index 6361b679c44..c8a23df8310 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-20.c
@@ -32,4 +32,3 @@ bb18:
 
 /* { dg-final { scan-tree-dump "New PHIs: 2" "pre" } } */
 /* { dg-final { scan-tree-dump "PHI <.*0\\\.0" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-21.c
index 40bb421f535..9b6eb11b5f9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-21.c
@@ -12,4 +12,3 @@ NumSift (long *array, unsigned long k)
 /* There should be only two loads left.  */
 
 /* { dg-final { scan-tree-dump-times "= \\\*\[^\n;\]*;" 2 "pre" { xfail { ! size32plus } } } } */ /* xfail: PR tree-optimization/58169 */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-22.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-22.c
index 3a1697e6c76..2e7cf4c140c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-22.c
@@ -10,4 +10,3 @@ int foo (int i, int b)
 }
 
 /* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-23.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-23.c
index 6aeb06af9ee..e7e0c52c4e9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-23.c
@@ -10,4 +10,3 @@ void foo(int n)
 }
 
 /* { dg-final { scan-tree-dump "Eliminated: 3" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-24.c
index f91f4af74df..a4353bf7e7c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-24.c
@@ -12,4 +12,3 @@ void foo(int *p, double *x, int n)
    _not_ end up using the phi result for replacement *p.  */
 
 /* { dg-final { scan-tree-dump-not "= prephitmp" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-25.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-25.c
index 32b068275c1..b73f3f8a143 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-25.c
@@ -20,4 +20,3 @@ int foo (int x)
 /* We should eliminate the load from p for a PHI node with values 1 and 2.  */
 
 /* { dg-final { scan-tree-dump "Eliminated: 1" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-26.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-26.c
index 7342c3361a8..1f8e81cc9ca 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-26.c
@@ -24,4 +24,3 @@ void foo(SA* pResult, SB* method, SC* self)
 }
 
 /* { dg-final { scan-tree-dump "Deleted redundant store" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-27.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-27.c
index 4149bbef6a5..fe1d87a839e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-27.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-27.c
@@ -25,4 +25,3 @@ int foo2 (int i, int j, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "# prephitmp" 2 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-28.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-28.c
index 55887a694dc..19a3c46f27e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-28.c
@@ -18,4 +18,3 @@ int foo (int i, int b, int result)
    i + 1 & -2 expression.  And do replacement with two PHI temps.  */
 
 /* { dg-final { scan-tree-dump-times "with prephitmp" 2 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-29.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-29.c
index b70fa58a1c3..8c156affa20 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-29.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-29.c
@@ -19,4 +19,3 @@ foo (void)
    about bark () possibly clobbering hoist.  */
 
 /* { dg-final { scan-tree-dump "Replaced hoist" "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-3.c
index 3925f7529eb..0af5342a566 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-3.c
@@ -12,4 +12,3 @@ unsigned foo1 (unsigned a, unsigned b)
 }
 /* We should eliminate both 4*b and 4*a from the main body of the loop */
 /* { dg-final { scan-tree-dump-times "Eliminated: 2" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-30.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-30.c
index 91e0e89363e..59af63ad5ac 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-30.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-30.c
@@ -25,4 +25,3 @@ bar (int b, int x)
    are using different types (of the same size).  */
 
 /* { dg-final { scan-tree-dump-times "Replaced MEM" 2 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-31.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-31.c
index 2094de4ca89..43af6055edf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-31.c
@@ -44,4 +44,3 @@ int foo (S1 *root, int N)
 } 
 
 /* { dg-final { scan-tree-dump-times "key" 4 "pre" } } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-4.c
index 274737ac4e7..5b4fd5450cb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-4.c
@@ -12,4 +12,3 @@ int foo(void)
 /* We should eliminate the x+1 computation from this routine, replacing
    it with a phi of 3, 4 */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-5.c
index d0e985f81a5..c07818c52c9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-5.c
@@ -14,4 +14,3 @@ foo (int i)
    5  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
 /* { dg-final { scan-tree-dump-times "Insertions" 0 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-6.c
index 2811f4379aa..889208732c4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-6.c
@@ -11,4 +11,3 @@ int foo(int x)
 /* We should eliminate one evaluation of x + 1 along the x = 2 path,
    causing one elimination.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "pre"} } */
-/* { dg-final { cleanup-tree-dump "pre" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-7.c
index bc7ca4e68e4..7023818b17a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-7.c
@@ -9,4 +9,3 @@ foo (int *array)
 }
 /* We should eliminate one load.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-8.c
index dab57fa391b..64bf24fe657 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-8.c
@@ -22,4 +22,3 @@ foo (__SIZE_TYPE__ i, struct s *array)
 /* We used to eliminate a cast but that was before POINTER_PLUS_EXPR
    was added.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 4" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-9.c
index 4f88624ae19..ce873c246e1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-9.c
@@ -10,4 +10,3 @@ foo (unsigned long a)
   return 0;
 }
 /* { dg-final { scan-tree-dump-times "return 0;" 0 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-1.c
index 0cb027222fb..7f4d34171e0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-1.c
@@ -18,4 +18,3 @@ void vnum_test8(int *data)
 } 
 /* We should eliminate m - n, and set n = n + k into n = m. */
 /* { dg-final { scan-tree-dump-times "Eliminated: 3" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-2.c
index b4c3c14a265..2fe0dc88052 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-2.c
@@ -22,4 +22,3 @@ int vnum_test8(int *data)
 /* We should eliminate m - n, and set n = n + k into n = m, and
    set p to 0 */
 /* { dg-final { scan-tree-dump-times "Eliminated: 4" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-3.c
index fb266bb5417..4284d890520 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-3.c
@@ -12,4 +12,3 @@ int main(int argc, char **argv)
 }
 /* We should eliminate result = *p by saying it has the value 2.  */
 /* { dg-final { scan-tree-dump-times "Eliminated: 1" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-4.c
index 7f0a9329737..500c7b6dc0e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sccvn-4.c
@@ -24,4 +24,3 @@ int vnum_test8(int *data)
 /* We should eliminate m - n, n + k, set data[5] = 0, eliminate the
    address arithmetic for data[5], and set p = 0.
 /* { dg-final { scan-tree-dump-times "Eliminated: 5" 1 "fre1"} } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-1.c
index c3326d27e25..411585a6dc4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-1.c
@@ -8,4 +8,3 @@ foo (int a, int b, int c)
 }
 /* We should sink the x = a * b calculation into the branch that returns x. */
 /* { dg-final { scan-tree-dump-times "Sunk statements: 1" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-10.c
index 6593598bbcb..4031e10289d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-10.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-10.c
@@ -17,4 +17,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Sinking # VUSE" 4 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-11.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-11.c
index e5567081195..0f0b51e9b15 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-11.c
@@ -14,4 +14,3 @@ int foo (int v[], int a)
 }
 
 /* { dg-final { scan-tree-dump "MEM\\\[.* \\+ 252B\\\]" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-12.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-12.c
index d791a71fc4b..f6658a1c246 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-12.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-12.c
@@ -15,4 +15,3 @@ int foo (int v1[], int v2[])
 }
 
 /* { dg-final { scan-tree-dump "MEM\\\[.* \\+ 252B\\\]" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-2.c
index 1d54d019e7f..6aa5a182a3a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-2.c
@@ -10,4 +10,3 @@ bar (int a, int b, int c)
 }
 /* We should sink the x = a * b calculation into the else branch  */
 /* { dg-final { scan-tree-dump-times "Sunk statements: 1" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-3.c
index fceb509e8bc..599997e0e6b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-3.c
@@ -13,4 +13,3 @@ main (int argc)
 }
 /* We should sink the a = argc + 1 calculation into the if branch  */
 /* { dg-final { scan-tree-dump-times "Sunk statements: 1" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-4.c
index 6e1cc50dc11..784edd2fc87 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-4.c
@@ -18,4 +18,3 @@ main (int argc)
 }
 /* We should sink the first a = b + c calculation into the else branch  */
 /* { dg-final { scan-tree-dump-times "Sunk statements: 1" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-5.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-5.c
index f51d485d418..dbdde39add6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-5.c
@@ -45,4 +45,3 @@ void foo(int16_t runs[], uint8_t alpha[], int x, int count)
 
 /* We should not sink the next_runs = runs + x calculation after the loop.  */
 /* { dg-final { scan-tree-dump-times "Sunk statements:" 0 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-6.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-6.c
index 70e48121ee6..1abae9f7943 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-6.c
@@ -15,4 +15,3 @@ int foo(int *a, int r)
 /* *a = 1 should be sunk to the else block.  */
 
 /* { dg-final { scan-tree-dump-times "Sinking" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-7.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-7.c
index ffee03368c5..ec3288f4e69 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-7.c
@@ -16,4 +16,3 @@ int foo(int *a, int r, short *b)
 /* *a = 1 should be sunk to the else block.  */
 
 /* { dg-final { scan-tree-dump-times "Sinking" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-8.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-8.c
index 4a575a7a485..48af4218fc0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-8.c
@@ -25,4 +25,3 @@ int foo(int *a, int r, short *b)
 /* *a = 1 should be sunk into the default case.  */
 
 /* { dg-final { scan-tree-dump-times "Sinking" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-9.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-9.c
index 1a6e2b8d974..509a76330a4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-9.c
@@ -16,4 +16,3 @@ int foo(int *a, int r, int *b)
 /* *a = 1 should be sunk to the else block.  */
 
 /* { dg-final { scan-tree-dump-times "Sinking" 1 "sink" } } */
-/* { dg-final { cleanup-tree-dump "sink" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c
index aaa3d13cad4..415c070a59c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-1.c
@@ -11,4 +11,3 @@ int f(void)
 /* There should be no reference to conststaticvariable as we should have
    inlined the 0. */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c
index 29a2dd5cccc..cdc042061ec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-2.c
@@ -11,4 +11,3 @@ int f(void)
 /* There should be a reference to conststaticvariable since it may
    may be overriden at link time.  */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 1 "optimized" { xfail { *-*-mingw* *-*-cygwin* } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-3.c
index 9c8d67ed06e..98ec5b88fe5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-3.c
@@ -15,4 +15,3 @@ int f(void)
    conststaticvariable as we should have inlined the 0. */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 0 "optimized" { target { pie_enabled || nonpic } } } } */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 1 "optimized" { target { { ! pie_enabled } && { ! nonpic } } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-4.c
index c7a0fbd17a2..d4ee28c0679 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-store-ccp-4.c
@@ -13,4 +13,3 @@ int f(void)
 /* There should be a reference to conststaticvariable since it may
    may be overriden at run time.  */
 /* { dg-final { scan-tree-dump-times "conststaticvariable" 1 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-vrp-thread-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-vrp-thread-1.c
index 4f4d9679481..ef5611fa32e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-vrp-thread-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-vrp-thread-1.c
@@ -30,5 +30,4 @@ build_omp_regions_1 (basic_block bb, struct omp_region *parent,
 /* ARM Cortex-M defined LOGICAL_OP_NON_SHORT_CIRCUIT to false,
    so skip below test.  */
 /* { dg-final { scan-tree-dump-times "Threaded" 1 "vrp1" { target { ! arm_cortex_m } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
index 3cba2928f57..39b61c9eb8d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-1.c
@@ -10,4 +10,3 @@ f1 (int i, ...)
 {
 }
 /* { dg-final { scan-tree-dump "f1: va_list escapes 0, needs to save 0 GPR units and 0 FPR units" "stdarg" } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
index 93a9e8da0d9..c73294aa523 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-2.c
@@ -298,4 +298,3 @@ f15 (int i, ...)
 /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
 /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target ia64-*-* } } } */
 /* { dg-final { scan-tree-dump-not "f15: va_list escapes 0, needs to save 0 GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
index d9c55a87e8c..9367707b724 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-3.c
@@ -190,4 +190,3 @@ f12 (int i, ...)
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */
 /* { dg-final { scan-tree-dump "f12: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
index 5e22b1d9e06..94e35a88114 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-4.c
@@ -91,4 +91,3 @@ f4 (int i, ...)
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target ia64-*-* } } } */
 /* { dg-final { scan-tree-dump "f4: va_list escapes 0, needs to save \[148\] GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
index 82352f7c265..b816d9373fd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-5.c
@@ -116,4 +116,3 @@ f7 (int i, ...)
 /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 0 GPR units and 64 FPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && { ! { ia32 || llp64 } } } } } } */
 /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 32 GPR units and 2" "stdarg" { target alpha*-*-linux* } } } */
 /* { dg-final { scan-tree-dump "f7: va_list escapes 0, needs to save 2 GPR units and 0 FPR units" "stdarg" { target s390*-*-linux* } } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-6.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-6.c
index 70cde1b803f..c21dc17b527 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-6.c
@@ -33,4 +33,3 @@ bar (int x, char const *y, ...)
 /* { dg-final { scan-tree-dump "bar: va_list escapes 1, needs to save all GPR units" "stdarg" { target { { i?86-*-* x86_64-*-* } && ia32 } } } } */
 /* { dg-final { scan-tree-dump "bar: va_list escapes 1, needs to save all GPR units" "stdarg" { target ia64-*-* } } } */
 /* { dg-final { scan-tree-dump "bar: va_list escapes 1, needs to save all GPR units" "stdarg" { target { powerpc*-*-* && lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-7.c b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-7.c
index 9b497c07270..f73fcb76ddd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/stdarg-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/stdarg-7.c
@@ -19,4 +19,3 @@ foo (int x, ...)
 }
 
 /* { dg-final { scan-tree-dump "foo: va_list escapes 1, needs to save all GPR units and all FPR units" "stdarg" } } */
-/* { dg-final { cleanup-tree-dump "stdarg" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c b/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
index f6ff3e1570f..57261c63eaf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/strlen-1.c
@@ -14,4 +14,3 @@ void wreg_twice(void)
 
 /* We should not remove the second null character store to (base+42) address. */
 /* { dg-final { scan-tree-dump-times " ={v} 0;" 2 "optimized" } }  */
-/* { dg-final { cleanup-tree-dump "optimized" } }  */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c b/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
index 495b7ba114e..7757e5e1795 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-1.c
@@ -12,4 +12,3 @@ foo (float *r, struct S *p)
 }
 
 /* { dg-final { scan-tree-dump "Replaced\[^\n\]*with i_." "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-2.c b/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-2.c
index 66a5442a9ef..3a78c2c1711 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/struct-aliasing-2.c
@@ -15,5 +15,4 @@ foo ( struct S *p)
 /* There should only be one load of p->f because FRE removes the redundancy
    by realizing it can cast the result of either to the other.  */
 /* { dg-final { scan-tree-dump-times "= \[^\n\]*p_.\\\(D\\\)" 1 "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
index e5fe291d96a..0582e26e2c4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-1.c
@@ -12,4 +12,3 @@ int foo() {
 
 /* { dg-final { scan-tree-dump-times "Executing store motion of global.y" 1 "lim1" } } */
 /* XXX: We should also check for the load motion of global.x, but there is no easy way to do this.  */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
index b4d28257e35..327b54c162c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-2.c
@@ -43,4 +43,3 @@ int main(void)
 /* { dg-final { scan-tree-dump-times "a.f" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "a.g" 0 "optimized" } } */
 /* { dg-final { scan-tree-dump-times "b.e" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c b/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
index a7fcb5bf8ab..793ee24feb9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/structopt-3.c
@@ -14,4 +14,3 @@ int main(void)
 	return temp.a + temp.b;
 }
 /* { dg-final { scan-tree-dump-times "return 11" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-1.c b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-1.c
index 422ee2d7bae..33901523fb3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-1.c
@@ -17,4 +17,3 @@ t(int a)
 	return r;
 }
 /* { dg-final { scan-tree-dump-times "Found tail call" 1 "tailc"} } */
-/* { dg-final { cleanup-tree-dump "tailc" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-2.c b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-2.c
index bd9a8535461..7f3415444ff 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-2.c
@@ -21,4 +21,3 @@ foo (int *x)
    variables, they ought to be ignored.  There should be two tail
    calls here.  */
 /* { dg-final { scan-tree-dump-times "Found tail call" 2 "tailc"} } */
-/* { dg-final { cleanup-tree-dump "tailc" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-4.c b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-4.c
index e7983da31da..ba9a6ccf9f0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-4.c
@@ -12,5 +12,4 @@ longValue ()
 
 /* We should not tail call doubleValue in longValue as the mode changes. */
 /* { dg-final { scan-tree-dump-times "Found tail call" 0 "tailc"} } */
-/* { dg-final { cleanup-tree-dump "tailc" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c
index 7aa433ecf7a..00113d7e796 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailcall-5.c
@@ -9,4 +9,3 @@ set_integer (void *dest, int value, int length)
 }
 
 /* { dg-final { scan-tree-dump-not "tail call" "tailc" } } */
-/* { dg-final { cleanup-tree-dump "tailc" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
index c725d79494e..fd65c774daf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-1.c
@@ -9,4 +9,3 @@ t(int a)
 		return 0;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
index ae2989d7697..e982b0c2065 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-2.c
@@ -10,4 +10,3 @@ t(char *a)
 		return 0;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
index 6ab2cd18853..7c766a11a93 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-3.c
@@ -13,4 +13,3 @@ t(int a)
 	return r;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
index a17573cf226..d6ba7967942 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-4.c
@@ -15,4 +15,3 @@ t(int a)
 	return r;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 2 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-5.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-5.c
index 53a2cdb15e3..4de0d30a3fe 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-5.c
@@ -74,4 +74,3 @@ int main(void)
 /* There is one recursive call to fib.  */
 /* { dg-final { scan-tree-dump-times "\\mfib\\M" 5 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-6.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-6.c
index e994cc424a0..38fa1042cbc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-6.c
@@ -9,4 +9,3 @@ foo (int a)
 		return 0;
 }
 /* { dg-final { scan-tree-dump-times "Eliminated tail recursion" 1 "tailr1"} } */
-/* { dg-final { cleanup-tree-dump "tailr1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-7.c b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-7.c
index 875a6aa7887..b76efbab04e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-7.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/tailrecursion-7.c
@@ -37,4 +37,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "\\mbar\\M" 4 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "\\mbaz\\M" 4 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/unreachable.c b/gcc/testsuite/gcc.dg/tree-ssa/unreachable.c
index 11ff47bcb07..8a13c60c5c1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/unreachable.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/unreachable.c
@@ -12,4 +12,3 @@ main()
   return 0;
 }
 /* { dg-final { scan-tree-dump-not "bad_boy" "optimized" { target { ! keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/upcast-1.c b/gcc/testsuite/gcc.dg/tree-ssa/upcast-1.c
index 12c2b91ba08..7838817f2f5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/upcast-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/upcast-1.c
@@ -9,4 +9,3 @@ Foo *bar(void)
 }
 
 /* { dg-final { scan-tree-dump "&foo;" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/update-cunroll.c b/gcc/testsuite/gcc.dg/tree-ssa/update-cunroll.c
index dafd44bb9b5..3b47ede3918 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/update-cunroll.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/update-cunroll.c
@@ -10,4 +10,3 @@ int t()
 	return i;
 }
 /* { dg-final { scan-tree-dump-times "Invalid sum" 0 "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/update-threading.c b/gcc/testsuite/gcc.dg/tree-ssa/update-threading.c
index 58b26e61531..9c87ba0f7bd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/update-threading.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/update-threading.c
@@ -21,4 +21,3 @@ main (int argc, char **argv)
   exit (0);
 }
 /* { dg-final { scan-tree-dump-times "Invalid sum" 0 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c b/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c
index a9331024964..5aa288ab8cc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/update-unroll-1.c
@@ -18,4 +18,3 @@ int foo(unsigned n)
 
 /* { dg-final { scan-tree-dump-not "Invalid sum" "aprefetch"} } */
 /* { dg-final { scan-tree-dump-not "SUCC: 7 .100.0%" "aprefetch"} } */
-/* { dg-final { cleanup-tree-dump "aprefetch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/update-unswitch-1.c b/gcc/testsuite/gcc.dg/tree-ssa/update-unswitch-1.c
index 499b78b0137..a48710d563b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/update-unswitch-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/update-unswitch-1.c
@@ -21,4 +21,3 @@ int bla(int p)
 
 /* { dg-final { scan-tree-dump-not "Invalid sum" "unswitch"} } */
 /* { dg-final { scan-tree-dump-not "SUCC: 3 .100.0%" "unswitch"} } */
-/* { dg-final { cleanup-tree-dump "unswitch" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/useless-1.c b/gcc/testsuite/gcc.dg/tree-ssa/useless-1.c
index 68eab70046c..9c2621224b7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/useless-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/useless-1.c
@@ -14,4 +14,3 @@ foo (void)
    GIMPLE lowering, at the cost of an extra statement, label,
    and basic block.  */
 /* { dg-final { scan-tree-dump-times "goto" 3 "gimple"} } */ 
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vector-1.c b/gcc/testsuite/gcc.dg/tree-ssa/vector-1.c
index 6fe0e872bb9..ce0e11afe66 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vector-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vector-1.c
@@ -28,6 +28,5 @@ float f3(vector float t)
 
 /* { dg-final { scan-tree-dump-times "BIT_FIELD_REF" 4 "gimple"} } */
 
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vector-2.c b/gcc/testsuite/gcc.dg/tree-ssa/vector-2.c
index 2d214df4095..900701496e7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vector-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vector-2.c
@@ -20,4 +20,3 @@ float f(vector float a, int b, vector float c)
 /* { dg-final { scan-tree-dump-not "BIT_FIELD_REF" "optimized"} } */
 /* { dg-final { scan-tree-dump-times "return 0.0" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vector-3.c b/gcc/testsuite/gcc.dg/tree-ssa/vector-3.c
index f5e337fb495..ecdebf643c0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vector-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vector-3.c
@@ -16,5 +16,4 @@ float f(float b)
 /* { dg-final { scan-tree-dump-times "BIT_FIELD_REF" 0 "optimized"} } */
 /* { dg-final { scan-tree-dump-times "0\\\.0" 1 "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vector-4.c b/gcc/testsuite/gcc.dg/tree-ssa/vector-4.c
index 018b8cbe3ad..17c56e91ad7 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vector-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vector-4.c
@@ -13,4 +13,3 @@ v4si vs (v4si a, v4si b)
 /* Test is xfailed on 32-bit hppa*-*-* because target-callee-copies.  */
 /* { dg-final { scan-tree-dump-times "VEC_PERM_EXPR <a, b, { 0, 4, 1, 5 }>;" 1 "gimple" { xfail { hppa*-*-* && { ! lp64 } } } } } */
 
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp01.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp01.c
index 1fc7e99ac48..c6d10c2dbcf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp01.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp01.c
@@ -26,4 +26,3 @@ foo (int *p, int i)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
index 994c1dbb9cd..8d14feadb6a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp02.c
@@ -23,4 +23,3 @@ foo (struct A *p, struct A *q)
 /* Target disabling -fdelete-null-pointer-checks should not fold check */
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
index 7ec51e47661..59146bf2b62 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp03.c
@@ -33,4 +33,3 @@ foo (struct A *p, struct A *q)
 
 /* { dg-final { scan-tree-dump-times "Folding predicate q_.*to 1" 1 "vrp1" } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate r_.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp04.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp04.c
index b98fda90769..8af269f11e1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp04.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp04.c
@@ -11,4 +11,3 @@ foo (int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate a_.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp05.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp05.c
index 80f05ea2105..8c611e91fcd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp05.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp05.c
@@ -28,4 +28,3 @@ foo (int k, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate j_.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
index 6d0f6459071..46bbef1d2b0 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c
@@ -31,4 +31,3 @@ foo (int i, int j, int a)
 /* { dg-final { scan-tree-dump-times "Folding predicate i_\[0-9\]+.*0 to 0" 1 "vrp1" } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate j_\[0-9\]+.*0 to 1" 1 "vrp1" } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate i_\[0-9]+.*j_\[0-9\]+.* to 0" 1 "vrp1" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
index a59a3e83bbc..3bc6869c576 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp07.c
@@ -37,4 +37,3 @@ foo (int i, int *p)
 
 /* { dg-final { scan-tree-dump-times "PREDICATE: p_\[0-9\]" 2 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "PREDICATE: p_\[0-9\]" 1 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
index 9aff505357d..023b4eb3b94 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp08.c
@@ -22,4 +22,3 @@ foo (int a, int *p)
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "PREDICATE: p_.* ne_expr 0" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
index d8f1f4a0d8b..98be0af62df 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp09.c
@@ -28,4 +28,3 @@ L78:
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate p_.. != 0B to 1" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp11.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp11.c
index 4d0e93d537c..d03ea002f17 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp11.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp11.c
@@ -24,4 +24,3 @@ foo (int k, int j, int z)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate.*to 1" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp15.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp15.c
index 7e7226487c2..099462c3275 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp15.c
@@ -30,5 +30,4 @@ blah (tree t)
 }
 
 /* { dg-final { scan-tree-dump-times "tree_code_length.42." 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
index 166529ab98b..00a8e1a78f9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp16.c
@@ -19,5 +19,4 @@ nonlocal_mentioned_p (rtx x)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate .*to 0" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
index c04b9ba7843..4f121030186 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp17.c
@@ -28,5 +28,4 @@ gimplify_for_stmt (tree stmt)
 }
 
 /* { dg-final { scan-tree-dump-times "Simplified relational" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
index a3cc536ae56..008eebb25e4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp18.c
@@ -31,4 +31,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "Simplified relational" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
index e4c884a85d1..cecacb66563 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp19.c
@@ -24,4 +24,3 @@ int g (int b) {
 }
 /* { dg-final { scan-tree-dump "Folding predicate a_. < 0 to 0" "vrp1" } } */
 /* { dg-final { scan-tree-dump "Folding predicate b_. >= 0 to 1" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
index 14da7df48db..012d05a6427 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp20.c
@@ -25,4 +25,3 @@ int g (int b) {
 
 /* { dg-final { scan-tree-dump "Folding predicate a_. == 0 to 0" "vrp1" } } */
 /* { dg-final { scan-tree-dump "Folding predicate b_. != 0 to 1" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp21.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp21.c
index 9a4e4e783c1..87cdfeeab7c 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp21.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp21.c
@@ -24,4 +24,3 @@ void test02(unsigned int a, unsigned int b)
 }
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp22.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp22.c
index cbd4dc529dd..f857c16cb2d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp22.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp22.c
@@ -14,4 +14,3 @@ void test02(unsigned int a, unsigned int b)
 }
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
index d27b12595ea..b877ccc607b 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp23.c
@@ -46,5 +46,4 @@ L8:
    only way to reach the test is when n_sets <= 1, and the only value
    which satisfies both conditions is n_sets == 1.  */
 /* { dg-final { scan-tree-dump-times "Simplified relational" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
index b60ee0569aa..e7405750f41 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp24.c
@@ -92,5 +92,4 @@ L7:
    as the only way to reach the tests is when n_sets <= 1 and the only
    value which satisfies both conditions is n_sets == 1.  */
 /* { dg-final { scan-tree-dump-times "Simplified relational" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp25.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp25.c
index 79813e848fa..30da3330c09 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp25.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp25.c
@@ -50,5 +50,4 @@ L9:
    both totally subsumed by earlier tests and thus should be folded
    away using VRP.  */
 /* { dg-final { scan-tree-dump-times "Folding predicate" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp26.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp26.c
index 621541630bb..021d2de3d2e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp26.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp26.c
@@ -9,8 +9,7 @@ foo(int a)
 }
 
 /* VRP should optimize this to a trivial "return 1".   */
-/* { dg-final { scan-tree-dump-times "return 1" 1 "vrp1" } } * /
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
+/* { dg-final { scan-tree-dump-times "return 1" 1 "vrp1" } } */
 
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp28.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp28.c
index 6b2a1fd6b75..8c2a72b04cc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp28.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp28.c
@@ -26,7 +26,6 @@ int f3 (unsigned char c)
     return 0;
 }
 
-/* { dg-final { scan-tree-dump-times "if " 0 "vrp1" } } * /
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
+/* { dg-final { scan-tree-dump-times "if " 0 "vrp1" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp31.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp31.c
index 5b4aa5db978..3259cf1bd36 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp31.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp31.c
@@ -10,5 +10,4 @@ int f(int i)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp32.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp32.c
index a42b3ca279e..e035b8c9abd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp32.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp32.c
@@ -10,5 +10,4 @@ int f(int i)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
index 13f60a6e720..8c8879b8193 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp33.c
@@ -6,4 +6,3 @@
 int f2(int x) { return x == 1 || x == 3 || x == 1; }
 
 /* { dg-final { scan-tree-dump "Folding predicate.*== 1 to 0" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp34.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp34.c
index fd92eca6557..b6f69c5d2e1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp34.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp34.c
@@ -17,4 +17,3 @@ foo (int a)
 
 /* { dg-final { scan-tree-dump "Folding predicate a_. > 2 to 1" "vrp1" } } */
 /* { dg-final { scan-tree-dump "Folding predicate a_. <= 5 to 1" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
index 06b567d43e3..1cf310bbffd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp35.c
@@ -12,4 +12,3 @@ int test1(int i, int k)
 }
 
 /* { dg-final { scan-tree-dump "Folding predicate j_.* == 10 to 0" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
index 9d61960c7ae..873a7c9de91 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp36.c
@@ -9,4 +9,3 @@ int foo(int i)
 }
 
 /* { dg-final { scan-tree-dump "Folding predicate i_.* == 1 to 0" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp40.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp40.c
index 23f080acfe4..de5617993dc 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp40.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp40.c
@@ -15,4 +15,3 @@ int f(int a) {
 }
 
 /* { dg-final { scan-tree-dump "return 3;" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp41.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp41.c
index d573fbb0a43..52c3030bdec 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp41.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp41.c
@@ -24,4 +24,3 @@ foo (int a)
 }
 
 /* { dg-final { scan-tree-dump-not "case 99:" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp46.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp46.c
index 33ce239c7f4..64c65d0b193 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp46.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp46.c
@@ -28,4 +28,3 @@ func_18 ( int t )
 /* There should be a single if left.  */
 
 /* { dg-final { scan-tree-dump-times "if" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
index 9fdba58d14d..d96e842e19a 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp47.c
@@ -44,6 +44,3 @@ int f(int x)
    either 0 or 1.  */
 /* { dg-final { scan-tree-dump-times " & 1;" 0 "vrp2" } } */
 
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "dom1" } } */
-/* { dg-final { cleanup-tree-dump "vrp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp50.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp50.c
index a5b3ee28fd6..74c5809cfb8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp50.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp50.c
@@ -31,4 +31,3 @@ int baz (int x, int y)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1;" 3 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp52.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp52.c
index 52ceea6bef5..6ecd31eba5d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp52.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp52.c
@@ -13,4 +13,3 @@ foo (unsigned int i, unsigned int j)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1;" 1 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp53.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp53.c
index 4bcd299eede..c2b59433a51 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp53.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp53.c
@@ -21,4 +21,3 @@ f2 (int x)
 
 /* { dg-final { scan-tree-dump-not "\& (2047|0x7ff)" "vrp1" } } */
 /* { dg-final { scan-tree-dump-not "\\| (17408|0x4400)" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp54.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp54.c
index 6e8da77581b..ad87288e3a3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp54.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp54.c
@@ -31,4 +31,3 @@ void bar (void)
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp55.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp55.c
index d4014abf22b..8ae9b8d2160 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp55.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp55.c
@@ -14,5 +14,4 @@ fu (char *p, int x)
 
 /* { dg-final { scan-tree-dump-times "Threaded jump" 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
 /* { dg-final { scan-tree-dump-times "Threaded jump" 0 "vrp1" { target {   keeps_null_pointer_checks } } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp56.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp56.c
index 24ad23e60c0..481e888dbab 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp56.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp56.c
@@ -39,5 +39,4 @@ cleanup_empty_eh (basic_block bb)
     }
 }
 /* { dg-final { scan-tree-dump-times "Threaded" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp57.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp57.c
index cac37835dac..8f31b8521a9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp57.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp57.c
@@ -14,4 +14,3 @@ int bar(_Bool b)
 
 /* { dg-final { scan-tree-dump "return 0;" "optimized" } } */
 /* { dg-final { scan-tree-dump "return 1;" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp58.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp58.c
index aa10af24960..5b44ae2cfd1 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp58.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp58.c
@@ -10,4 +10,3 @@ foo (long long a, signed char b, signed char c)
 
 /* { dg-final { scan-tree-dump "Folded into" "vrp1" { target int32plus } } } */
 /* { dg-final { scan-tree-dump "Folding statement: _\[0-9\]\* = \\(long long int\\) bc_\[0-9\]\*;" "vrp1" { target int16 } } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp59.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp59.c
index 963282a2a82..0f5801dd785 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp59.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp59.c
@@ -32,4 +32,3 @@ int h(int x)
 }
 
 /* { dg-final { scan-tree-dump-not " & 3;" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp60.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp60.c
index 059d76473e6..bc84961a868 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp60.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp60.c
@@ -28,4 +28,3 @@ int bar (int x, int b)
 }
 
 /* { dg-final { scan-tree-dump-not "12345" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp61.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp61.c
index 33eb44bb1f5..78db6a79bb5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp61.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp61.c
@@ -13,4 +13,3 @@ int f (int x, int y)
 }
 
 /* { dg-final { scan-tree-dump-not "1234" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp67.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp67.c
index 9269ca5acda..ef5e8f9b58e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp67.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp67.c
@@ -37,4 +37,3 @@ unsigned baz (unsigned i)
 }
 
 /* { dg-final { scan-tree-dump-times "Folding predicate" 3 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp68.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp68.c
index 4f977f4010b..422c887a521 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp68.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp68.c
@@ -15,4 +15,3 @@ int main() { }
 /* VRP will arbitrarily choose ~[1, 1] when merging [2, 6] with ~[1, 7].  */
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp69.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp69.c
index d7540c9e2f9..02eb8712ae5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp69.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp69.c
@@ -35,4 +35,3 @@ void test5(unsigned int i)
 int main() {}
 
 /* { dg-final { scan-tree-dump-times "link_error" 0 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp70.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp70.c
index e9a7563dcdf..4a17e45f718 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp70.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp70.c
@@ -25,4 +25,3 @@ bar (unsigned int s)
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp71.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp71.c
index 2d1a2402995..0308fc1c420 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp71.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp71.c
@@ -19,4 +19,3 @@ int bar(char c)
 }
 
 /* { dg-final { scan-tree-dump-times "return 0;" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp77.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp77.c
index c0a8a865388..1721604d4e5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp77.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp77.c
@@ -44,4 +44,3 @@ void g(unsigned T x)
 }
 
 /* { dg-final { scan-tree-dump-not "impossible" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp79.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp79.c
index 88c1bd85821..d5d60223629 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp79.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp79.c
@@ -20,4 +20,3 @@ void f (NT x, NT y)
 }
 
 /* { dg-final { scan-tree-dump "do_not_go_away" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp81.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp81.c
index bb38f27c0d7..13d908e2fc2 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp81.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp81.c
@@ -33,6 +33,5 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vrp_keep \\(" 2 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp83.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp83.c
index 6237adfe944..db05d2290bf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp83.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp83.c
@@ -57,4 +57,3 @@ f4 (unsigned int s, unsigned int b)
 }
 
 /* { dg-final { scan-tree-dump-times "vrp_keep \\(" 6 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp84.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp84.c
index 8f8dc0d2ebe..ae472b795bf 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp84.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp84.c
@@ -18,4 +18,3 @@ f2 (int s, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "vrp_keep \\(" 1 "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp85.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp85.c
index ad2b38d02c1..0fcf16647fb 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp85.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp85.c
@@ -37,4 +37,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c
index ee7ed5f0852..c07f69ebc9d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp86.c
@@ -25,4 +25,3 @@ foo (unsigned T x)
 
 /* { dg-final { scan-tree-dump "fn1call" "vrp1"} } */
 /* { dg-final { scan-tree-dump "fn2call" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c
index eb4f618bcaf..7641c974cc5 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp87.c
@@ -79,6 +79,4 @@ bitmap_ior_into (bitmap a, const_bitmap b)
 /* Verify that DCE after VRP2 eliminates a dead conversion
    to a (Bool).  */
 /* { dg-final { scan-tree-dump "Deleting.*_Bool.*;" "cddce2"} } */
-/* { dg-final { cleanup-tree-dump "vrp2" } } */
-/* { dg-final { cleanup-tree-dump "cddce2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp88.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp88.c
index e43bdffbba1..f70b3119432 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp88.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp88.c
@@ -34,6 +34,5 @@ bitmap_single_bit_set_p (const_bitmap a)
 
 /* Verify that VRP simplified an "if" statement.  */
 /* { dg-final { scan-tree-dump "Folded into: if.*" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp89.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp89.c
index 3e1d96e42af..2142e7555bd 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp89.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp89.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-vrp1" } */
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
 #define A(fn, arg, min, max) \
   if (__builtin_##fn (arg) < min || __builtin_##fn (arg) > max) \
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp90.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp90.c
index 836c335b698..0fed84b43a4 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp90.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp90.c
@@ -1,7 +1,6 @@
 /* { dg-do link } */
 /* { dg-options "-O2 -fdump-tree-vrp1" } */
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
 extern void link_error (void);
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp91.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp91.c
index 68d8fd33a0b..d1fea9804a3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp91.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp91.c
@@ -19,4 +19,3 @@ void foo ()
 }
 
 /* { dg-final { scan-tree-dump "\\\[0, 7\\\]" "vrp2" } } */
-/* { dg-final { cleanup-tree-dump "vrp2" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
index a84ba8e2903..b096e9b3602 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp92.c
@@ -20,4 +20,3 @@ int foo (int i, int j)
 
 /* { dg-final { scan-tree-dump "res_.: \\\[1, 1\\\]" "vrp1" } } */
 /* { dg-final { scan-tree-dump-not "Threaded" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp93.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp93.c
index d78c399c3e1..31beb6eb0f6 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp93.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp93.c
@@ -3,7 +3,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fdump-tree-vrp1" } */
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1"} } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
 
 #define A(fn, arg, min, max) \
   if (__builtin_##fn (arg) < min || __builtin_##fn (arg) > max) \
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp94.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp94.c
index 5cd53297000..8edefb23d2f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp94.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp94.c
@@ -34,4 +34,3 @@ foo2 (unsigned int x, unsigned int y)
 }
 
 /* { dg-final { scan-tree-dump-not "abort" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp95.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp95.c
index be208bafd60..b894e24d795 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp95.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp95.c
@@ -47,4 +47,3 @@ range (unsigned long long int x, int y)
 
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1" } } */
 /* { dg-final { scan-tree-dump "required_check" "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp96.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp96.c
index e17e4240818..f225f221f1d 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp96.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp96.c
@@ -50,4 +50,3 @@ baz (T b, T c)
 
 /* { dg-final { scan-tree-dump-not "link_error" "vrp1" } } */
 /* { dg-final { scan-tree-dump-times "required_check" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp97.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp97.c
index 3805ca9f31f..582024d35e8 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/vrp97.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp97.c
@@ -16,4 +16,3 @@ int g(int a, int b)
 }
 
 /* { dg-final { scan-tree-dump-times "return 1;" 2 "vrp1" } } */
-/* { dg-final { cleanup-tree-dump "vrp1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c b/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c
index 6c976d57c15..0e54a3b2fd9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-1.c
@@ -20,5 +20,4 @@ main ()
 /* Function should be inlined as called once.  */
 /* { dg-final { scan-tree-dump-not "large_function" "optimized"} } */
 
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c b/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c
index bbdd0dd48cc..f5eb64bb36e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/wholeprogram-2.c
@@ -5,4 +5,3 @@ externally_visible_function ()
 {
 }
 /* { dg-final { scan-tree-dump "externally_visible_function" "optimized"} } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/writeonly.c b/gcc/testsuite/gcc.dg/tree-ssa/writeonly.c
index 7a8b7991c19..5680c489251 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/writeonly.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/writeonly.c
@@ -18,4 +18,3 @@ t()
 /* { dg-final { scan-tree-dump "magic2" "optimized"} } */
 /* { dg-final { scan-tree-dump "foo" "optimized"} } */
  
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/ucnid-6.c b/gcc/testsuite/gcc.dg/ucnid-6.c
index 70dd7b63cbf..3f67b86f8d6 100644
--- a/gcc/testsuite/gcc.dg/ucnid-6.c
+++ b/gcc/testsuite/gcc.dg/ucnid-6.c
@@ -26,4 +26,3 @@ int main (void)
   
   return 0;
 }
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/union-4.c b/gcc/testsuite/gcc.dg/union-4.c
index eb7f95b0802..0ed98206c42 100644
--- a/gcc/testsuite/gcc.dg/union-4.c
+++ b/gcc/testsuite/gcc.dg/union-4.c
@@ -20,4 +20,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-rtl-dump-not "abort" "cse1" { target i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "cse1" } } */
diff --git a/gcc/testsuite/gcc.dg/unroll-3.c b/gcc/testsuite/gcc.dg/unroll-3.c
index d3b9637fa6a..9ea462e2a0b 100644
--- a/gcc/testsuite/gcc.dg/unroll-3.c
+++ b/gcc/testsuite/gcc.dg/unroll-3.c
@@ -29,4 +29,3 @@ int foo2(void)
 }
 
 /* { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 1 "cunrolli" } } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/unroll-4.c b/gcc/testsuite/gcc.dg/unroll-4.c
index 01378618ad4..242c416bb33 100644
--- a/gcc/testsuite/gcc.dg/unroll-4.c
+++ b/gcc/testsuite/gcc.dg/unroll-4.c
@@ -29,4 +29,3 @@ int foo2(void)
 }
 
 /* { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 1 "cunrolli" } } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/unroll-5.c b/gcc/testsuite/gcc.dg/unroll-5.c
index 679d8f916b6..329b9c07463 100644
--- a/gcc/testsuite/gcc.dg/unroll-5.c
+++ b/gcc/testsuite/gcc.dg/unroll-5.c
@@ -29,4 +29,3 @@ int foo2(void)
 }
 
 /* { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 1 "cunrolli" } } */
-/* { dg-final { cleanup-tree-dump "cunrolli" } } */
diff --git a/gcc/testsuite/gcc.dg/unroll-6.c b/gcc/testsuite/gcc.dg/unroll-6.c
index edb9c26a685..8e8b7264fcd 100644
--- a/gcc/testsuite/gcc.dg/unroll-6.c
+++ b/gcc/testsuite/gcc.dg/unroll-6.c
@@ -32,4 +32,3 @@ int t2()
 /* { dg-final { scan-rtl-dump-not "realistic bound: 999999" "loop2_unroll" } } */
 /* { dg-final { scan-rtl-dump-times "upper bound: 2999999" 1 "loop2_unroll" } } */
 /* { dg-final { scan-rtl-dump-times "realistic bound: 2999999" 1 "loop2_unroll" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
diff --git a/gcc/testsuite/gcc.dg/var-expand1.c b/gcc/testsuite/gcc.dg/var-expand1.c
index fb039d362bd..3d536cef2b3 100644
--- a/gcc/testsuite/gcc.dg/var-expand1.c
+++ b/gcc/testsuite/gcc.dg/var-expand1.c
@@ -26,4 +26,3 @@ int main (void)
 }
 
 /* { dg-final { scan-rtl-dump "Expanding Accumulator" "loop2_unroll" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
diff --git a/gcc/testsuite/gcc.dg/var-expand3.c b/gcc/testsuite/gcc.dg/var-expand3.c
index 4bb1bbff9d5..dce6ec11c82 100644
--- a/gcc/testsuite/gcc.dg/var-expand3.c
+++ b/gcc/testsuite/gcc.dg/var-expand3.c
@@ -51,7 +51,6 @@ main (void)
 }
 
 /* { dg-final { scan-rtl-dump "Expanding Accumulator" "loop2_unroll" } } */
-/* { dg-final { cleanup-rtl-dump "loop2_unroll" } } */
 
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/O-pr46167.c b/gcc/testsuite/gcc.dg/vect/O-pr46167.c
index 490ddd45726..fc6e8a3fcb6 100644
--- a/gcc/testsuite/gcc.dg/vect/O-pr46167.c
+++ b/gcc/testsuite/gcc.dg/vect/O-pr46167.c
@@ -8,4 +8,3 @@ int foo (char c, int i)
   return s;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O1-pr33854.c b/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
index 4d4171fc449..2c4613efb94 100644
--- a/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
+++ b/gcc/testsuite/gcc.dg/vect/O1-pr33854.c
@@ -18,5 +18,4 @@ void uniform_correlation_matrix (VMatrix * v)
     xbar[i] /= m;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/O1-pr41008.c b/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
index bbdea127ce8..17579a34b95 100644
--- a/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
+++ b/gcc/testsuite/gcc.dg/vect/O1-pr41008.c
@@ -19,5 +19,4 @@ void map_do()
   foo (jsav, ksav);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr36098.c b/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
index b0b8e3c9466..e5461edfd3e 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr36098.c
@@ -18,4 +18,3 @@ void foo (int ncons, t_sortblock *sb, int *iatom)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c b/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
index 400ff29164e..c3f0f6dc1be 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr39675-2.c
@@ -28,5 +28,4 @@ foo ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided4 } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr41881.c b/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
index 7180b4c2a92..98511f6cd0c 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr41881.c
@@ -26,5 +26,4 @@ TYPE fun2(TYPE *x, TYPE *y, unsigned int n)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_int_mult && {! vect_no_align } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr45971.c b/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
index 1b7c65c8066..5d4a581f247 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr45971.c
@@ -9,5 +9,4 @@ foo (int *x, int *y)
     y[i] = (x[i] == 1) ? i + 1 : -(i + 1);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr46077.c b/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
index 6546f6e3c00..1a42db20c22 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr46077.c
@@ -7,4 +7,3 @@ void intf_pcmPlayEffect(int *src, int *dst, int size) {
   *dst++ = *src & 0x80 ? (*src++ & 0x7f) : -*src++;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-pr49087.c b/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
index c897fbcd0c4..bc862f229df 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-pr49087.c
@@ -34,4 +34,3 @@ foo (int arg)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c b/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
index a35d90b3a00..42a59f4a155 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-slp-reduc-10.c
@@ -40,4 +40,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_int_mult && {! vect_no_align } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c b/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
index 0116c33fbb3..68a7e5ddf98 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr32243.c
@@ -24,4 +24,3 @@ put_mono_values_s8 (GLcontext * ctx, struct gl_renderbuffer *s8rb,
   dsrb->PutValues (ctx, dsrb, count, x, y, temp, mask);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c b/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
index 5dd776c3e26..7d13f1c2e17 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr34223.c
@@ -30,4 +30,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c b/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
index 1d36ad8a1b6..75bd17106e3 100644
--- a/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
+++ b/gcc/testsuite/gcc.dg/vect/O3-vect-pr61917.c
@@ -11,4 +11,3 @@ fn1 ()
   return d; 
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/Os-vect-95.c b/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
index 8f6e53a6f96..97e516ed68e 100644
--- a/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
+++ b/gcc/testsuite/gcc.dg/vect/Os-vect-95.c
@@ -57,4 +57,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
index 670e45491c3..f8c36a89fc7 100644
--- a/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
+++ b/gcc/testsuite/gcc.dg/vect/aligned-section-anchors-nest-1.c
@@ -31,4 +31,3 @@ int *foo(void)
 }
 
 /* { dg-final { scan-ipa-dump-times "Increasing alignment of decl" 3 "increase_alignment" } } */
-/* { dg-final { cleanup-ipa-dump "increase_alignment" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-1.c b/gcc/testsuite/gcc.dg/vect/bb-slp-1.c
index 138a8ddbcc3..8baba4d5f9f 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-1.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-1.c
@@ -57,6 +57,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-10.c b/gcc/testsuite/gcc.dg/vect/bb-slp-10.c
index 44308c5f6b5..46b22515913 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-10.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-10.c
@@ -51,5 +51,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump "unsupported alignment in basic block." "slp2" { xfail vect_element_align } } } */
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_element_align } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-11.c b/gcc/testsuite/gcc.dg/vect/bb-slp-11.c
index 735bd7004c2..cb8bddde1cf 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-11.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-11.c
@@ -50,5 +50,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect64 } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-13.c b/gcc/testsuite/gcc.dg/vect/bb-slp-13.c
index 9c153a1fff3..302e20fb218 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-13.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-13.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-14.c b/gcc/testsuite/gcc.dg/vect/bb-slp-14.c
index 5f01e467557..e7d4e6ca5b8 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-14.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-14.c
@@ -49,5 +49,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-15.c b/gcc/testsuite/gcc.dg/vect/bb-slp-15.c
index 93d792d63f8..a749041ed77 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-15.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-15.c
@@ -52,5 +52,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-16.c b/gcc/testsuite/gcc.dg/vect/bb-slp-16.c
index 5107408aa19..42abd64c290 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-16.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-16.c
@@ -66,6 +66,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-17.c b/gcc/testsuite/gcc.dg/vect/bb-slp-17.c
index 0a92ee70ddf..c20e0ff3057 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-17.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-17.c
@@ -58,5 +58,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-18.c b/gcc/testsuite/gcc.dg/vect/bb-slp-18.c
index 21b1dfd25bc..94766537a59 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-18.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-18.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-19.c b/gcc/testsuite/gcc.dg/vect/bb-slp-19.c
index 021a4ee3e86..42cd2949575 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-19.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-19.c
@@ -54,5 +54,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { xfail *-*-* }  } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-2.c b/gcc/testsuite/gcc.dg/vect/bb-slp-2.c
index 8947f5e60f7..cee9db5e032 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-2.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-2.c
@@ -54,6 +54,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-20.c b/gcc/testsuite/gcc.dg/vect/bb-slp-20.c
index c17186931b6..f6dfaa7d3d4 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-20.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-20.c
@@ -65,5 +65,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-21.c b/gcc/testsuite/gcc.dg/vect/bb-slp-21.c
index 5b2247bcc18..c45eb44f0bc 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-21.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-21.c
@@ -66,5 +66,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "slp2" { target { ! {vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-22.c b/gcc/testsuite/gcc.dg/vect/bb-slp-22.c
index 597f2cec04d..992f5898409 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-22.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-22.c
@@ -65,5 +65,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { target { ! {vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 2 "slp2"  { target vect_int_mult  } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-23.c b/gcc/testsuite/gcc.dg/vect/bb-slp-23.c
index adb69795e6e..e57ca41520a 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-23.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-23.c
@@ -52,5 +52,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-24.c b/gcc/testsuite/gcc.dg/vect/bb-slp-24.c
index 80f4fbb4e20..d0c12426c88 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-24.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-24.c
@@ -57,6 +57,4 @@ int main (void)
 /* Exclude POWER8 (only POWER cpu for which vect_element_align is true)
    because loops have vectorized before SLP gets a shot.  */
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" { target { vect_element_align && { ! powerpc*-*-* } } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-25.c b/gcc/testsuite/gcc.dg/vect/bb-slp-25.c
index 5f4908b17a9..14314c283f0 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-25.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-25.c
@@ -57,6 +57,4 @@ int main (void)
 /* Exclude POWER8 (only POWER cpu for which vect_element_align is true)
    because loops have vectorized before SLP gets a shot.  */
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" { target { vect_element_align && { ! powerpc*-*-* } } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-26.c b/gcc/testsuite/gcc.dg/vect/bb-slp-26.c
index 3eaead7db8c..071c25372de 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-26.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-26.c
@@ -57,6 +57,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" { target { vect64 && vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-27.c b/gcc/testsuite/gcc.dg/vect/bb-slp-27.c
index ae6ff8368b1..8ef8bb09614 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-27.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-27.c
@@ -45,6 +45,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target { vect_int_mult && { vect_unpack && vect_pack_trunc } } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-28.c b/gcc/testsuite/gcc.dg/vect/bb-slp-28.c
index 2ef0667972d..a4c01b9b243 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-28.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-28.c
@@ -67,6 +67,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target { vect_int_mult &&  { vect_pack_trunc && vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-29.c b/gcc/testsuite/gcc.dg/vect/bb-slp-29.c
index 9152e6ca132..7a622ae44b9 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-29.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-29.c
@@ -57,6 +57,4 @@ int main (void)
 /* Exclude POWER8 (only POWER cpu for which vect_element_align is true)
    because loops have vectorized before SLP gets a shot.  */
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1"  { target { { vect_int_mult && vect_element_align } && { ! powerpc*-*-* } } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-3.c b/gcc/testsuite/gcc.dg/vect/bb-slp-3.c
index 0fbd3b2b8f0..4f47738686a 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-3.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-3.c
@@ -43,5 +43,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-30.c b/gcc/testsuite/gcc.dg/vect/bb-slp-30.c
index 11c06087fcb..d80b1199998 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-30.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-30.c
@@ -44,4 +44,3 @@ test1(void)
 int main() { test1(); return a[21]; }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-31.c b/gcc/testsuite/gcc.dg/vect/bb-slp-31.c
index 017eba6627c..8e4e2d4c2d2 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-31.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-31.c
@@ -10,4 +10,3 @@ void f(){
 }
 
 /* { dg-final { scan-tree-dump "basic block vectorized" "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-32.c b/gcc/testsuite/gcc.dg/vect/bb-slp-32.c
index 6751a96fab8..4b786a457da 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-32.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-32.c
@@ -20,4 +20,3 @@ int foo (int *p)
 }
 
 /* { dg-final { scan-tree-dump "vectorization is not profitable" "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-33.c b/gcc/testsuite/gcc.dg/vect/bb-slp-33.c
index 4e84f51ee8d..bbb13ef798e 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-33.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-33.c
@@ -46,4 +46,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "slp2" { target { vect_element_align || vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-34.c b/gcc/testsuite/gcc.dg/vect/bb-slp-34.c
index 62949cc4494..c51c7706adc 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-34.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-34.c
@@ -33,5 +33,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump "basic block vectorized" "slp2" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-35.c b/gcc/testsuite/gcc.dg/vect/bb-slp-35.c
index 7000e32fa22..5803f8e8080 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-35.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-35.c
@@ -10,4 +10,3 @@ void foo (int * __restrict__ p, short * __restrict__ q)
 }
 
 /* { dg-final { scan-tree-dump "basic block vectorized" "slp2" { target vect_hw_misalign } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-4.c b/gcc/testsuite/gcc.dg/vect/bb-slp-4.c
index 99589591a49..8775fa2e5a3 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-4.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-4.c
@@ -39,5 +39,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 0 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-5.c b/gcc/testsuite/gcc.dg/vect/bb-slp-5.c
index 10a410bafcf..192b7dce8b4 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-5.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-5.c
@@ -48,5 +48,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-6.c b/gcc/testsuite/gcc.dg/vect/bb-slp-6.c
index 6ab81832c02..98fe5ea6283 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-6.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-6.c
@@ -46,5 +46,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-7.c b/gcc/testsuite/gcc.dg/vect/bb-slp-7.c
index 275f1d3142f..ab54a48332f 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-7.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-7.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 0 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-8.c b/gcc/testsuite/gcc.dg/vect/bb-slp-8.c
index 5012d02cdc2..750d713da0c 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-8.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-8.c
@@ -49,5 +49,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { target vect_hw_misalign } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-8a.c b/gcc/testsuite/gcc.dg/vect/bb-slp-8a.c
index 87b6cb3e94c..cf355efe69a 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-8a.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-8a.c
@@ -48,5 +48,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 0 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-8b.c b/gcc/testsuite/gcc.dg/vect/bb-slp-8b.c
index 13eba70c359..a5b643bc749 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-8b.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-8b.c
@@ -50,5 +50,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { target vect_hw_misalign } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-9.c b/gcc/testsuite/gcc.dg/vect/bb-slp-9.c
index df85ba226e2..d022d5f89db 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-9.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-9.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { xfail  { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-cond-1.c b/gcc/testsuite/gcc.dg/vect/bb-slp-cond-1.c
index 11415c89cdd..35811bd3e24 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-cond-1.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-cond-1.c
@@ -42,6 +42,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" { target vect_element_align } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c b/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c
index 205c0b047fc..47b1a436651 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-1.c
@@ -51,5 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "slp2" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 8 "slp2" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 8 "slp2" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c b/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c
index 11aeb4afb52..4635626b9b6 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pattern-2.c
@@ -49,5 +49,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" { target { vect_element_align && vect_pack_trunc } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-pr65935.c b/gcc/testsuite/gcc.dg/vect/bb-slp-pr65935.c
index d0d9530700e..a6c75c7c77f 100644
--- a/gcc/testsuite/gcc.dg/vect/bb-slp-pr65935.c
+++ b/gcc/testsuite/gcc.dg/vect/bb-slp-pr65935.c
@@ -58,5 +58,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-fast-math-vect-pr29925.c
index d5c0a1a1331..6bce4ea0929 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-fast-math-vect-pr29925.c
@@ -36,5 +36,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c
index 3c9bfdaa044..133ab0edca0 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c
@@ -87,4 +87,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c
index 86bfb58b0a9..33bf7f1a5a6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-33.c
@@ -37,4 +37,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c
index b916cd91dfb..51847599fa6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-68.c
@@ -85,4 +85,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c
index a7b86cebd9c..29bb6c705b7 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-reduc-1char.c
@@ -49,4 +49,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a.c
index b9fd2173d98..915a9626192 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2"  { xfail  { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c
index 00e631b1366..d8fe35c6091 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-fast-math-vect-pr29925.c
@@ -36,5 +36,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c
index 76c7850fa10..e0093c4a38b 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c
@@ -24,5 +24,4 @@ ggSpectrum_Set20(float * data, float d)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c
index d9adf6f333c..c00a5bec6d5 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-12.c
@@ -115,5 +115,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  {target { vect_strided8 && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" {target { vect_strided8 && vect_int_mult } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-33.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-33.c
index 3d6d628b727..e27152eb91e 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-33.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-33.c
@@ -41,4 +41,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c
index f3d169b0324..f181bd845db 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-slp-34.c
@@ -72,4 +72,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31a.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31a.c
index 161497faf68..ff67ff28130 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31a.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c
index b3224f943d6..b0f193f042e 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31b.c
@@ -47,4 +47,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31c.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31c.c
index 9dcd09aba42..d062d659ffb 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-31c.c
@@ -47,4 +47,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c
index 11036b0bced..e0764f877f6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-33.c
@@ -40,4 +40,3 @@ int main (void)
 
 /* Versioning to align the store is used. Overhead of versioning is not too high.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target {! vector_alignment_reachable} } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68a.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68a.c
index d0d40ac338a..ce27e4f0821 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68a.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68b.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68b.c
index 4e52af8b851..dae5a78808f 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68b.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68c.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68c.c
index 58c5e9fdbe5..8221f9e49f8 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-68c.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c
index d11a9a2d781..851175f158f 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76a.c
@@ -44,4 +44,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c
index 2d1ee97c398..d2f9992b7f4 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76b.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* Versioning to align the store is used. Overhead of versioning is not too high.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_no_align || {! vector_alignment_reachable} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c
index 1142e7a2717..de1039f35ec 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-76c.c
@@ -44,4 +44,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-outer-fir.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-outer-fir.c
index 5123950806d..1a1a8687840 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-outer-fir.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-outer-fir.c
@@ -68,4 +68,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reduc-1char.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reduc-1char.c
index 55334fdd20d..318346a00f1 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reduc-1char.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-vect-reduc-1char.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-fast-math-vect-pr29925.c
index 00e631b1366..d8fe35c6091 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-fast-math-vect-pr29925.c
@@ -36,5 +36,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31a.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31a.c
index 272b3f0d733..9f75ce81aff 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31a.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31b.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31b.c
index b3224f943d6..b0f193f042e 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31b.c
@@ -47,4 +47,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31c.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31c.c
index 9dcd09aba42..d062d659ffb 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31c.c
@@ -47,4 +47,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31d.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31d.c
index 736804fd020..843d739af4d 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31d.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-31d.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-33.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-33.c
index 11036b0bced..e0764f877f6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-33.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-33.c
@@ -40,4 +40,3 @@ int main (void)
 
 /* Versioning to align the store is used. Overhead of versioning is not too high.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target {! vector_alignment_reachable} } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68a.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68a.c
index d0d40ac338a..ce27e4f0821 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68a.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68b.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68b.c
index 4e52af8b851..dae5a78808f 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68b.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68c.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68c.c
index 58c5e9fdbe5..8221f9e49f8 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68c.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68d.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68d.c
index 9cec936333a..0468455ccc7 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68d.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-68d.c
@@ -47,4 +47,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76a.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76a.c
index 124493b0321..e18822c93f5 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76a.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76a.c
@@ -44,4 +44,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76b.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76b.c
index 4969a31e0ab..1d6075e1a4c 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76b.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76b.c
@@ -44,4 +44,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76c.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76c.c
index b42934c68f5..672e967ec2e 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76c.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-76c.c
@@ -44,4 +44,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-iv-9.c b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-iv-9.c
index af694a36dfd..0f09405b89a 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-iv-9.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/spu/costmodel-vect-iv-9.c
@@ -35,4 +35,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target {! vect_int_mult } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-fast-math-vect-pr29925.c
index d5c0a1a1331..6bce4ea0929 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-fast-math-vect-pr29925.c
@@ -36,5 +36,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr30843.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr30843.c
index 5d5d4158747..9cf614165bb 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr30843.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr30843.c
@@ -22,5 +22,4 @@ void dacP98FillRGBMap (unsigned char *pBuffer)
 
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 1 "vect" { target vect_interleave
 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr64909.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr64909.c
index 0f9feac6a33..796b6104dee 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr64909.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-pr64909.c
@@ -12,4 +12,3 @@ void t()
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops in function" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c
index 3c9bfdaa044..133ab0edca0 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c
@@ -87,4 +87,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c
index 86bfb58b0a9..33bf7f1a5a6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-33.c
@@ -37,4 +37,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-68.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-68.c
index b916cd91dfb..51847599fa6 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-68.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-68.c
@@ -85,4 +85,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-reduc-1char.c b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-reduc-1char.c
index a7b86cebd9c..29bb6c705b7 100644
--- a/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-reduc-1char.c
+++ b/gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-reduc-1char.c
@@ -49,4 +49,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorization not profitable" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c
index 5fa50d6e2fd..1c75c87ead2 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-1.c
@@ -46,5 +46,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target { vect_call_copysignf && vect_call_sqrtf } } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c
index 982b32dce4e..49a7c057ee2 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-2.c
@@ -64,5 +64,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 2 "slp2" { target vect_call_lrint } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c
index 92caddef418..51443da1b91 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-bb-slp-call-3.c
@@ -65,5 +65,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-ifcvt-1.c b/gcc/testsuite/gcc.dg/vect/fast-math-ifcvt-1.c
index ba22d8d7889..f51202e0855 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-ifcvt-1.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-ifcvt-1.c
@@ -15,4 +15,3 @@ bestseries9 (float * __restrict__ arr, int len)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c b/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c
index 5b834568a78..50ea7ffc1b9 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-pr35982.c
@@ -22,4 +22,3 @@ float method2_int16 (struct mem *mem)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_extract_even_odd || vect_strided2 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_extract_even_odd || vect_strided2 } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-pr43074.c b/gcc/testsuite/gcc.dg/vect/fast-math-pr43074.c
index 80077ba7d0d..b3e9884e9eb 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-pr43074.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-pr43074.c
@@ -13,4 +13,3 @@ pvslockprocess(float *fout, float *fin, int framesize)
   return mag;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-pr44152.c b/gcc/testsuite/gcc.dg/vect/fast-math-pr44152.c
index 80ce3dc8d23..4dd3b6f8463 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-pr44152.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-pr44152.c
@@ -34,4 +34,3 @@ foo (int x)
 }
 
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-pr55281.c b/gcc/testsuite/gcc.dg/vect/fast-math-pr55281.c
index 4d75403e77d..49232616b45 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-pr55281.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-pr55281.c
@@ -27,4 +27,3 @@ foo (int *a, int b, float *d, float *e, int *f)
       f[i] = e[i] + bar (a[i], d[i]);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-slp-27.c b/gcc/testsuite/gcc.dg/vect/fast-math-slp-27.c
index 4c2c5c510f4..3597b3acef8 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-slp-27.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-slp-27.c
@@ -14,4 +14,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-slp-38.c b/gcc/testsuite/gcc.dg/vect/fast-math-slp-38.c
index 241f9f5c09d..7c7acd5bab6 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-slp-38.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-slp-38.c
@@ -19,4 +19,3 @@ foo (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-1.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-1.c
index db6df7e7511..228190ab05d 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-1.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-1.c
@@ -96,4 +96,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 4 "vect" { target { vect_call_copysignf && vect_call_sqrtf } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" { target { vect_call_copysignf && vect_call_sqrtf } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-2.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-2.c
index ed7a9dceef7..274ff0f9942 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-2.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-call-2.c
@@ -127,4 +127,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 6 "vect" { target vect_call_lrint } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 4 "vect" { target vect_call_lrint } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c
index db55b30098d..893e521ed8b 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-complex-3.c
@@ -57,4 +57,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-outer-7.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-outer-7.c
index 4dafa3407f2..50ce3547eed 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-outer-7.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-outer-7.c
@@ -20,4 +20,3 @@ void test2 (float x)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-1.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-1.c
index 4d000f192f1..6da61daa812 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-1.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-1.c
@@ -11,4 +11,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-2.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-2.c
index a9d927b3f60..fdcc4a50cdb 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-2.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pow-2.c
@@ -29,5 +29,4 @@ main (void)
 {
   d_type tmp = main1 ();
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr25911.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr25911.c
index 633382f5b78..e1d0d4571fb 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr25911.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr25911.c
@@ -12,4 +12,3 @@ float bessel_Kn_scaled_small_x(int n)
   return sum1;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
index be2f1a913a1..28713690d91 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-pr29925.c
@@ -36,5 +36,4 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-5.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-5.c
index 377d74b7779..663976b5707 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-5.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-5.c
@@ -52,4 +52,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-7.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-7.c
index 9f36db2e701..15e7248ea81 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-7.c
@@ -52,4 +52,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-8.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-8.c
index 43a55f3a1d0..840d07cb8ca 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-8.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-8.c
@@ -20,4 +20,3 @@ float f (unsigned n)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-9.c b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-9.c
index eb703f5af86..0e9440caa9c 100644
--- a/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-9.c
+++ b/gcc/testsuite/gcc.dg/vect/fast-math-vect-reduc-9.c
@@ -27,4 +27,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c b/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
index 176aa7eafc0..9ea09745481 100644
--- a/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
+++ b/gcc/testsuite/gcc.dg/vect/ggc-pr37574.c
@@ -19,4 +19,3 @@ int main (void) {
    return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/if-cvt-stores-vect-ifcvt-18.c b/gcc/testsuite/gcc.dg/vect/if-cvt-stores-vect-ifcvt-18.c
index cdf687ab420..71f2db3e0f2 100644
--- a/gcc/testsuite/gcc.dg/vect/if-cvt-stores-vect-ifcvt-18.c
+++ b/gcc/testsuite/gcc.dg/vect/if-cvt-stores-vect-ifcvt-18.c
@@ -66,4 +66,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { xfail { { vect_no_align && { ! vect_hw_misalign } } || { ! vect_strided2 } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-fast-math-vect16.c b/gcc/testsuite/gcc.dg/vect/no-fast-math-vect16.c
index 69837052904..def8efb20c4 100644
--- a/gcc/testsuite/gcc.dg/vect/no-fast-math-vect16.c
+++ b/gcc/testsuite/gcc.dg/vect/no-fast-math-vect16.c
@@ -35,4 +35,3 @@ int main (void)
 
 /* Requires fast-math.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c b/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
index 26e2a644694..996e5860ee0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
+++ b/gcc/testsuite/gcc.dg/vect/no-fre-pre-pr50208.c
@@ -14,4 +14,3 @@ void foo (int j)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-math-errno-slp-32.c b/gcc/testsuite/gcc.dg/vect/no-math-errno-slp-32.c
index c952e7f1b11..1e88c0d27f3 100644
--- a/gcc/testsuite/gcc.dg/vect/no-math-errno-slp-32.c
+++ b/gcc/testsuite/gcc.dg/vect/no-math-errno-slp-32.c
@@ -14,4 +14,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump "pattern recognized" "vect" { xfail spu*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-math-errno-vect-pow-1.c b/gcc/testsuite/gcc.dg/vect/no-math-errno-vect-pow-1.c
index 03de93bf46c..b943f5a967a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-math-errno-vect-pow-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-math-errno-vect-pow-1.c
@@ -11,4 +11,3 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump "pattern recognized" "vect" { xfail spu*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
index 9d8a403fe98..82b37d4ca71 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-1.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
index 9a4fa3f2538..cafb96f5284 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-2.c
@@ -46,4 +46,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
index a4755e13add..b376fb1d13e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-3.c
@@ -45,4 +45,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
index afd2bc4145d..384ea07676d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-4.c
@@ -54,4 +54,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
index 0246a3cda89..64c8dfc470a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-outer-5.c
@@ -51,4 +51,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
index c268af7fb4c..bbaf964eab0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-noreassoc-slp-reduc-7.c
@@ -38,5 +38,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
index 01fcbaa95a4..0834fd3d86c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-1.c
@@ -20,4 +20,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
index e4d6f23f80d..277b73b4934 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10.c
@@ -51,4 +51,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
index 95906baedd6..325e201e2da 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10a.c
@@ -55,4 +55,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
index 544b89ae8c6..d9cf28b22d9 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-10b.c
@@ -54,4 +54,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
index 16b0cc0c361..a25001b57bf 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-11.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
index 90ea32ddd9d..e4202b10d06 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-12.c
@@ -47,4 +47,3 @@ int main (void)
 
 /* Until we support multiple types in the inner loop  */
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
index b70aabd84a6..04166494fbc 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-13.c
@@ -64,4 +64,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
index d7614dc9df8..411cc8fea4d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-14.c
@@ -58,4 +58,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
index b90167675b7..9d642415a13 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-15.c
@@ -45,4 +45,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
index ea58d395c3d..f00132ede83 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-16.c
@@ -59,4 +59,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { ! {vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
index c11a1aa49de..2dfdd59e14e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-17.c
@@ -65,4 +65,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { ! {vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
index 60cb00de485..49dd5207d86 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-18.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target { vect_interleave || vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
index 58bcf0870f5..934eadd3e32 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-19.c
@@ -49,4 +49,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { ! {vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
index 13b37883c2e..0f7fda6e50d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-2.c
@@ -17,4 +17,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
index 22b4aa96f60..42e218924fd 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-20.c
@@ -51,4 +51,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
index f955e4a12d6..75b7f066aba 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-21.c
@@ -59,4 +59,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { ! { vect_pack_trunc } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
index ac24b05d0a4..ec04bc28f62 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-22.c
@@ -51,4 +51,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
index 15afdfd5da7..ee39891efea 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-3.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
index 5cf9ade116e..f8ef02d2519 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-4.c
@@ -52,4 +52,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
index 338e0283bd4..2ef43cd146b 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-5.c
@@ -50,4 +50,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
index 4aa4a5e98c2..7ac4e1ed949 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6-global.c
@@ -53,4 +53,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
index 187a78c3744..d4d84220d8d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-6.c
@@ -53,4 +53,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { unaligned_stack || { vect_no_align && { ! vect_hw_misalign } } } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
index 9606d300cd2..906b450dcbb 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-7.c
@@ -72,4 +72,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
index afa5b3d241e..7c9113bc0f0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-8.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail { ! { vect_element_align } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
index e0031274f1b..cea495c4480 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
index 730600a7ae8..9e1f7890dd1 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9a.c
@@ -51,4 +51,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
index a8a52b963ce..ee65ceb6f92 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-outer-9b.c
@@ -50,4 +50,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
index 0f11142eb75..1cb455bc564 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-pr49199.c
@@ -15,4 +15,3 @@ int foo (void)
   return x;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
index 547a49d58bf..ccebb711306 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-30.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
index 0a2149a4525..dc5f16fcfd2 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-slp-31.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
index 9793a129e72..b78af245a39 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-1.c
@@ -31,4 +31,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
index adca5cba59c..e541bb65276 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-2.c
@@ -47,4 +47,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
index 9bf3b4b762c..3bc73077b1f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-scevccp-vect-iv-3.c
@@ -25,4 +25,3 @@ unsigned int main1 ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" { target vect_widen_sum_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
index 79c34220bd4..c7b8b0eeff2 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-31.c
@@ -90,4 +90,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
index 6ac003207d9..1edad1ca30e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-34.c
@@ -40,4 +40,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
index b5d29235750..0fb9594ea16 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-36.c
@@ -47,4 +47,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
index 119ee1a4bc1..fc52c92b89a 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-64.c
@@ -86,4 +86,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
index 5ca84dbb708..581554064b5 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-65.c
@@ -83,4 +83,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
index ffb455c05d5..805024d8058 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-66.c
@@ -81,4 +81,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { target { {! vect_aligned_arrays} && {vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { {vect_aligned_arrays} && {! vect_sizes_32B_16B} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
index d0d2972e51e..5a4e4e95eb6 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-68.c
@@ -92,4 +92,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 4 "vect" { target { {! vect_aligned_arrays} && {vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { target { {vect_aligned_arrays} && {! vect_sizes_32B_16B} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
index cb7dc5c4bba..fe968de3432 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-69.c
@@ -118,4 +118,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { {! vector_alignment_reachable} || { vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
index fc99122b203..2199d11e2fa 100644
--- a/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
+++ b/gcc/testsuite/gcc.dg/vect/no-section-anchors-vect-outer-4h.c
@@ -45,4 +45,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
index e9d9570146b..d682387038e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-1.c
@@ -9,4 +9,3 @@ foo (float a[32], float b[2][32])
     a[i] = (b[0][i] > b[1][i]) ? b[0][i] : b[1][i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
index 3971c920afa..d0e4ec2373b 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-2.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_condition } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
index 673346a675c..d718b5923b1 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-111.c
@@ -36,4 +36,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target powerpc*-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target i?86-*-* x86_64-*-* ia64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
index a35b7ade8e6..b2a4230dea9 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-11.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
index 485e88cf383..ee5ec03bde3 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-12.c
@@ -30,4 +30,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
index 58e6dc0a9ca..dc71070060c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-13.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
index 58e6dc0a9ca..dc71070060c 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-14.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
index a15a0b1278c..afb9319c58f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
+++ b/gcc/testsuite/gcc.dg/vect/no-trapping-math-vect-ifcvt-15.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c b/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
index d94aa3a6439..ebde13167c8 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-dom-vect-bug.c
@@ -27,4 +27,3 @@ int main ()
 
   return 0;
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c b/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
index 11c0c70049f..a1824ccb011 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-fre-pr50039.c
@@ -11,5 +11,4 @@ int main(void) {
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c b/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
index 289a930cd7b..54aa89b8e23 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-pre-pr45241.c
@@ -17,4 +17,3 @@ foo (short x)
   return sum;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c b/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
index e370ef30700..e965910d66d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-pre-slp-29.c
@@ -74,5 +74,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c b/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
index c75ae5ecb40..c7f9cd3c598 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-reassoc-bb-slp-12.c
@@ -48,6 +48,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "basic block vectorized" 1 "slp2" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "slp1" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c b/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
index 6d70bd05e00..e7328fcdd21 100644
--- a/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
+++ b/gcc/testsuite/gcc.dg/vect/no-tree-sra-bb-slp-pr50730.c
@@ -14,4 +14,3 @@ A sum(A a,A b)
 }
 
 /* { dg-final { scan-tree-dump-times "not vectorized: more than one data ref in stmt" 0 "slp2" } } */
-/* { dg-final { cleanup-tree-dump "slp2" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-pr29145.c b/gcc/testsuite/gcc.dg/vect/no-vfa-pr29145.c
index 5896271aba2..a92ec9c1656 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-pr29145.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-pr29145.c
@@ -50,4 +50,3 @@ int main(void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
index 6372aabd63c..8548f8a6f15 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-101.c
@@ -47,5 +47,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
index 2221049d7d8..53a427d8d78 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102.c
@@ -55,5 +55,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c
index d7b68e53a36..c81a93b5683 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-102a.c
@@ -55,5 +55,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c
index dff14ff5a9e..739757d1f44 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-37.c
@@ -60,4 +60,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 4 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-43.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-43.c
index d09cd41447b..18d4d1bbe6d 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-43.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-43.c
@@ -91,4 +91,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 2 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 6 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-45.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-45.c
index 38328c1fd05..cad507a708f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-45.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-45.c
@@ -57,4 +57,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-49.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-49.c
index b883a94a95e..a364c7b0d6f 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-49.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-49.c
@@ -59,4 +59,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-51.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-51.c
index df463df6a86..69e921b9503 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-51.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-51.c
@@ -57,4 +57,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-53.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-53.c
index 28deeaeac26..b1c1d86587e 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-53.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-53.c
@@ -60,4 +60,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
index fd4288c9d29..83dc628f0b0 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-57.c
@@ -72,4 +72,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
index 8b1b6c6d8fb..9524454d367 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-61.c
@@ -74,4 +74,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c
index 1653f3d6c08..8d1c01736f7 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-79.c
@@ -48,4 +48,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-1.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-1.c
index 2be160426e2..da3506a4cec 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-1.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-1.c
@@ -52,5 +52,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" {xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "dependence distance negative" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-2.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-2.c
index 54f66ea1c37..227116306bc 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-2.c
@@ -52,4 +52,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" {xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "dependence distance negative" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-3.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-3.c
index 8a3dd54ec89..cd0eb844b21 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-3.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-depend-3.c
@@ -184,4 +184,3 @@ int main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 4 "vect" {xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "dependence distance negative" 4 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-dv-2.c b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-dv-2.c
index 2b4482a3c0b..55a69476522 100644
--- a/gcc/testsuite/gcc.dg/vect/no-vfa-vect-dv-2.c
+++ b/gcc/testsuite/gcc.dg/vect/no-vfa-vect-dv-2.c
@@ -76,4 +76,3 @@ int main ()
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "accesses have the same alignment." 2 "vect" { target { { vect_aligned_arrays } && {! vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "accesses have the same alignment." 1 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/nodump-forwprop-22.c b/gcc/testsuite/gcc.dg/vect/nodump-forwprop-22.c
index 6d33f006a73..ed80afbe3b7 100644
--- a/gcc/testsuite/gcc.dg/vect/nodump-forwprop-22.c
+++ b/gcc/testsuite/gcc.dg/vect/nodump-forwprop-22.c
@@ -17,4 +17,3 @@ void f (vec *px, vec *y, vec *z)
 
 /* { dg-final { scan-tree-dump-times "VEC_PERM_EXPR" 1 "cddce1" } } */
 /* { dg-final { scan-tree-dump-not "BIT_FIELD_REF" "cddce1" } } */
-/* { dg-final { cleanup-tree-dump "cddce1" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr16105.c b/gcc/testsuite/gcc.dg/vect/pr16105.c
index 50c16c468f7..3302835cbc9 100644
--- a/gcc/testsuite/gcc.dg/vect/pr16105.c
+++ b/gcc/testsuite/gcc.dg/vect/pr16105.c
@@ -19,4 +19,3 @@ void square(const float * __restrict__ a,
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr18308.c b/gcc/testsuite/gcc.dg/vect/pr18308.c
index 02aaed2f864..b71f08ede2c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr18308.c
+++ b/gcc/testsuite/gcc.dg/vect/pr18308.c
@@ -11,4 +11,3 @@ void bar(int j)
   if (k) foo();
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr18400.c b/gcc/testsuite/gcc.dg/vect/pr18400.c
index 50971046f62..012086138f7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr18400.c
+++ b/gcc/testsuite/gcc.dg/vect/pr18400.c
@@ -36,4 +36,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr18425.c b/gcc/testsuite/gcc.dg/vect/pr18425.c
index 08f7b65cc49..2fa1b799434 100644
--- a/gcc/testsuite/gcc.dg/vect/pr18425.c
+++ b/gcc/testsuite/gcc.dg/vect/pr18425.c
@@ -14,4 +14,3 @@ _M_fill_insert(unsigned int __n)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr18536.c b/gcc/testsuite/gcc.dg/vect/pr18536.c
index 6eac90ff14d..6d02675913b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr18536.c
+++ b/gcc/testsuite/gcc.dg/vect/pr18536.c
@@ -32,4 +32,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr20122.c b/gcc/testsuite/gcc.dg/vect/pr20122.c
index c9c523c5d12..3316270efbc 100644
--- a/gcc/testsuite/gcc.dg/vect/pr20122.c
+++ b/gcc/testsuite/gcc.dg/vect/pr20122.c
@@ -53,4 +53,3 @@ int main (int argc, char **argv)
    The loop in main is aligned.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" } } */
 /*  { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr21591.c b/gcc/testsuite/gcc.dg/vect/pr21591.c
index 425777738c2..d7bbc57e47d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr21591.c
+++ b/gcc/testsuite/gcc.dg/vect/pr21591.c
@@ -34,5 +34,4 @@ void f(void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr22480.c b/gcc/testsuite/gcc.dg/vect/pr22480.c
index a7e238f2271..5a2ab7cb2b7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr22480.c
+++ b/gcc/testsuite/gcc.dg/vect/pr22480.c
@@ -29,4 +29,3 @@ test_3 (void)
    bm[j] <<= am[j];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr22506.c b/gcc/testsuite/gcc.dg/vect/pr22506.c
index a618e329178..672ff90f3b4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr22506.c
+++ b/gcc/testsuite/gcc.dg/vect/pr22506.c
@@ -11,4 +11,3 @@ void foo()
     for (i=0; i<2; ++i) ;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr23816-1.c b/gcc/testsuite/gcc.dg/vect/pr23816-1.c
index 9c76d2e9dd6..216c4eb7a9e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr23816-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr23816-1.c
@@ -9,4 +9,3 @@ foo (float a[32], float b[2][32])
     a[i] = (b[0][i] > b[1][i]) ? b[0][i] : b[1][i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr23816-2.c b/gcc/testsuite/gcc.dg/vect/pr23816-2.c
index 408eb49728d..620f284174c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr23816-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr23816-2.c
@@ -9,4 +9,3 @@ foo (double a[32], double b[2][32])
     a[i] = (b[0][i] > b[1][i]) ? b[0][i] : b[1][i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr23831.c b/gcc/testsuite/gcc.dg/vect/pr23831.c
index dfa21ce0a6d..a0320d7aefe 100644
--- a/gcc/testsuite/gcc.dg/vect/pr23831.c
+++ b/gcc/testsuite/gcc.dg/vect/pr23831.c
@@ -9,4 +9,3 @@ void foo (void)
     bm[j] = bm[j] * 8;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr24059.c b/gcc/testsuite/gcc.dg/vect/pr24059.c
index 0849d15c95f..8a46b4a9af7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr24059.c
+++ b/gcc/testsuite/gcc.dg/vect/pr24059.c
@@ -13,4 +13,3 @@ void compute_predicate_codes (char *codes, struct pred_data *p)
     codes[i] = p->codes[i] ? 2 : 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr24300.c b/gcc/testsuite/gcc.dg/vect/pr24300.c
index 7a79e96c8a2..115800c5dc2 100644
--- a/gcc/testsuite/gcc.dg/vect/pr24300.c
+++ b/gcc/testsuite/gcc.dg/vect/pr24300.c
@@ -34,4 +34,3 @@ foo (int Fc)
   return (tc);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr25371.c b/gcc/testsuite/gcc.dg/vect/pr25371.c
index ad962f47c53..65a11593d52 100644
--- a/gcc/testsuite/gcc.dg/vect/pr25371.c
+++ b/gcc/testsuite/gcc.dg/vect/pr25371.c
@@ -10,4 +10,3 @@ void slow_close(int n)
       *(mm+i*2*n+i) = 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr25413.c b/gcc/testsuite/gcc.dg/vect/pr25413.c
index e483732680f..e80d6970933 100644
--- a/gcc/testsuite/gcc.dg/vect/pr25413.c
+++ b/gcc/testsuite/gcc.dg/vect/pr25413.c
@@ -36,4 +36,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { {! vector_alignment_reachable_for_64bit} && {! vect_hw_misalign} } } } } */
 /* { dg-final { scan-tree-dump-times "vector alignment may not be reachable" 1 "vect" { target { {! vector_alignment_reachable_for_64bit} && {! vect_hw_misalign} } } } } */
 /* { dg-final { scan-tree-dump-times "not vectorized: unsupported unaligned store" 1 "vect" { target { {! vector_alignment_reachable_for_64bit} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr25413a.c b/gcc/testsuite/gcc.dg/vect/pr25413a.c
index b9bef5f5b77..a80ca868112 100644
--- a/gcc/testsuite/gcc.dg/vect/pr25413a.c
+++ b/gcc/testsuite/gcc.dg/vect/pr25413a.c
@@ -126,4 +126,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vector alignment may not be reachable" 1 "vect" { target { ! vector_alignment_reachable  } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { ! vector_alignment_reachable } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr26359.c b/gcc/testsuite/gcc.dg/vect/pr26359.c
index cf74388a596..597ee7e832d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr26359.c
+++ b/gcc/testsuite/gcc.dg/vect/pr26359.c
@@ -14,5 +14,3 @@ foo () {
 }
 
 /* { dg-final { scan-tree-dump-times "Deleting : vect_" 0 "dce5" } } */
-/* { dg-final { cleanup-tree-dump "dce5" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr27151.c b/gcc/testsuite/gcc.dg/vect/pr27151.c
index 81f89b1a7e4..23fce79e923 100644
--- a/gcc/testsuite/gcc.dg/vect/pr27151.c
+++ b/gcc/testsuite/gcc.dg/vect/pr27151.c
@@ -13,4 +13,3 @@ void vis_clear_data ()
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr28952.c b/gcc/testsuite/gcc.dg/vect/pr28952.c
index fb54aed695e..1f424b93e62 100644
--- a/gcc/testsuite/gcc.dg/vect/pr28952.c
+++ b/gcc/testsuite/gcc.dg/vect/pr28952.c
@@ -30,4 +30,3 @@ send_spaceship_info (void)
   lsend_packet_spaceship_info (&info);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr30771.c b/gcc/testsuite/gcc.dg/vect/pr30771.c
index e9f4bd2abc7..291df2371cb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr30771.c
+++ b/gcc/testsuite/gcc.dg/vect/pr30771.c
@@ -15,4 +15,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr30784.c b/gcc/testsuite/gcc.dg/vect/pr30784.c
index 3df9afe3bbd..840dbc5f1f1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr30784.c
+++ b/gcc/testsuite/gcc.dg/vect/pr30784.c
@@ -27,4 +27,3 @@ int main ()
 
   return 0;
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr30795.c b/gcc/testsuite/gcc.dg/vect/pr30795.c
index 53dc9fa51f3..e5c3951a2ae 100644
--- a/gcc/testsuite/gcc.dg/vect/pr30795.c
+++ b/gcc/testsuite/gcc.dg/vect/pr30795.c
@@ -16,4 +16,3 @@ main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr30843.c b/gcc/testsuite/gcc.dg/vect/pr30843.c
index 2e0855f6cb8..8acbffd3d7f 100644
--- a/gcc/testsuite/gcc.dg/vect/pr30843.c
+++ b/gcc/testsuite/gcc.dg/vect/pr30843.c
@@ -21,5 +21,4 @@ void dacP98FillRGBMap (unsigned char *pBuffer)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_interleave || vect_strided4 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr30858.c b/gcc/testsuite/gcc.dg/vect/pr30858.c
index 0e7f7e10d4d..35a6a8dab36 100644
--- a/gcc/testsuite/gcc.dg/vect/pr30858.c
+++ b/gcc/testsuite/gcc.dg/vect/pr30858.c
@@ -12,4 +12,3 @@ foo (int ko)
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump "Unknown def-use cycle pattern." "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr31041.c b/gcc/testsuite/gcc.dg/vect/pr31041.c
index ad8d119f73f..6362d84a25a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr31041.c
+++ b/gcc/testsuite/gcc.dg/vect/pr31041.c
@@ -24,4 +24,3 @@ utrie_open_3_4 ()
       while (i < 5);
     }
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr31343.c b/gcc/testsuite/gcc.dg/vect/pr31343.c
index 856422221cf..e72daf0e5a5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr31343.c
+++ b/gcc/testsuite/gcc.dg/vect/pr31343.c
@@ -32,4 +32,3 @@ main1 ()
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr31699.c b/gcc/testsuite/gcc.dg/vect/pr31699.c
index 6015d5cd4e5..59b8daa1b84 100644
--- a/gcc/testsuite/gcc.dg/vect/pr31699.c
+++ b/gcc/testsuite/gcc.dg/vect/pr31699.c
@@ -36,4 +36,3 @@ int main()
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_intfloat_cvt } } } */
 /* { dg-final { scan-tree-dump-times "vector alignment may not be reachable" 1 "vect" { target { ! vector_alignment_reachable } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { ! vector_alignment_reachable } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr32216.c b/gcc/testsuite/gcc.dg/vect/pr32216.c
index b15f7399c40..d448fe78ca3 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32216.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32216.c
@@ -12,4 +12,3 @@ SetSoundVariables (int x)
   }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr32224.c b/gcc/testsuite/gcc.dg/vect/pr32224.c
index df9728fe202..2ef90b903ba 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32224.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32224.c
@@ -15,4 +15,3 @@ gmpz_export (void *data)
     __src++;
   }
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr32230.c b/gcc/testsuite/gcc.dg/vect/pr32230.c
index bdb290ab4ec..7df47e4dc79 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32230.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32230.c
@@ -19,6 +19,5 @@ const_f (filter_buffer_t *buf)
     ((float*) (&((sbuf_header_t *) (__PTRDIFF_TYPE__)((buf) == (filter_buffer_t *)&(buf)->buf[0]))->buf[0]))[i] = val;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr32366.c b/gcc/testsuite/gcc.dg/vect/pr32366.c
index 7ea0c973dc6..cc1cd72f136 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32366.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32366.c
@@ -12,4 +12,3 @@ stream_test (void)
     input[k] = k * 1.0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr32421.c b/gcc/testsuite/gcc.dg/vect/pr32421.c
index 68d51bd74aa..f88ce373d9e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32421.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32421.c
@@ -8,5 +8,4 @@ int f(int **__restrict a, int ** __restrict b)
     a[i] = b[i] + 1;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr32824.c b/gcc/testsuite/gcc.dg/vect/pr32824.c
index 8f36d1db2c6..c3b8b3721b9 100644
--- a/gcc/testsuite/gcc.dg/vect/pr32824.c
+++ b/gcc/testsuite/gcc.dg/vect/pr32824.c
@@ -11,5 +11,4 @@ void foo(void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr33369.c b/gcc/testsuite/gcc.dg/vect/pr33369.c
index 1aaf4e366e2..8838db83767 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33369.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33369.c
@@ -19,4 +19,3 @@ f (POINT * ptBuf)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33373.c b/gcc/testsuite/gcc.dg/vect/pr33373.c
index b11cfb4ebd8..8da43710e70 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33373.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33373.c
@@ -5,4 +5,3 @@ void DOSMEM_FillIsrTable(int*isr) {
     for (i=0; i<256; i++)
         isr[i]=(((short)((i*4) & 0xFFFF)) | (0xf000 & 0xFFFF) << 16);
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33373b.c b/gcc/testsuite/gcc.dg/vect/pr33373b.c
index c294a385c26..fc5e6eb2493 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33373b.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33373b.c
@@ -5,4 +5,3 @@ void f (unsigned int *d, unsigned int *s, int w)
   for (i = 0; i < w; ++i)
     d [i] = s [i] * (unsigned short) (~d [i] >> 24);
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33597.c b/gcc/testsuite/gcc.dg/vect/pr33597.c
index 7fdcde07fbe..0befb49d005 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33597.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33597.c
@@ -21,4 +21,3 @@ rgb15to24_C (const uint8_t * src, uint8_t * dst, long src_size)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33804.c b/gcc/testsuite/gcc.dg/vect/pr33804.c
index c7f3b6fa556..86babbe60e7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33804.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33804.c
@@ -13,4 +13,3 @@ void f(unsigned char *s, unsigned char *d, int n) {
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33833.c b/gcc/testsuite/gcc.dg/vect/pr33833.c
index ebdfcb1f818..de31dc089f4 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33833.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33833.c
@@ -32,4 +32,3 @@ void sched_init (uintptr_t __ptr)
   }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33846.c b/gcc/testsuite/gcc.dg/vect/pr33846.c
index 3f421c9b75d..8f8e7e76e58 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33846.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33846.c
@@ -21,4 +21,3 @@ void _mix_some_samples (intptr_t buf, int *mix_buffer, int mix_size)
   }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr33866.c b/gcc/testsuite/gcc.dg/vect/pr33866.c
index c869226f718..ddb1287660c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33866.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33866.c
@@ -28,5 +28,4 @@ void test_select_fill_hyper_simple (long *offset)
 
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_interleave || vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr33953.c b/gcc/testsuite/gcc.dg/vect/pr33953.c
index 3a882692dcb..4dd54cd57f3 100644
--- a/gcc/testsuite/gcc.dg/vect/pr33953.c
+++ b/gcc/testsuite/gcc.dg/vect/pr33953.c
@@ -30,6 +30,5 @@ void blockmove_NtoN_blend_noremap32 (const UINT32 *srcdata, int srcwidth,
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr34005.c b/gcc/testsuite/gcc.dg/vect/pr34005.c
index 86c38321b68..4ee121e241b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr34005.c
+++ b/gcc/testsuite/gcc.dg/vect/pr34005.c
@@ -13,4 +13,3 @@ void XdmcpUnwrap (unsigned char *output, int k)
     output[i] = blocks[k][i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr34407.c b/gcc/testsuite/gcc.dg/vect/pr34407.c
index 3da2ed7b3b3..a9a39bc408e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr34407.c
+++ b/gcc/testsuite/gcc.dg/vect/pr34407.c
@@ -13,4 +13,3 @@ void ReadRLEImage (unsigned char *p)
     *p++ = background_color[j];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr34591.c b/gcc/testsuite/gcc.dg/vect/pr34591.c
index 1f02544c844..88b6a647029 100644
--- a/gcc/testsuite/gcc.dg/vect/pr34591.c
+++ b/gcc/testsuite/gcc.dg/vect/pr34591.c
@@ -9,4 +9,3 @@ int av_resample(int filter_length, short *src, short *filter)
     return val;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr36228.c b/gcc/testsuite/gcc.dg/vect/pr36228.c
index 73933754cfb..5f177394c13 100644
--- a/gcc/testsuite/gcc.dg/vect/pr36228.c
+++ b/gcc/testsuite/gcc.dg/vect/pr36228.c
@@ -28,4 +28,3 @@ t_run_test()
 }
 
 /* { dg-final { scan-tree-dump-times "versioning for alias required" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr36493.c b/gcc/testsuite/gcc.dg/vect/pr36493.c
index 98517dfc5ce..076b4060822 100644
--- a/gcc/testsuite/gcc.dg/vect/pr36493.c
+++ b/gcc/testsuite/gcc.dg/vect/pr36493.c
@@ -21,5 +21,4 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr36630.c b/gcc/testsuite/gcc.dg/vect/pr36630.c
index 2253f7574b8..c5aedd78932 100644
--- a/gcc/testsuite/gcc.dg/vect/pr36630.c
+++ b/gcc/testsuite/gcc.dg/vect/pr36630.c
@@ -14,4 +14,3 @@ foo (unsigned char *x, short y)
     }
 }
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr37027.c b/gcc/testsuite/gcc.dg/vect/pr37027.c
index dcfed348d11..8c83f01bceb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37027.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37027.c
@@ -33,5 +33,4 @@ foo (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_add } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_add } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr37385.c b/gcc/testsuite/gcc.dg/vect/pr37385.c
index 8b1cf3ae18a..1d17208941c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37385.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37385.c
@@ -17,4 +17,3 @@ bar ()
       fun_tab[i] = foo;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr37474.c b/gcc/testsuite/gcc.dg/vect/pr37474.c
index b6d01c269dc..f23522f6a7e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37474.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37474.c
@@ -34,5 +34,4 @@ void foo (unsigned int *__restrict__ pInput, unsigned int *__restrict__ pOutput)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr37482.c b/gcc/testsuite/gcc.dg/vect/pr37482.c
index 0b3bed33afa..e52266d8a94 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37482.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37482.c
@@ -17,5 +17,4 @@ void SexiALI_Convert(void *vdest, void *vsrc, unsigned int frames)
   *dest++ = tmp;
  }
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr37539.c b/gcc/testsuite/gcc.dg/vect/pr37539.c
index 560c484636c..dfbfc20c5cb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37539.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37539.c
@@ -41,7 +41,6 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_strided4 && vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr37730.c b/gcc/testsuite/gcc.dg/vect/pr37730.c
index 1f03584564f..feaae960e12 100644
--- a/gcc/testsuite/gcc.dg/vect/pr37730.c
+++ b/gcc/testsuite/gcc.dg/vect/pr37730.c
@@ -15,4 +15,3 @@ add_opush (void)
   sdp_seq_alloc (dtds);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr38529.c b/gcc/testsuite/gcc.dg/vect/pr38529.c
index 496aa43f39b..171adebfa20 100644
--- a/gcc/testsuite/gcc.dg/vect/pr38529.c
+++ b/gcc/testsuite/gcc.dg/vect/pr38529.c
@@ -13,6 +13,5 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr39529.c b/gcc/testsuite/gcc.dg/vect/pr39529.c
index 4853c13503f..b40ab4669c9 100644
--- a/gcc/testsuite/gcc.dg/vect/pr39529.c
+++ b/gcc/testsuite/gcc.dg/vect/pr39529.c
@@ -16,6 +16,5 @@ foo (void)
     } while (p < p2);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr40074.c b/gcc/testsuite/gcc.dg/vect/pr40074.c
index 6459f1b552e..143ee05b1fd 100644
--- a/gcc/testsuite/gcc.dg/vect/pr40074.c
+++ b/gcc/testsuite/gcc.dg/vect/pr40074.c
@@ -50,5 +50,4 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/pr40238.c b/gcc/testsuite/gcc.dg/vect/pr40238.c
index 91cf0982439..c039067334d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr40238.c
+++ b/gcc/testsuite/gcc.dg/vect/pr40238.c
@@ -31,5 +31,4 @@ int xgp_ahd_interpolate (int tile)
  return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr40254.c b/gcc/testsuite/gcc.dg/vect/pr40254.c
index b890a449312..9c8d1ecf250 100644
--- a/gcc/testsuite/gcc.dg/vect/pr40254.c
+++ b/gcc/testsuite/gcc.dg/vect/pr40254.c
@@ -35,5 +35,4 @@ main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr40542.c b/gcc/testsuite/gcc.dg/vect/pr40542.c
index 0a827724dc8..980919a360b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr40542.c
+++ b/gcc/testsuite/gcc.dg/vect/pr40542.c
@@ -10,5 +10,4 @@ volarr_cpy(char *d, volatile char *s)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr41956.c b/gcc/testsuite/gcc.dg/vect/pr41956.c
index 455f5051007..5f639a13915 100644
--- a/gcc/testsuite/gcc.dg/vect/pr41956.c
+++ b/gcc/testsuite/gcc.dg/vect/pr41956.c
@@ -10,4 +10,3 @@ void K (int *gpwgts, int *badminpwgt, int *badmaxpwgt)
   }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr42193.c b/gcc/testsuite/gcc.dg/vect/pr42193.c
index 01609c982e1..e4b95f7b54d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr42193.c
+++ b/gcc/testsuite/gcc.dg/vect/pr42193.c
@@ -24,5 +24,4 @@ void foo ()
   out[5] = 17 * a + 15 * b + 13  * c + 14 * d + 11 * e + 9 * f;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr42604.c b/gcc/testsuite/gcc.dg/vect/pr42604.c
index 14f255a40a6..4e05c234593 100644
--- a/gcc/testsuite/gcc.dg/vect/pr42604.c
+++ b/gcc/testsuite/gcc.dg/vect/pr42604.c
@@ -32,4 +32,3 @@ test (unsigned short *b)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr42709.c b/gcc/testsuite/gcc.dg/vect/pr42709.c
index 8ccbfa65e81..22c541937f5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr42709.c
+++ b/gcc/testsuite/gcc.dg/vect/pr42709.c
@@ -24,5 +24,4 @@ main1 (int *a, int *b, int *c, int *d, int dummy)
     } 
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/pr43430-1.c b/gcc/testsuite/gcc.dg/vect/pr43430-1.c
index 9eaa23cca8f..9a6246f4b8e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr43430-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr43430-1.c
@@ -36,4 +36,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_condition } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr43430-2.c b/gcc/testsuite/gcc.dg/vect/pr43430-2.c
index bc37f1141c9..71de5657d7c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr43430-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr43430-2.c
@@ -14,4 +14,3 @@ vsad16_c (void *c, uint8_t * s1, uint8_t * s2, int stride, int h)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_condition } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr43432.c b/gcc/testsuite/gcc.dg/vect/pr43432.c
index 5f3db7d8235..bc82fa96e26 100644
--- a/gcc/testsuite/gcc.dg/vect/pr43432.c
+++ b/gcc/testsuite/gcc.dg/vect/pr43432.c
@@ -11,4 +11,3 @@ int len){
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm && vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr43842.c b/gcc/testsuite/gcc.dg/vect/pr43842.c
index 6ebb00f9715..8e12ff2733c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr43842.c
+++ b/gcc/testsuite/gcc.dg/vect/pr43842.c
@@ -53,5 +53,4 @@ int81 (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr44507.c b/gcc/testsuite/gcc.dg/vect/pr44507.c
index 50c485399a4..d95e7c9ae07 100644
--- a/gcc/testsuite/gcc.dg/vect/pr44507.c
+++ b/gcc/testsuite/gcc.dg/vect/pr44507.c
@@ -51,5 +51,4 @@ int main(int argc, char** argv)
   return seeIf256ByteArrayIsConstant(&array1[0]);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr45633.c b/gcc/testsuite/gcc.dg/vect/pr45633.c
index 456d51f1aef..18fde3b88cb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr45633.c
+++ b/gcc/testsuite/gcc.dg/vect/pr45633.c
@@ -12,4 +12,3 @@ foo (void)
     t[i] -= s[i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr45752.c b/gcc/testsuite/gcc.dg/vect/pr45752.c
index b4b3c1b7ec6..f5173300552 100644
--- a/gcc/testsuite/gcc.dg/vect/pr45752.c
+++ b/gcc/testsuite/gcc.dg/vect/pr45752.c
@@ -104,5 +104,4 @@ int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect"  } } */
 /* { dg-final { scan-tree-dump "permutation requires at least three vectors" "vect" { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr45847.c b/gcc/testsuite/gcc.dg/vect/pr45847.c
index f34caa1d0e5..0e5b6dcecdc 100644
--- a/gcc/testsuite/gcc.dg/vect/pr45847.c
+++ b/gcc/testsuite/gcc.dg/vect/pr45847.c
@@ -11,5 +11,4 @@ long long foo (long long *__restrict a,  int *__restrict b, int *__restrict c )
   return sum;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr45902.c b/gcc/testsuite/gcc.dg/vect/pr45902.c
index 1690b3ab3e5..00ec9208c99 100644
--- a/gcc/testsuite/gcc.dg/vect/pr45902.c
+++ b/gcc/testsuite/gcc.dg/vect/pr45902.c
@@ -40,4 +40,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr46009.c b/gcc/testsuite/gcc.dg/vect/pr46009.c
index a6a3217ee86..9649e2fb4bb 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46009.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46009.c
@@ -71,4 +71,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr46049.c b/gcc/testsuite/gcc.dg/vect/pr46049.c
index 90020681ef2..ffc72e5602b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46049.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46049.c
@@ -18,4 +18,3 @@ void foo (int16_t i, int16_t *p, int16_t x)
       p++;
     }
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr46052.c b/gcc/testsuite/gcc.dg/vect/pr46052.c
index c32a93d07d8..3de8109107a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46052.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46052.c
@@ -30,4 +30,3 @@ void foo1 (int n)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr46126.c b/gcc/testsuite/gcc.dg/vect/pr46126.c
index c46d7f40d33..5f535498b7c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46126.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46126.c
@@ -22,4 +22,3 @@ EvTab[(((uintptr_t)(((TypHandle*)((hdCall)->ptr))[1]) & 1) ? 1 :
      ptApp[2] = ((TypHandle) (uintptr_t) (((long)(lc) << 2) + 1));
  }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr46663.c b/gcc/testsuite/gcc.dg/vect/pr46663.c
index 42a1ffbbc4b..15f15a548bc 100644
--- a/gcc/testsuite/gcc.dg/vect/pr46663.c
+++ b/gcc/testsuite/gcc.dg/vect/pr46663.c
@@ -11,4 +11,3 @@ int foo (bart bar, int m)
   return j;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr47001.c b/gcc/testsuite/gcc.dg/vect/pr47001.c
index 9c5d08dac5f..9f36845eac5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr47001.c
+++ b/gcc/testsuite/gcc.dg/vect/pr47001.c
@@ -24,4 +24,3 @@ int main1 (int res0, int res1)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr47139.c b/gcc/testsuite/gcc.dg/vect/pr47139.c
index 9e9c751e971..042ad74e1b1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr47139.c
+++ b/gcc/testsuite/gcc.dg/vect/pr47139.c
@@ -14,5 +14,4 @@ foo ()
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr48172.c b/gcc/testsuite/gcc.dg/vect/pr48172.c
index d6985bcc305..cce05328b69 100644
--- a/gcc/testsuite/gcc.dg/vect/pr48172.c
+++ b/gcc/testsuite/gcc.dg/vect/pr48172.c
@@ -28,4 +28,3 @@ int main() {
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr48377.c b/gcc/testsuite/gcc.dg/vect/pr48377.c
index 24846cd042e..33c73e36b5d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr48377.c
+++ b/gcc/testsuite/gcc.dg/vect/pr48377.c
@@ -22,4 +22,3 @@ main (void)
   return foo (buf + 1, 26) != 26;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr48765.c b/gcc/testsuite/gcc.dg/vect/pr48765.c
index 2b2907b71ff..978dc25ccce 100644
--- a/gcc/testsuite/gcc.dg/vect/pr48765.c
+++ b/gcc/testsuite/gcc.dg/vect/pr48765.c
@@ -82,4 +82,3 @@ stupid_find_reg (call_preserved, class, mode, born_insn, dead_insn,
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49038.c b/gcc/testsuite/gcc.dg/vect/pr49038.c
index c760ef57b75..8a254ec1262 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49038.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49038.c
@@ -41,4 +41,3 @@ main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49093.c b/gcc/testsuite/gcc.dg/vect/pr49093.c
index b8bded68687..5a2950600fc 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49093.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49093.c
@@ -19,4 +19,3 @@ lbl_473:
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49318.c b/gcc/testsuite/gcc.dg/vect/pr49318.c
index d1c270d6870..abe76fa6b6b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49318.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49318.c
@@ -19,4 +19,3 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params ) {
     params[i] = (GLint) ctx->TextureMatrix[i];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49478.c b/gcc/testsuite/gcc.dg/vect/pr49478.c
index 06453992380..c740fd31e0b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49478.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49478.c
@@ -20,5 +20,4 @@ foo (int len) {
   return result;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr49610.c b/gcc/testsuite/gcc.dg/vect/pr49610.c
index 87ac5b50343..4ef06bdd7a3 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49610.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49610.c
@@ -9,4 +9,3 @@ void func_13(int p_17) {
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49771.c b/gcc/testsuite/gcc.dg/vect/pr49771.c
index 777f615365c..95b1ed78666 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49771.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49771.c
@@ -23,4 +23,3 @@ main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr49926.c b/gcc/testsuite/gcc.dg/vect/pr49926.c
index 60968173469..c7bca69e469 100644
--- a/gcc/testsuite/gcc.dg/vect/pr49926.c
+++ b/gcc/testsuite/gcc.dg/vect/pr49926.c
@@ -20,4 +20,3 @@ foo (unsigned int x, int y, int z, int *w)
   while (1);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr50014.c b/gcc/testsuite/gcc.dg/vect/pr50014.c
index c04ffec2135..6ed43c681a9 100644
--- a/gcc/testsuite/gcc.dg/vect/pr50014.c
+++ b/gcc/testsuite/gcc.dg/vect/pr50014.c
@@ -12,5 +12,4 @@ int f(unsigned char *s, int n)
   return sum;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr50451.c b/gcc/testsuite/gcc.dg/vect/pr50451.c
index 0733ea2ad51..b749a2c6cc7 100644
--- a/gcc/testsuite/gcc.dg/vect/pr50451.c
+++ b/gcc/testsuite/gcc.dg/vect/pr50451.c
@@ -14,5 +14,4 @@ foo (int integral, int decimal, int power_ten)
   return integral+decimal;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr50635.c b/gcc/testsuite/gcc.dg/vect/pr50635.c
index 6a7ac52e821..3d84357049d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr50635.c
+++ b/gcc/testsuite/gcc.dg/vect/pr50635.c
@@ -17,5 +17,4 @@ void f0a(int32_t * result, int32_t * arg1, int8_t * arg2, int32_t temp_3)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr50727.c b/gcc/testsuite/gcc.dg/vect/pr50727.c
index 896b614b9b8..9b6d9e00388 100644
--- a/gcc/testsuite/gcc.dg/vect/pr50727.c
+++ b/gcc/testsuite/gcc.dg/vect/pr50727.c
@@ -17,5 +17,4 @@ f0a (uint32_t * __restrict__ result, uint32_t * arg2,
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr51000.c b/gcc/testsuite/gcc.dg/vect/pr51000.c
index 75af2d8a298..2be1e60e043 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51000.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51000.c
@@ -16,4 +16,3 @@ foo ()
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51015.c b/gcc/testsuite/gcc.dg/vect/pr51015.c
index bc29b0bf101..3dadeadf178 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51015.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51015.c
@@ -16,4 +16,3 @@ void e2fsck_pass1()
  }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51074.c b/gcc/testsuite/gcc.dg/vect/pr51074.c
index 30913999400..4144572126e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51074.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51074.c
@@ -21,4 +21,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51301.c b/gcc/testsuite/gcc.dg/vect/pr51301.c
index c0000cad942..b060c8eb629 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51301.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51301.c
@@ -12,4 +12,3 @@ f0a (int8_t * __restrict__ arg1)
   return result;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51581-1.c b/gcc/testsuite/gcc.dg/vect/pr51581-1.c
index d8d61be902c..8ba9279ec96 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51581-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51581-1.c
@@ -15,4 +15,3 @@ main ()
   return main1 ();
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51581-2.c b/gcc/testsuite/gcc.dg/vect/pr51581-2.c
index 13b8ba92cf6..9f87386a13e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51581-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51581-2.c
@@ -15,4 +15,3 @@ main ()
   return main1 ();
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51581-3.c b/gcc/testsuite/gcc.dg/vect/pr51581-3.c
index a478136172f..76c156adf9d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51581-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51581-3.c
@@ -115,4 +115,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51581-4.c b/gcc/testsuite/gcc.dg/vect/pr51581-4.c
index f48ec6b5937..632c96e7481 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51581-4.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51581-4.c
@@ -163,4 +163,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51590.c b/gcc/testsuite/gcc.dg/vect/pr51590.c
index 90075b6e9ee..55757ecbd4c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51590.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51590.c
@@ -32,4 +32,3 @@ foo (const char *x, struct S *y)
   bar (&d);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr51799.c b/gcc/testsuite/gcc.dg/vect/pr51799.c
index 7d95e363dd2..84f402a78b5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr51799.c
+++ b/gcc/testsuite/gcc.dg/vect/pr51799.c
@@ -15,4 +15,3 @@ f0a (uint32_t * __restrict__ result, int8_t * __restrict__ arg1,
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr52091.c b/gcc/testsuite/gcc.dg/vect/pr52091.c
index ff583b299a8..c43840870b1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr52091.c
+++ b/gcc/testsuite/gcc.dg/vect/pr52091.c
@@ -27,5 +27,4 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr52252-ld.c b/gcc/testsuite/gcc.dg/vect/pr52252-ld.c
index e37b177f8f3..e17cabe1048 100644
--- a/gcc/testsuite/gcc.dg/vect/pr52252-ld.c
+++ b/gcc/testsuite/gcc.dg/vect/pr52252-ld.c
@@ -26,4 +26,3 @@ matrix_mul (byte *in, byte *out, int size)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { i?86-*-* x86_64-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr52252-st.c b/gcc/testsuite/gcc.dg/vect/pr52252-st.c
index e7161f73f86..5954d45f5ec 100644
--- a/gcc/testsuite/gcc.dg/vect/pr52252-st.c
+++ b/gcc/testsuite/gcc.dg/vect/pr52252-st.c
@@ -18,4 +18,3 @@ matrix_mul (byte *in, byte *out, int size)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { i?86-*-* x86_64-*-* } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr53185-2.c b/gcc/testsuite/gcc.dg/vect/pr53185-2.c
index 2f9ea16ea92..88438d8c6e5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr53185-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr53185-2.c
@@ -24,4 +24,3 @@ int main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr53773.c b/gcc/testsuite/gcc.dg/vect/pr53773.c
index 1c9e468f5f3..2be76d700e6 100644
--- a/gcc/testsuite/gcc.dg/vect/pr53773.c
+++ b/gcc/testsuite/gcc.dg/vect/pr53773.c
@@ -15,6 +15,4 @@ foo (int integral, int decimal, int power_ten)
 }
 
 /* { dg-final { scan-tree-dump-times "\\* 10" 2 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/pr55857-1.c b/gcc/testsuite/gcc.dg/vect/pr55857-1.c
index ad41d304321..efd64f7d1b5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr55857-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr55857-1.c
@@ -14,4 +14,3 @@ foo (int *data, unsigned len, const int qlp_coeff[], int lp, int residual[])
     }    
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr55857-2.c b/gcc/testsuite/gcc.dg/vect/pr55857-2.c
index 3bfff824794..5d07913da7d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr55857-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr55857-2.c
@@ -18,4 +18,3 @@ void foo (int *data, unsigned len, const int qlp_coeff[],
       residual[i] = data[i] - ((qlp_coeff[0] * data[i-1]) >> lp);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56695.c b/gcc/testsuite/gcc.dg/vect/pr56695.c
index 8b997c2990c..ee3d829a41b 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56695.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56695.c
@@ -11,4 +11,3 @@ f (void)
     a |= !(i |= b %= 1);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56787.c b/gcc/testsuite/gcc.dg/vect/pr56787.c
index 0b09c862b16..ecc0854677c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56787.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56787.c
@@ -32,4 +32,3 @@ foo (unsigned long n, const float *__restrict u0,
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56826.c b/gcc/testsuite/gcc.dg/vect/pr56826.c
index 7a5c5ff4008..42174d9a5a8 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56826.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56826.c
@@ -38,4 +38,3 @@ int main()
   return 0;
 } 
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56918.c b/gcc/testsuite/gcc.dg/vect/pr56918.c
index 581faa0e226..1c88d324b90 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56918.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56918.c
@@ -28,4 +28,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56920.c b/gcc/testsuite/gcc.dg/vect/pr56920.c
index c6c7cca0f41..865cfda760d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56920.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56920.c
@@ -18,4 +18,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr56933.c b/gcc/testsuite/gcc.dg/vect/pr56933.c
index 92de0067837..7206682d793 100644
--- a/gcc/testsuite/gcc.dg/vect/pr56933.c
+++ b/gcc/testsuite/gcc.dg/vect/pr56933.c
@@ -42,4 +42,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr57705.c b/gcc/testsuite/gcc.dg/vect/pr57705.c
index 467141cccd2..e17ae09beb6 100644
--- a/gcc/testsuite/gcc.dg/vect/pr57705.c
+++ b/gcc/testsuite/gcc.dg/vect/pr57705.c
@@ -63,4 +63,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 3 "vect" { target vect_pack_trunc } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 2 "vect" { target { ! vect_pack_trunc } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr57741-1.c b/gcc/testsuite/gcc.dg/vect/pr57741-1.c
index 780f870e317..ec8c41a0487 100644
--- a/gcc/testsuite/gcc.dg/vect/pr57741-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr57741-1.c
@@ -18,4 +18,3 @@ foo (float *p, float *q, float x)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr57741-2.c b/gcc/testsuite/gcc.dg/vect/pr57741-2.c
index 1b570899070..df63a49927d 100644
--- a/gcc/testsuite/gcc.dg/vect/pr57741-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr57741-2.c
@@ -41,4 +41,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loop" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr57741-3.c b/gcc/testsuite/gcc.dg/vect/pr57741-3.c
index bd7b0bfe482..2e4954ac7f1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr57741-3.c
+++ b/gcc/testsuite/gcc.dg/vect/pr57741-3.c
@@ -40,4 +40,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr58508.c b/gcc/testsuite/gcc.dg/vect/pr58508.c
index 60c68beb6e7..c18b1cf23e5 100644
--- a/gcc/testsuite/gcc.dg/vect/pr58508.c
+++ b/gcc/testsuite/gcc.dg/vect/pr58508.c
@@ -68,4 +68,3 @@ void test5 (int* a, int* b)
 
 /* { dg-final { scan-tree-dump-times "hoist" 8 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "hoist" 3 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59354.c b/gcc/testsuite/gcc.dg/vect/pr59354.c
index c27dd95191b..d479d00ceee 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59354.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59354.c
@@ -37,4 +37,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loop" "vect" { target { vect_pack_trunc } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59519-1.c b/gcc/testsuite/gcc.dg/vect/pr59519-1.c
index 428d4ec32e7..48cc790ecaf 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59519-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59519-1.c
@@ -16,4 +16,3 @@ foo (void)
       }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59519-2.c b/gcc/testsuite/gcc.dg/vect/pr59519-2.c
index 2b109d2557d..13db9616bdf 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59519-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59519-2.c
@@ -17,4 +17,3 @@ foo (void)
       }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59591-1.c b/gcc/testsuite/gcc.dg/vect/pr59591-1.c
index 336c8a5385f..892fce58e36 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59591-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59591-1.c
@@ -51,4 +51,3 @@ main ()
 }
 #endif
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59591-2.c b/gcc/testsuite/gcc.dg/vect/pr59591-2.c
index 9019b68a5d1..bd82d765794 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59591-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59591-2.c
@@ -52,4 +52,3 @@ main ()
 }
 #endif
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59594.c b/gcc/testsuite/gcc.dg/vect/pr59594.c
index 14a86ed2d9b..947fa4c0c30 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59594.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59594.c
@@ -28,4 +28,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59651.c b/gcc/testsuite/gcc.dg/vect/pr59651.c
index 4407785aab4..44efce33390 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59651.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59651.c
@@ -1,4 +1,3 @@
 /* PR tree-optimization/59561 */
 #include "../torture/pr59651.c"
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr59984.c b/gcc/testsuite/gcc.dg/vect/pr59984.c
index 1b95942955d..d6977f00208 100644
--- a/gcc/testsuite/gcc.dg/vect/pr59984.c
+++ b/gcc/testsuite/gcc.dg/vect/pr59984.c
@@ -62,4 +62,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60012.c b/gcc/testsuite/gcc.dg/vect/pr60012.c
index bd0f37c2b3b..cb0eb6be160 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60012.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60012.c
@@ -19,4 +19,3 @@ libvector_AccSquareNorm_ref (unsigned int *acc,
 }
 
 /* { dg-final { scan-tree-dump "LOOP VECTORIZED" "vect" { target { vect_extract_even_odd } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60092-2.c b/gcc/testsuite/gcc.dg/vect/pr60092-2.c
index 6120d96b4de..7b77c20cfb8 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60092-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60092-2.c
@@ -25,4 +25,3 @@ int *foo (int n)
 /* { dg-final { scan-tree-dump "LOOP VECTORIZED" "vect" } } */
 /* { dg-final { scan-tree-dump-not "Peeling for alignment will be applied" "vect" } } */
 /* { dg-final { scan-tree-dump-not "Vectorizing an unaligned access" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60092.c b/gcc/testsuite/gcc.dg/vect/pr60092.c
index a607ecaa246..1d9876d423a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60092.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60092.c
@@ -17,4 +17,3 @@ int *foo (int n)
 /* { dg-final { scan-tree-dump "LOOP VECTORIZED" "vect" } } */
 /* { dg-final { scan-tree-dump-not "Peeling for alignment will be applied" "vect" } } */
 /* { dg-final { scan-tree-dump-not "Vectorizing an unaligned access" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60196-1.c b/gcc/testsuite/gcc.dg/vect/pr60196-1.c
index 38f72724ab5..07bca49fb14 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60196-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60196-1.c
@@ -30,4 +30,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60196-2.c b/gcc/testsuite/gcc.dg/vect/pr60196-2.c
index 62ef8b1c008..fef9cd1c926 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60196-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60196-2.c
@@ -29,4 +29,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60276.c b/gcc/testsuite/gcc.dg/vect/pr60276.c
index 6a2d2aa8952..123f890ec35 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60276.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60276.c
@@ -48,4 +48,3 @@ int main(void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60382.c b/gcc/testsuite/gcc.dg/vect/pr60382.c
index a28c6313c40..e68229590a1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60382.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60382.c
@@ -29,4 +29,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60482.c b/gcc/testsuite/gcc.dg/vect/pr60482.c
index 78821183c68..4c5c20c8109 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60482.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60482.c
@@ -17,4 +17,3 @@ foo (double *x, int n)
 }
 
 /* { dg-final { scan-tree-dump-not "epilog loop required" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60505.c b/gcc/testsuite/gcc.dg/vect/pr60505.c
index 70e2ec06fe5..839b4d2c370 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60505.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60505.c
@@ -11,4 +11,3 @@ void foo(char *in, char *out, int num)
   out[num] = ovec[num/2];
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60656.c b/gcc/testsuite/gcc.dg/vect/pr60656.c
index 4950275fb87..d9e30bbbeae 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60656.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60656.c
@@ -44,4 +44,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_si_to_di_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr60841.c b/gcc/testsuite/gcc.dg/vect/pr60841.c
index 44b5d019169..fd5d2e55044 100644
--- a/gcc/testsuite/gcc.dg/vect/pr60841.c
+++ b/gcc/testsuite/gcc.dg/vect/pr60841.c
@@ -180,4 +180,3 @@ foo (struct T *p, struct T *q, int x, int w)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr61194.c b/gcc/testsuite/gcc.dg/vect/pr61194.c
index e10cff4b96c..2ec2200c8b1 100644
--- a/gcc/testsuite/gcc.dg/vect/pr61194.c
+++ b/gcc/testsuite/gcc.dg/vect/pr61194.c
@@ -40,4 +40,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr61634.c b/gcc/testsuite/gcc.dg/vect/pr61634.c
index 80b2c3a2546..fa49cec7609 100644
--- a/gcc/testsuite/gcc.dg/vect/pr61634.c
+++ b/gcc/testsuite/gcc.dg/vect/pr61634.c
@@ -21,4 +21,3 @@ void fn1 (int p1[], int p2, int p3[], int p4[], int p5[], int *p6)
     ;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr61680.c b/gcc/testsuite/gcc.dg/vect/pr61680.c
index cafdc759371..e25bf78090c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr61680.c
+++ b/gcc/testsuite/gcc.dg/vect/pr61680.c
@@ -49,4 +49,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr62021.c b/gcc/testsuite/gcc.dg/vect/pr62021.c
index e0208e63b36..1ccf2ba72db 100644
--- a/gcc/testsuite/gcc.dg/vect/pr62021.c
+++ b/gcc/testsuite/gcc.dg/vect/pr62021.c
@@ -27,4 +27,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr62073.c b/gcc/testsuite/gcc.dg/vect/pr62073.c
index 15f2ad66b0c..806e1a4ee96 100644
--- a/gcc/testsuite/gcc.dg/vect/pr62073.c
+++ b/gcc/testsuite/gcc.dg/vect/pr62073.c
@@ -37,4 +37,3 @@ int foo (long long p_56, int * p_57)
   return *l_77;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr62075.c b/gcc/testsuite/gcc.dg/vect/pr62075.c
index 798490e8752..e42bff5971a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr62075.c
+++ b/gcc/testsuite/gcc.dg/vect/pr62075.c
@@ -19,4 +19,3 @@ foo (struct A *x)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63148.c b/gcc/testsuite/gcc.dg/vect/pr63148.c
index c597577e286..c562fdd0458 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63148.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63148.c
@@ -89,4 +89,3 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63189.c b/gcc/testsuite/gcc.dg/vect/pr63189.c
index d2822fbebea..dc8904730dd 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63189.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63189.c
@@ -22,4 +22,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63341-1.c b/gcc/testsuite/gcc.dg/vect/pr63341-1.c
index 4bfbce4bece..bb54e6a1b64 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63341-1.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63341-1.c
@@ -28,4 +28,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63341-2.c b/gcc/testsuite/gcc.dg/vect/pr63341-2.c
index b783aac3605..2004a79b80e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63341-2.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63341-2.c
@@ -31,4 +31,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63379.c b/gcc/testsuite/gcc.dg/vect/pr63379.c
index a7f69dea1d8..2c739a7c83e 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63379.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63379.c
@@ -39,4 +39,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr63605.c b/gcc/testsuite/gcc.dg/vect/pr63605.c
index 66ce904ffae..8d76d21cc85 100644
--- a/gcc/testsuite/gcc.dg/vect/pr63605.c
+++ b/gcc/testsuite/gcc.dg/vect/pr63605.c
@@ -19,4 +19,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64252.c b/gcc/testsuite/gcc.dg/vect/pr64252.c
index 24190470265..b82ad017c16 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64252.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64252.c
@@ -62,4 +62,3 @@ int main()
       abort ();
   return 0;
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64404.c b/gcc/testsuite/gcc.dg/vect/pr64404.c
index 0b121b3d4f0..26fceb6cd89 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64404.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64404.c
@@ -55,4 +55,3 @@ main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64421.c b/gcc/testsuite/gcc.dg/vect/pr64421.c
index 7e48a8bea47..3b5ab2d980c 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64421.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64421.c
@@ -33,4 +33,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64493.c b/gcc/testsuite/gcc.dg/vect/pr64493.c
index 7f3153bca83..6fb13eb6d96 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64493.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64493.c
@@ -26,4 +26,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64495.c b/gcc/testsuite/gcc.dg/vect/pr64495.c
index 157c884c836..5cbaeff8389 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64495.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64495.c
@@ -30,4 +30,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64829.c b/gcc/testsuite/gcc.dg/vect/pr64829.c
index 9b8e3b6a7a4..6a9f3d785fd 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64829.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64829.c
@@ -63,4 +63,3 @@ int fail ( const RMColorData * pInColor,
   return (0);
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr64844.c b/gcc/testsuite/gcc.dg/vect/pr64844.c
index 85af423658e..cd3eacd99aa 100644
--- a/gcc/testsuite/gcc.dg/vect/pr64844.c
+++ b/gcc/testsuite/gcc.dg/vect/pr64844.c
@@ -48,4 +48,3 @@ main()
    dealing with the known misalignment in loop 2.  */
 
 /* { dg-final { scan-tree-dump-times "loop vectorized" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65310.c b/gcc/testsuite/gcc.dg/vect/pr65310.c
index 91aa904d564..14053800ab8 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65310.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65310.c
@@ -20,4 +20,3 @@ int t(b *a)
 
 /* { dg-final { scan-tree-dump "can't force alignment" "vect" } } */
 /* { dg-final { scan-tree-dump-not "misalign = 0" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65494.c b/gcc/testsuite/gcc.dg/vect/pr65494.c
index 753985f7e50..fe51e716b74 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65494.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65494.c
@@ -25,4 +25,3 @@ void foo(int n)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops in function" "vect" { target { vect_float && vect_intfloat_cvt } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr65518.c b/gcc/testsuite/gcc.dg/vect/pr65518.c
index 5aeb62dc898..3c0e6ba6d56 100644
--- a/gcc/testsuite/gcc.dg/vect/pr65518.c
+++ b/gcc/testsuite/gcc.dg/vect/pr65518.c
@@ -38,4 +38,3 @@ int main ()
    should reject that in the end).  */
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops in function" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/pr66251.c b/gcc/testsuite/gcc.dg/vect/pr66251.c
index e39f700df9a..7f0c4bcf29a 100644
--- a/gcc/testsuite/gcc.dg/vect/pr66251.c
+++ b/gcc/testsuite/gcc.dg/vect/pr66251.c
@@ -76,4 +76,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c b/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
index 7513d93a43d..4373dce917f 100644
--- a/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
+++ b/gcc/testsuite/gcc.dg/vect/section-anchors-pr27770.c
@@ -28,4 +28,3 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
index 4916274fb0a..8c88e5f6d18 100644
--- a/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
+++ b/gcc/testsuite/gcc.dg/vect/section-anchors-vect-69.c
@@ -117,4 +117,3 @@ int main (void)
   is extended to handle structs.  */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { target {vect_int && vector_alignment_reachable } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 4 "vect" { target {vect_int && {! vector_alignment_reachable} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-1.c b/gcc/testsuite/gcc.dg/vect/slp-1.c
index 6e95b616635..aebeac84eff 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-1.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-1.c
@@ -119,5 +119,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 4 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-10.c b/gcc/testsuite/gcc.dg/vect/slp-10.c
index 16a0c257dd6..3395d228b4b 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-10.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-10.c
@@ -109,5 +109,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" {target {vect_uintfloat_cvt && vect_int_mult} } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  {target {{! { vect_uintfloat_cvt}} && vect_int_mult} } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  {target {{! { vect_uintfloat_cvt}} && { ! {vect_int_mult}}} } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-11a.c b/gcc/testsuite/gcc.dg/vect/slp-11a.c
index 520bb74df2b..bcd3c861ca4 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-11a.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-11a.c
@@ -72,4 +72,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_strided8 && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_strided8 && vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-11b.c b/gcc/testsuite/gcc.dg/vect/slp-11b.c
index 6942c578b6f..0cc23770bad 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-11b.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-11b.c
@@ -46,4 +46,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_strided4 && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_strided4 && vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-11c.c b/gcc/testsuite/gcc.dg/vect/slp-11c.c
index 42b358aa697..8edd663106c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-11c.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-11c.c
@@ -43,4 +43,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { { vect_uintfloat_cvt && vect_strided2 } && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { { vect_uintfloat_cvt && vect_strided2 } && vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0  "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-12a.c b/gcc/testsuite/gcc.dg/vect/slp-12a.c
index 5c1c5a7a50c..08a8f55bab0 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-12a.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-12a.c
@@ -77,4 +77,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_strided8 && vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_strided8 && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target { ! { vect_strided8 && vect_int_mult } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-12b.c b/gcc/testsuite/gcc.dg/vect/slp-12b.c
index 69e9f315ff4..d6fe4e4300e 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-12b.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-12b.c
@@ -47,5 +47,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  { target { ! { vect_strided2 && vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target { vect_strided2 && vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  { target { ! { vect_strided2 && vect_int_mult } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-12c.c b/gcc/testsuite/gcc.dg/vect/slp-12c.c
index 5152d21145b..6650b8bd94e 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-12c.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-12c.c
@@ -50,4 +50,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  { target { ! vect_int_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target { ! vect_int_mult } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-13-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-13-big-array.c
index c40822b62a0..4520fb15f20 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-13-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-13-big-array.c
@@ -137,5 +137,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { target { vect_interleave && vect_extract_even_odd } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" { xfail *-*-* }  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-13.c b/gcc/testsuite/gcc.dg/vect/slp-13.c
index 655e6ade1d0..2394874d36c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-13.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-13.c
@@ -129,5 +129,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { target { vect_interleave && vect_extract_even_odd } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" { xfail *-*-* }  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-14.c b/gcc/testsuite/gcc.dg/vect/slp-14.c
index 9e0746b9bb3..6af70815dd4 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-14.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-14.c
@@ -112,5 +112,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_int_mult } } }  */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-15.c b/gcc/testsuite/gcc.dg/vect/slp-15.c
index 898538a3db7..dbced88c98d 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-15.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-15.c
@@ -114,5 +114,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  {target  { ! { vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" {target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" {target { ! { vect_int_mult } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-16.c b/gcc/testsuite/gcc.dg/vect/slp-16.c
index e5469d46c29..a7da9932c54 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-16.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-16.c
@@ -67,5 +67,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_int_mult } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-17.c b/gcc/testsuite/gcc.dg/vect/slp-17.c
index b76346add2a..8beede87299 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-17.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-17.c
@@ -52,5 +52,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-18.c b/gcc/testsuite/gcc.dg/vect/slp-18.c
index 6cc6fbae346..07523632409 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-18.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-18.c
@@ -93,5 +93,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-19a.c b/gcc/testsuite/gcc.dg/vect/slp-19a.c
index 02a4cd008b6..0f92de92cd3 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-19a.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-19a.c
@@ -58,4 +58,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! vect_strided8 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_strided8 } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target { ! vect_strided8} } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-19b.c b/gcc/testsuite/gcc.dg/vect/slp-19b.c
index 1f29a0d2e4d..237b36dd227 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-19b.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-19b.c
@@ -55,4 +55,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! vect_strided4 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_strided4 } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target { ! vect_strided4 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-19c.c b/gcc/testsuite/gcc.dg/vect/slp-19c.c
index f0df25f5346..82e87678503 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-19c.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-19c.c
@@ -92,4 +92,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-2.c b/gcc/testsuite/gcc.dg/vect/slp-2.c
index 69e1ed5e066..1204e06b7d2 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-2.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-2.c
@@ -141,5 +141,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 4 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-20.c b/gcc/testsuite/gcc.dg/vect/slp-20.c
index 5fd85743b5e..4df47381a90 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-20.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-20.c
@@ -111,5 +111,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 4 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-21.c b/gcc/testsuite/gcc.dg/vect/slp-21.c
index 39146b8fd11..5aef87f09cd 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-21.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-21.c
@@ -203,5 +203,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target  { ! { vect_strided4 || vect_extract_even_odd } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_strided4 }  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  { target { ! { vect_strided4 } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-22.c b/gcc/testsuite/gcc.dg/vect/slp-22.c
index 3f669281670..394460cbb88 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-22.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-22.c
@@ -130,5 +130,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 6 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-23.c b/gcc/testsuite/gcc.dg/vect/slp-23.c
index 5a04c900e02..cc5df2a19b9 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-23.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-23.c
@@ -109,5 +109,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" { target { vect_strided8 && { ! { vect_no_align} } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! { vect_strided8 || vect_no_align } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-24-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-24-big-array.c
index 10b31aaac37..e2ecbbe9b7d 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-24-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-24-big-array.c
@@ -96,4 +96,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && ilp32 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { xfail { vect_no_align && ilp32 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-24.c b/gcc/testsuite/gcc.dg/vect/slp-24.c
index eca66bfb036..29448bcd456 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-24.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-24.c
@@ -81,4 +81,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && ilp32 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { xfail { vect_no_align && ilp32 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-25.c b/gcc/testsuite/gcc.dg/vect/slp-25.c
index 74b12519747..8ee3f1c2759 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-25.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-25.c
@@ -58,4 +58,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || { ! vect_natural_alignment } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-26.c b/gcc/testsuite/gcc.dg/vect/slp-26.c
index 09a1ecd9c42..8b224ff5793 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-26.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-26.c
@@ -48,5 +48,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-28.c b/gcc/testsuite/gcc.dg/vect/slp-28.c
index 41c482709c9..e697f0efe09 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-28.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-28.c
@@ -82,5 +82,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-3-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-3-big-array.c
index 4f50f1f90fa..ca6c44ed98d 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-3-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-3-big-array.c
@@ -151,5 +151,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 4 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-3.c b/gcc/testsuite/gcc.dg/vect/slp-3.c
index 7d9bd563739..20933a720d1 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-3.c
@@ -143,5 +143,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-33.c b/gcc/testsuite/gcc.dg/vect/slp-33.c
index 4b67d894e7c..30220d48c6c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-33.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-33.c
@@ -107,5 +107,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" {target {vect_uintfloat_cvt && vect_int_mult} } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  {target {{! { vect_uintfloat_cvt}} && vect_int_mult} } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  {target {{! { vect_uintfloat_cvt}} && {! {vect_int_mult}}} } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-34-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-34-big-array.c
index 53da79ee77f..6f794085fd5 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-34-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-34-big-array.c
@@ -65,5 +65,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-34.c b/gcc/testsuite/gcc.dg/vect/slp-34.c
index 63dbab05152..1fd09069247 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-34.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-34.c
@@ -57,5 +57,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-35.c b/gcc/testsuite/gcc.dg/vect/slp-35.c
index f75691431ab..1e4aaeafe83 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-35.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-35.c
@@ -69,5 +69,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-36.c b/gcc/testsuite/gcc.dg/vect/slp-36.c
index 8480c4a05f1..98458ac32c1 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-36.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-36.c
@@ -73,4 +73,3 @@ test_3 (void)
 
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-37.c b/gcc/testsuite/gcc.dg/vect/slp-37.c
index 48642db96e7..17e9c4f9ee3 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-37.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-37.c
@@ -63,5 +63,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-38.c b/gcc/testsuite/gcc.dg/vect/slp-38.c
index a387f5d0e06..e6bd919135c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-38.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-38.c
@@ -21,4 +21,3 @@ void Compute(void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 1 "vect" { target { vect_float && vect_perm } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-39.c b/gcc/testsuite/gcc.dg/vect/slp-39.c
index b3c278a5fe3..85d32eaf748 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-39.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-39.c
@@ -22,4 +22,3 @@ void bar (double w)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-4-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-4-big-array.c
index 55607dd2d94..940134e440b 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-4-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-4-big-array.c
@@ -131,5 +131,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-4.c b/gcc/testsuite/gcc.dg/vect/slp-4.c
index 50ad2bd53a4..e4f65bc37f8 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-4.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-4.c
@@ -123,5 +123,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-41.c b/gcc/testsuite/gcc.dg/vect/slp-41.c
index 7d487b4dad9..2ad9fd20772 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-41.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-41.c
@@ -66,4 +66,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-5.c b/gcc/testsuite/gcc.dg/vect/slp-5.c
index b99cadf13ef..989e05ac8be 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-5.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-5.c
@@ -122,5 +122,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-6.c b/gcc/testsuite/gcc.dg/vect/slp-6.c
index e8d007b02fd..a7a1d0f89cc 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-6.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-6.c
@@ -118,5 +118,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  {target  { ! { vect_int_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" {target vect_int_mult  } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" {target  { ! { vect_int_mult } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-7.c b/gcc/testsuite/gcc.dg/vect/slp-7.c
index 9e7ce8c8c13..e836a1ae9b5 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-7.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-7.c
@@ -124,5 +124,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  { target { ! { vect_short_mult } } } } }*/
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect"  { target vect_short_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  { target { ! { vect_short_mult } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
  
diff --git a/gcc/testsuite/gcc.dg/vect/slp-8.c b/gcc/testsuite/gcc.dg/vect/slp-8.c
index 76db4e1c28a..e9ea0ef0d6b 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-8.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-8.c
@@ -43,4 +43,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target powerpc*-*-* i?86-*-* x86_64-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target powerpc*-*-* i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-9.c b/gcc/testsuite/gcc.dg/vect/slp-9.c
index 6d7258cb6d2..d0c94f1986b 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-9.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-9.c
@@ -45,5 +45,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_hi_to_si } } }*/
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-cond-1.c b/gcc/testsuite/gcc.dg/vect/slp-cond-1.c
index 4b8e3d3b6a3..482fc080a0f 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-cond-1.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-cond-1.c
@@ -123,4 +123,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-cond-2-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-cond-2-big-array.c
index 8217b764af0..f1712088e21 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-cond-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-cond-2-big-array.c
@@ -124,4 +124,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-cond-2.c b/gcc/testsuite/gcc.dg/vect/slp-cond-2.c
index c73933fce0f..68085d416f2 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-cond-2.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-cond-2.c
@@ -124,4 +124,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-cond-3.c b/gcc/testsuite/gcc.dg/vect/slp-cond-3.c
index 4ee2dcec3af..d19ec13a21a 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-cond-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-cond-3.c
@@ -80,5 +80,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-cond-4.c b/gcc/testsuite/gcc.dg/vect/slp-cond-4.c
index 60a62384e03..f82b8416d84 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-cond-4.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-cond-4.c
@@ -83,4 +83,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-1.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-1.c
index b52838197d2..c25acb90199 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-1.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-1.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-10.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-10.c
index 3dd6b84e31a..62580c070c8 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-10.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-10.c
@@ -47,5 +47,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_pack_trunc } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-11-big-array.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-11-big-array.c
index b7a7a0be11b..44ed1c835ac 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-11-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-11-big-array.c
@@ -58,5 +58,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-11.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-11.c
index 602517bfcd1..308153ba033 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-11.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-11.c
@@ -50,5 +50,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-12.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-12.c
index e9a2c6d4bf6..ce4313efe20 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-12.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-12.c
@@ -63,5 +63,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 3 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c
index ab2ed69d4cd..28a645c7947 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c
@@ -78,5 +78,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-3.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-3.c
index c5fd52ead58..39bd7c41f8c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-3.c
@@ -89,4 +89,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail sparc*-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { xfail sparc*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-4.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-4.c
index a13f08d3bf6..faf17d6f0cd 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-4.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-4.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-5.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-5.c
index da4527646e1..fb4f720aa49 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-5.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-5.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-6.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-6.c
index 38f4f5d1f1f..f006d081346 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-6.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-6.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_pack_trunc } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-7.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-7.c
index 112db6b7239..286e2fc42af 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-7.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-7.c
@@ -53,5 +53,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-8.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-8.c
index bd89c130da4..d88ebe4d778 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-8.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-8.c
@@ -41,5 +41,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-multitypes-9.c b/gcc/testsuite/gcc.dg/vect/slp-multitypes-9.c
index f0cf329336c..872b20cac93 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-multitypes-9.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-multitypes-9.c
@@ -41,5 +41,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_pack_trunc } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect"  { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-1.c b/gcc/testsuite/gcc.dg/vect/slp-perm-1.c
index 756cf0b112e..2b6c1349886 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-1.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-1.c
@@ -59,5 +59,4 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-2.c b/gcc/testsuite/gcc.dg/vect/slp-perm-2.c
index 27156f4829e..da50e16d5bd 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-2.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-2.c
@@ -55,5 +55,4 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-3.c b/gcc/testsuite/gcc.dg/vect/slp-perm-3.c
index 88c02fba622..1d33f9b4737 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-3.c
@@ -68,6 +68,5 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-4.c b/gcc/testsuite/gcc.dg/vect/slp-perm-4.c
index d0a069589ac..d5d548847d4 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-4.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-4.c
@@ -83,5 +83,4 @@ int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect"  } } */
 /* { dg-final { scan-tree-dump "permutation requires at least three vectors" "vect" { target vect_perm} } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-5.c b/gcc/testsuite/gcc.dg/vect/slp-perm-5.c
index f8ee4c10e55..9ed4d724919 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-5.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-5.c
@@ -74,6 +74,5 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-6.c b/gcc/testsuite/gcc.dg/vect/slp-perm-6.c
index a2843a04b23..392d36f3ed9 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-6.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-6.c
@@ -73,5 +73,4 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-7.c b/gcc/testsuite/gcc.dg/vect/slp-perm-7.c
index 9eff25e2f27..435233439fa 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-7.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-7.c
@@ -72,6 +72,5 @@ int main (int argc, const char* argv[])
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-8.c b/gcc/testsuite/gcc.dg/vect/slp-perm-8.c
index 52a640c13a1..3bdd15061db 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-8.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-8.c
@@ -55,5 +55,4 @@ int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_perm_byte && vect_char_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm_byte && {! vect_char_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_perm_byte } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-perm-9.c b/gcc/testsuite/gcc.dg/vect/slp-perm-9.c
index 548430064dc..781096e9f66 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-perm-9.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-perm-9.c
@@ -58,5 +58,4 @@ int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "permutation requires at least three vectors" 1 "vect" { target vect_perm_short } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target { {! vect_perm } || {! vect_sizes_32B_16B } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { { vect_perm } && { vect_sizes_32B_16B } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-1.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-1.c
index 1667c5dc3ab..b353dd7ccf8 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-1.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-1.c
@@ -44,5 +44,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_add } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_add } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-2.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-2.c
index 92d6669876e..07c96c00eb0 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-2.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-2.c
@@ -39,5 +39,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_add } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_add } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-3.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-3.c
index 93ca0ff2e96..511fff56b7d 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-3.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-3.c
@@ -59,4 +59,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_short_mult && { vect_widen_sum_hi_to_si  && vect_unpack } } } } } */ 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail { vect_widen_sum_hi_to_si_pattern ||  { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-4.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-4.c
index 5df53f919bc..3572dfc9fbf 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-4.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-4.c
@@ -58,5 +58,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-5.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-5.c
index 40958f13146..b1590d825e6 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-5.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-5.c
@@ -44,5 +44,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-6.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-6.c
index d43f329a9cb..88591c5bdcb 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-6.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-6.c
@@ -45,5 +45,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { xfail { vect_no_int_add || { ! { vect_unpack || vect_strided2 } } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "different interleaving chains in one node" 1 "vect" { target { ! vect_no_int_add } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-7.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-7.c
index 113785e3015..d7cc6cae8b4 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-7.c
@@ -56,5 +56,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_add } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { xfail vect_no_int_add } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-reduc-sad.c b/gcc/testsuite/gcc.dg/vect/slp-reduc-sad.c
index 472544f4fb2..d921c7cd65d 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-reduc-sad.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-reduc-sad.c
@@ -61,4 +61,3 @@ main ()
 /* { dg-final { scan-tree-dump "vect_recog_sad_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump "vectorizing stmts using SLP" "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c
index e7a0f2a75d4..6c26d4b0a5c 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-half.c
@@ -48,5 +48,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c
index 2eb73f38036..4460d59b5a1 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c
@@ -39,5 +39,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c
index fb3292ad468..6e72c4878c2 100644
--- a/gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c
+++ b/gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c
@@ -39,5 +39,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c b/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c
index 78ff7323726..21297178a00 100644
--- a/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c
+++ b/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
index b92a7fb7cb6..71538c4b188 100644
--- a/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
+++ b/gcc/testsuite/gcc.dg/vect/unswitch-loops-pr26969.c
@@ -12,4 +12,3 @@ ruby_re_compile_fastmap (char *fastmap, int options)
     }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt.c b/gcc/testsuite/gcc.dg/vect/vec-scal-opt.c
index 86408160cc3..9a49cc6acf0 100644
--- a/gcc/testsuite/gcc.dg/vect/vec-scal-opt.c
+++ b/gcc/testsuite/gcc.dg/vect/vec-scal-opt.c
@@ -20,4 +20,3 @@ int main (int argc, char *argv[]) {
 }
 
 /* { dg-final { scan-tree-dump-times ">> k.\[0-9_\]*" 1 "veclower21" } } */
-/* { dg-final { cleanup-tree-dump "veclower21" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c b/gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c
index 33d3bbbe7ff..bd2c583fc9e 100644
--- a/gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c
+++ b/gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c
@@ -18,4 +18,3 @@ int main (int argc, char *argv[]) {
 }
 
 /* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower21" } } */
-/* { dg-final { cleanup-tree-dump "veclower21" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c b/gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c
index 397613febb7..6de4064237c 100644
--- a/gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c
+++ b/gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c
@@ -17,4 +17,3 @@ int main (int argc, char *argv[]) {
 }
 
 /* { dg-final { scan-tree-dump-times ">> 2" 1 "veclower21" } } */
-/* { dg-final { cleanup-tree-dump "veclower21" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-1-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-1-big-array.c
index a9ecf7f31cf..3ec32eba7a3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-1-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-1-big-array.c
@@ -88,4 +88,3 @@ foo (int n)
 
 /* { dg-final { scan-tree-dump-times "vectorized 6 loops" 1 "vect" { target vect_strided2 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 5 loops" 1 "vect" { xfail vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-1.c b/gcc/testsuite/gcc.dg/vect/vect-1.c
index bc12ce54d24..2f0d19970c0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-1.c
@@ -88,4 +88,3 @@ foo (int n)
 
 /* { dg-final { scan-tree-dump-times "vectorized 6 loops" 1 "vect" { target vect_strided2 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 5 loops" 1 "vect" { xfail vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-10-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-10-big-array.c
index ce6161977ac..67587ed5268 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-10-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-10-big-array.c
@@ -35,4 +35,3 @@ int foo ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { ! vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-10.c b/gcc/testsuite/gcc.dg/vect/vect-10.c
index faa500d2a18..ba66939cca3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-10.c
@@ -23,4 +23,3 @@ int foo ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { ! vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-100.c b/gcc/testsuite/gcc.dg/vect/vect-100.c
index 9388084dd9d..9a4d4de0671 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-100.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-100.c
@@ -76,5 +76,4 @@ int main (void)
 
 /* Requires versioning.  */
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-103.c b/gcc/testsuite/gcc.dg/vect/vect-103.c
index 108f56d378c..fb2a8578c5d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-103.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-103.c
@@ -56,5 +56,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "dependence distance modulo vf == 0" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-104.c b/gcc/testsuite/gcc.dg/vect/vect-104.c
index 107f5a770a4..9667b55566c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-104.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-104.c
@@ -66,5 +66,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-105-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-105-big-array.c
index 0a4746e2edb..8b483e0c01d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-105-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-105-big-array.c
@@ -102,5 +102,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-105.c b/gcc/testsuite/gcc.dg/vect/vect-105.c
index 79d31c168a4..e5483b33b94 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-105.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-105.c
@@ -68,5 +68,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-106.c b/gcc/testsuite/gcc.dg/vect/vect-106.c
index d578d814326..0171cfcdfa6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-106.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-106.c
@@ -69,5 +69,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-107.c b/gcc/testsuite/gcc.dg/vect/vect-107.c
index 0053b3321a4..aaab9c00345 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-107.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-107.c
@@ -42,4 +42,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided2 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { xfail vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-108.c b/gcc/testsuite/gcc.dg/vect/vect-108.c
index 28e85b2e9c0..4af6326e9c3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-108.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-108.c
@@ -37,5 +37,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-109.c b/gcc/testsuite/gcc.dg/vect/vect-109.c
index 5207b36c68e..cf54c5f1116 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-109.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-109.c
@@ -77,5 +77,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_element_align } } } */
 /* { dg-final { scan-tree-dump-times "not vectorized: unsupported unaligned store" 2 "vect" { xfail vect_element_align } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 3 "vect" { target vect_element_align } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-11.c b/gcc/testsuite/gcc.dg/vect/vect-11.c
index 3df8f47b5f5..044fc5edc2d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-11.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-110.c b/gcc/testsuite/gcc.dg/vect/vect-110.c
index b62ad94fcfa..47c6456107d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-110.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-110.c
@@ -35,6 +35,5 @@ int main (void)
 }
      
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-112-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-112-big-array.c
index a1302c1e936..54aef699e7c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-112-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-112-big-array.c
@@ -45,6 +45,5 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-112.c b/gcc/testsuite/gcc.dg/vect/vect-112.c
index 4d954d10829..44e2cb270c4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-112.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-112.c
@@ -34,6 +34,5 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-113.c b/gcc/testsuite/gcc.dg/vect/vect-113.c
index 0d36c16c6b7..a9d45ce9fcc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-113.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-113.c
@@ -33,4 +33,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target powerpc*-*-* i?86-*-* x86_64-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-114.c b/gcc/testsuite/gcc.dg/vect/vect-114.c
index 3d43a7cd4b6..929c8045d32 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-114.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-114.c
@@ -36,5 +36,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { target { ! { vect_perm  } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_perm } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-115.c b/gcc/testsuite/gcc.dg/vect/vect-115.c
index ce6eaf45488..0502d15ed3e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-115.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-115.c
@@ -72,6 +72,5 @@ int main (void)
 }
           
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-116.c b/gcc/testsuite/gcc.dg/vect/vect-116.c
index f59e8abf9f5..d4aa069772e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-116.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-116.c
@@ -30,4 +30,3 @@ int main()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-117.c b/gcc/testsuite/gcc.dg/vect/vect-117.c
index 920e29314c0..f3d8a721097 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-117.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-117.c
@@ -62,5 +62,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "possible dependence between data-refs" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-118.c b/gcc/testsuite/gcc.dg/vect/vect-118.c
index bc08e9108a5..01ae828bd19 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-118.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-118.c
@@ -9,4 +9,3 @@ void f(short * __restrict__ a, short * __restrict__ b, short * __restrict__ x)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-119.c b/gcc/testsuite/gcc.dg/vect/vect-119.c
index 6a91029a521..1e5bea90311 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-119.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-119.c
@@ -26,4 +26,3 @@ unsigned int foo (const unsigned int x[OUTER][INNER][2])
 }
 
 /* { dg-final { scan-tree-dump-times "Detected interleaving of size 2" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-11a.c b/gcc/testsuite/gcc.dg/vect/vect-11a.c
index 2da903b1bc4..4f1e15e7429 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-11a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-11a.c
@@ -62,4 +62,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-12.c b/gcc/testsuite/gcc.dg/vect/vect-12.c
index 80a08c80213..b095170f008 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-12.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-12.c
@@ -41,4 +41,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-120.c b/gcc/testsuite/gcc.dg/vect/vect-120.c
index 1b3c5d49cdc..cafc9b4092a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-120.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-120.c
@@ -34,4 +34,3 @@ tV()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-121.c b/gcc/testsuite/gcc.dg/vect/vect-121.c
index 9071836c558..a8f25591021 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-121.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-121.c
@@ -15,4 +15,3 @@ test (int start, int end)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-122.c b/gcc/testsuite/gcc.dg/vect/vect-122.c
index 4cbdd0f7221..04dae679647 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-122.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-122.c
@@ -56,4 +56,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-123.c b/gcc/testsuite/gcc.dg/vect/vect-123.c
index 5a2f325090e..210da1e4bca 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-123.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-123.c
@@ -12,4 +12,3 @@ void foo (int s)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-124.c b/gcc/testsuite/gcc.dg/vect/vect-124.c
index f659b94baba..c720648aadd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-124.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-124.c
@@ -27,4 +27,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-125.c b/gcc/testsuite/gcc.dg/vect/vect-125.c
index f6ffef5c42e..0b3623ed06d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-125.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-125.c
@@ -17,4 +17,3 @@ void train(short *t, short *w, int n, int err)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-13.c b/gcc/testsuite/gcc.dg/vect/vect-13.c
index cb2c3cbeef4..752fea822d7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-13.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-13.c
@@ -40,4 +40,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_max } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-14.c b/gcc/testsuite/gcc.dg/vect/vect-14.c
index 35e48cc364c..1640220a134 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-14.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-14.c
@@ -34,4 +34,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-15-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-15-big-array.c
index 912907d8c82..d9457c3273a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-15-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-15-big-array.c
@@ -45,4 +45,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm && vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-15.c b/gcc/testsuite/gcc.dg/vect/vect-15.c
index ba7599162db..178bc4404c4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-15.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-15.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm && vect_hw_misalign } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-17.c b/gcc/testsuite/gcc.dg/vect/vect-17.c
index 8040991738f..471a82336cf 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-17.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-17.c
@@ -127,4 +127,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_bitwise } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-18.c b/gcc/testsuite/gcc.dg/vect/vect-18.c
index 075775c3127..28b2941e581 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-18.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-18.c
@@ -126,4 +126,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_bitwise } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-19.c b/gcc/testsuite/gcc.dg/vect/vect-19.c
index b058c821e18..27c6dc835a6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-19.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-19.c
@@ -126,4 +126,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_bitwise } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-2-big-array.c
index c0966d359f5..04ba58d21e3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-2-big-array.c
@@ -48,4 +48,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-2.c b/gcc/testsuite/gcc.dg/vect/vect-2.c
index a9c1b711021..d975668cbd0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-2.c
@@ -38,4 +38,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-20.c b/gcc/testsuite/gcc.dg/vect/vect-20.c
index ffa03da9736..8d759f3c6a6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-20.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-20.c
@@ -98,4 +98,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_bitwise } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-21.c b/gcc/testsuite/gcc.dg/vect/vect-21.c
index c3a7f448571..ab77df6ef88 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-21.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-21.c
@@ -127,4 +127,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { target vect_condition } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-22.c b/gcc/testsuite/gcc.dg/vect/vect-22.c
index e3f23b6eead..78dc1ce91de 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-22.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-22.c
@@ -124,4 +124,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-23.c b/gcc/testsuite/gcc.dg/vect/vect-23.c
index 7991bb2d490..44bed755fd3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-23.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-23.c
@@ -125,4 +125,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-24.c b/gcc/testsuite/gcc.dg/vect/vect-24.c
index c1ae6b702e9..09a6d7ee417 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-24.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-24.c
@@ -125,4 +125,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-25.c b/gcc/testsuite/gcc.dg/vect/vect-25.c
index 769df4f4f4a..fa1a681538a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-25.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-25.c
@@ -52,4 +52,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-26.c b/gcc/testsuite/gcc.dg/vect/vect-26.c
index bec111b69cf..c13dbd2bb55 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-26.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-26.c
@@ -38,4 +38,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-27.c b/gcc/testsuite/gcc.dg/vect/vect-27.c
index fd60d7738ff..1a10f27c5fd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-27.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-27.c
@@ -48,4 +48,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-28.c b/gcc/testsuite/gcc.dg/vect/vect-28.c
index 794a7c8f438..b28fbd9c79a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-28.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-28.c
@@ -42,4 +42,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { vector_alignment_reachable } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-29.c b/gcc/testsuite/gcc.dg/vect/vect-29.c
index 55cc97a41f4..d38ad7b0f96 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-29.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-29.c
@@ -54,4 +54,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" {target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-3.c b/gcc/testsuite/gcc.dg/vect/vect-3.c
index b0f90a42112..6fc6557cf9f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-3.c
@@ -49,4 +49,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-30.c b/gcc/testsuite/gcc.dg/vect/vect-30.c
index 408cbca4ea4..71f7a2d169f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-30.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-30.c
@@ -62,4 +62,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-31-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-31-big-array.c
index 25d7fdf2b7b..5621eb4d4ba 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-31-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-31-big-array.c
@@ -87,4 +87,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-31.c b/gcc/testsuite/gcc.dg/vect/vect-31.c
index 8719fc9d27e..3f7d00c1748 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-31.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-31.c
@@ -87,4 +87,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-32-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-32-big-array.c
index 774a0b05577..8863b58536a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-32-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-32-big-array.c
@@ -37,4 +37,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-32.c b/gcc/testsuite/gcc.dg/vect/vect-32.c
index c869f5ec989..6fe5099ac1a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-32.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-32.c
@@ -37,4 +37,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-33-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-33-big-array.c
index 2fc7106b888..5ad3953810b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-33-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-33-big-array.c
@@ -41,4 +41,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target vector_alignment_reachable } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-33.c b/gcc/testsuite/gcc.dg/vect/vect-33.c
index dd15a3ae70a..9964c492a67 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-33.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-33.c
@@ -40,4 +40,3 @@ int main (void)
 /* { dg-final { scan-tree-dump "Vectorizing an unaligned access" "vect" { target { { { ! powerpc*-*-* } && vect_hw_misalign } && { { ! vect64 } || vect_multiple_sizes } } } } }  */
 /* { dg-final { scan-tree-dump "Alignment of access forced using peeling" "vect" { target { vector_alignment_reachable && { vect64 && {! vect_multiple_sizes} } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { { {! vector_alignment_reachable} || {! vect64} } && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-34-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-34-big-array.c
index 9041bd6e194..2991f76fca5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-34-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-34-big-array.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-34.c b/gcc/testsuite/gcc.dg/vect/vect-34.c
index df18f774e5d..9cc590253c7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-34.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-34.c
@@ -38,4 +38,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-35-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-35-big-array.c
index 73b18cf62d8..1caca740404 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-35-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-35-big-array.c
@@ -47,4 +47,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  { xfail { ia64-*-* sparc*-*-* } } } } */
 /* { dg-final { scan-tree-dump-times "can't determine dependence between" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-35.c b/gcc/testsuite/gcc.dg/vect/vect-35.c
index 63fc8c819dc..edbeb1f500e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-35.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-35.c
@@ -47,4 +47,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  { xfail { ia64-*-* sparc*-*-* } } } } */
 /* { dg-final { scan-tree-dump "can't determine dependence between" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-36-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-36-big-array.c
index 8f2514db234..d40fcb6d992 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-36-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-36-big-array.c
@@ -44,4 +44,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-36.c b/gcc/testsuite/gcc.dg/vect/vect-36.c
index 20df3940a48..64bc7fe1809 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-36.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-36.c
@@ -44,4 +44,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-38.c b/gcc/testsuite/gcc.dg/vect/vect-38.c
index 8df8b5c9b09..01d984c61b8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-38.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-38.c
@@ -37,4 +37,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-4.c b/gcc/testsuite/gcc.dg/vect/vect-4.c
index c7210623588..b0cc45be7de 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-4.c
@@ -39,4 +39,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-40.c b/gcc/testsuite/gcc.dg/vect/vect-40.c
index 269b0895549..88c2eb11ddc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-40.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-40.c
@@ -60,4 +60,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"} } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-42.c b/gcc/testsuite/gcc.dg/vect/vect-42.c
index 6781ece182d..d7d81f2c7c7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-42.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-42.c
@@ -69,4 +69,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 4 "vect" { xfail { vect_no_align || { { !  vector_alignment_reachable } || vect_element_align  } } } } }  */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 3 "vect" { target vect_element_align } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail { vect_no_align || { { ! vector_alignment_reachable } || vect_element_align } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-44.c b/gcc/testsuite/gcc.dg/vect/vect-44.c
index 70f28dba315..186f9cfc9e2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-44.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-44.c
@@ -69,4 +69,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || {! vector_alignment_reachable} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { {! vector_alignment_reachable} && {{! vect_no_align} && {! vect_hw_misalign} } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-46.c b/gcc/testsuite/gcc.dg/vect/vect-46.c
index 26e0e520b9e..95a63c54431 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-46.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-46.c
@@ -62,4 +62,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-48.c b/gcc/testsuite/gcc.dg/vect/vect-48.c
index 5da97372d77..ed60cdd77dc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-48.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-48.c
@@ -58,4 +58,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-5.c b/gcc/testsuite/gcc.dg/vect/vect-5.c
index ff88424a035..17f3b2fac9a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-5.c
@@ -56,4 +56,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-50.c b/gcc/testsuite/gcc.dg/vect/vect-50.c
index 98ccf9a891f..78bfd8d3920 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-50.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-50.c
@@ -66,4 +66,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || {! vector_alignment_reachable} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { {! vector_alignment_reachable} && { {! vect_no_align } && {! vect_hw_misalign } } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-52.c b/gcc/testsuite/gcc.dg/vect/vect-52.c
index c7cf6abbf60..e37e0fa64c6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-52.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-52.c
@@ -59,4 +59,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 2 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-54.c b/gcc/testsuite/gcc.dg/vect/vect-54.c
index d563cc34b2d..e21792df9c0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-54.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-54.c
@@ -62,4 +62,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-56.c b/gcc/testsuite/gcc.dg/vect/vect-56.c
index ced829e4837..6a650f7c4ee 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-56.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-56.c
@@ -72,4 +72,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" { xfail { vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { vect_element_align } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-58.c b/gcc/testsuite/gcc.dg/vect/vect-58.c
index fa8c91b3071..a243ca9edf9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-58.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-58.c
@@ -60,4 +60,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-6-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-6-big-array.c
index 11b7fe2a996..2818b7ec1fd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-6-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-6-big-array.c
@@ -77,4 +77,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { { vect_aligned_arrays } && {! vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-6.c b/gcc/testsuite/gcc.dg/vect/vect-6.c
index 76117146b12..c3e6336bb43 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-6.c
@@ -56,4 +56,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { { vect_aligned_arrays } && {! vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-60.c b/gcc/testsuite/gcc.dg/vect/vect-60.c
index 8cfb8d9552b..980c8f67801 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-60.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-60.c
@@ -73,4 +73,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" { xfail { vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { vect_element_align } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-62.c b/gcc/testsuite/gcc.dg/vect/vect-62.c
index 724b646fde4..64be339b0cd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-62.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-62.c
@@ -67,4 +67,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-63.c b/gcc/testsuite/gcc.dg/vect/vect-63.c
index 70628da2b29..1afbd74b1d4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-63.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-63.c
@@ -43,4 +43,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-64.c b/gcc/testsuite/gcc.dg/vect/vect-64.c
index 52131ea44ac..240b68f6d0d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-64.c
@@ -83,4 +83,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-65.c b/gcc/testsuite/gcc.dg/vect/vect-65.c
index ba3ab3a9b15..9ac8ea4f013 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-65.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-65.c
@@ -80,4 +80,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-66.c b/gcc/testsuite/gcc.dg/vect/vect-66.c
index e0b23cd6550..ccb66bc8001 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-66.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-66.c
@@ -93,4 +93,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-67.c b/gcc/testsuite/gcc.dg/vect/vect-67.c
index 1ddab5c2e54..0af0b114523 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-67.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-67.c
@@ -44,4 +44,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-68.c b/gcc/testsuite/gcc.dg/vect/vect-68.c
index c4f8857ba8a..3012d88494d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-68.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-68.c
@@ -86,4 +86,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-7.c b/gcc/testsuite/gcc.dg/vect/vect-7.c
index b50b69f7690..c4556e321c6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-7.c
@@ -50,4 +50,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-70.c b/gcc/testsuite/gcc.dg/vect/vect-70.c
index 24677c2f893..a94140ecabc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-70.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-70.c
@@ -66,4 +66,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" {target { vector_alignment_reachable} } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" {target {{! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-71.c b/gcc/testsuite/gcc.dg/vect/vect-71.c
index 7416b433334..2d1a3ffd0ad 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-71.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-71.c
@@ -37,4 +37,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-72.c b/gcc/testsuite/gcc.dg/vect/vect-72.c
index c4e629cd0e6..4c0a9737016 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-72.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-72.c
@@ -49,4 +49,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-73-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-73-big-array.c
index 3bdf815ed7d..f5cc52e90af 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-73-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-73-big-array.c
@@ -49,4 +49,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-73.c b/gcc/testsuite/gcc.dg/vect/vect-73.c
index 86d816773d4..fdb49b86362 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-73.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-73.c
@@ -40,4 +40,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-74-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-74-big-array.c
index 5cd926fe0ba..44f22e56b83 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-74-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-74-big-array.c
@@ -65,4 +65,3 @@ int main (void)
  dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 2 "vect" { xfail vect_no_align } }
  dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } }
 */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-74.c b/gcc/testsuite/gcc.dg/vect/vect-74.c
index a680b9fb01b..a44f643ee96 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-74.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-74.c
@@ -49,4 +49,3 @@ int main (void)
  dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 2 "vect" { xfail vect_no_align } } 
  dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } }  
 */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-75-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-75-big-array.c
index 3524fa9a253..8844e15f268 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-75-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-75-big-array.c
@@ -54,4 +54,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /*  { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-75.c b/gcc/testsuite/gcc.dg/vect/vect-75.c
index 35336b93953..e8c77ea98f4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-75.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-75.c
@@ -46,4 +46,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-76-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-76-big-array.c
index 915f10edbf4..c2a30accac5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-76-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-76-big-array.c
@@ -80,4 +80,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-76.c b/gcc/testsuite/gcc.dg/vect/vect-76.c
index d7713024224..3f4feeff8ac 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-76.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-76.c
@@ -71,4 +71,3 @@ int main (void)
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-77-alignchecks.c b/gcc/testsuite/gcc.dg/vect/vect-77-alignchecks.c
index 56a2197d82b..535fa16a234 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-77-alignchecks.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-77-alignchecks.c
@@ -53,4 +53,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { {! vect_no_align} && { unaligned_stack && vector_alignment_reachable } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { { {! unaligned_stack} && { vect_no_align && { ! vect_hw_misalign } } } || {unaligned_stack && { {! vector_alignment_reachable} && {! vect_no_align } } } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 2 "vect" { target { { unaligned_stack && { vector_alignment_reachable && vect_no_align } } || {unaligned_stack && { {! vector_alignment_reachable} && vect_no_align } } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-77-global.c b/gcc/testsuite/gcc.dg/vect/vect-77-global.c
index 56d511205ad..fa06ad01304 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-77-global.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-77-global.c
@@ -51,4 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-77.c b/gcc/testsuite/gcc.dg/vect/vect-77.c
index 07ee0fde18d..d402e147043 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-77.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-77.c
@@ -43,4 +43,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-78-alignchecks.c b/gcc/testsuite/gcc.dg/vect/vect-78-alignchecks.c
index d4207074a07..1386a9da72f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-78-alignchecks.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-78-alignchecks.c
@@ -54,4 +54,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { {! vect_no_align} && { unaligned_stack && vector_alignment_reachable } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { { {! unaligned_stack} && { vect_no_align && { ! vect_hw_misalign } } } || {unaligned_stack && { {! vector_alignment_reachable} && { ! vect_no_align } } } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 2 "vect" { target { { unaligned_stack && { vector_alignment_reachable && vect_no_align } } || {unaligned_stack && { {! vector_alignment_reachable} && vect_no_align } } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-78-global.c b/gcc/testsuite/gcc.dg/vect/vect-78-global.c
index f0e5d9deab5..2a28580c98e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-78-global.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-78-global.c
@@ -51,4 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-78.c b/gcc/testsuite/gcc.dg/vect/vect-78.c
index 12ea12af9c5..faa7f2f4f76 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-78.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-78.c
@@ -43,4 +43,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-8.c b/gcc/testsuite/gcc.dg/vect/vect-8.c
index 62f819e0452..44c5f53ebaf 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-8.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-80-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-80-big-array.c
index 611d8260d4d..7ab9ada6a03 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-80-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-80-big-array.c
@@ -68,4 +68,3 @@ int main (void)
  dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } }
  dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" { target vect_no_align } }
 */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-80.c b/gcc/testsuite/gcc.dg/vect/vect-80.c
index fc0ed1b3938..45aac84a578 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-80.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-80.c
@@ -53,4 +53,3 @@ int main (void)
  dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } } 
  dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 3 "vect" { target vect_no_align } } 
 */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-82.c b/gcc/testsuite/gcc.dg/vect/vect-82.c
index 7fbaa92163d..7f4578e1e31 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-82.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-82.c
@@ -34,4 +34,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-82_64.c b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
index 30d9c809fa6..fc7434a31e4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-82_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
@@ -37,4 +37,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-83.c b/gcc/testsuite/gcc.dg/vect/vect-83.c
index c031db9df63..49beb31c609 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-83.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-83.c
@@ -34,4 +34,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-83_64.c b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
index 8cc4f22c41a..03f9f7bc3ab 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-83_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
@@ -37,4 +37,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-85-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-85-big-array.c
index 004114fbb66..ade04016cc3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-85-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-85-big-array.c
@@ -46,4 +46,3 @@ int main (void)
 
 /* Fails for targets that don't vectorize PLUS (e.g alpha).  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-85.c b/gcc/testsuite/gcc.dg/vect/vect-85.c
index a5bf5db078a..a73bae1ad41 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-85.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-85.c
@@ -46,4 +46,3 @@ int main (void)
 
 /* Fails for targets that don't vectorize PLUS (e.g alpha).  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-86.c b/gcc/testsuite/gcc.dg/vect/vect-86.c
index ac38c87897f..ff1d41df23f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-86.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-86.c
@@ -53,4 +53,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-87.c b/gcc/testsuite/gcc.dg/vect/vect-87.c
index 9912f19e724..4f743975852 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-87.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-87.c
@@ -53,4 +53,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" {target vector_alignment_reachable} } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" {target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-88.c b/gcc/testsuite/gcc.dg/vect/vect-88.c
index 59385465228..f35c5259a8d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-88.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-88.c
@@ -53,4 +53,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" {target vector_alignment_reachable } } }  */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" {target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-89-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-89-big-array.c
index 89286635cee..42355ff7281 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-89-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-89-big-array.c
@@ -47,4 +47,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-89.c b/gcc/testsuite/gcc.dg/vect/vect-89.c
index 131efeab53a..f634751c89d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-89.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-89.c
@@ -47,4 +47,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-9.c b/gcc/testsuite/gcc.dg/vect/vect-9.c
index c11784a4b2b..87600fb5df0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-9.c
@@ -37,4 +37,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-91.c b/gcc/testsuite/gcc.dg/vect/vect-91.c
index 019cf353f17..de9d5d1e1e8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-91.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-91.c
@@ -62,4 +62,3 @@ main3 ()
 /* { dg-final { scan-tree-dump-times "accesses have the same alignment." 2 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 3 "vect" {target { vector_alignment_reachable } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 3 "vect" {target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-92.c b/gcc/testsuite/gcc.dg/vect/vect-92.c
index 3a64e251cb2..19283d61517 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-92.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-92.c
@@ -93,4 +93,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-93.c b/gcc/testsuite/gcc.dg/vect/vect-93.c
index 07dda3db396..790ef2d7596 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-93.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-93.c
@@ -82,4 +82,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-95.c b/gcc/testsuite/gcc.dg/vect/vect-95.c
index be560a6c316..c27c34bcd86 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-95.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-95.c
@@ -66,4 +66,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 2 "vect" { xfail { vect_no_align || vect_element_align } } } } */
 /*  { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /*  { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 4 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-96.c b/gcc/testsuite/gcc.dg/vect/vect-96.c
index 7d8c92a5489..03289543add 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-96.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-96.c
@@ -47,4 +47,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { {! vect_no_align} && vector_alignment_reachable } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail { { vect_no_align } || { { ! vector_alignment_reachable} || vect_element_align } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning." 1 "vect" { target { { vect_no_align && { ! vect_hw_misalign } } || { {! vector_alignment_reachable} && {! vect_element_align} } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-97-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-97-big-array.c
index 87bacbf726b..32100860334 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-97-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-97-big-array.c
@@ -70,4 +70,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-97.c b/gcc/testsuite/gcc.dg/vect/vect-97.c
index 6ea26149095..734ba3b6ca3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-97.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-97.c
@@ -62,4 +62,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-98-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-98-big-array.c
index 0528d43b807..17d11ba24ca 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-98-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-98-big-array.c
@@ -54,4 +54,3 @@ int main (void)
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided4 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { xfail  vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-98.c b/gcc/testsuite/gcc.dg/vect/vect-98.c
index 01c9153878f..99256a7c878 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-98.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-98.c
@@ -40,4 +40,3 @@ int main (void)
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided4 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { xfail  vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-99.c b/gcc/testsuite/gcc.dg/vect/vect-99.c
index d29023c733e..0d13d4b30a2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-99.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-99.c
@@ -30,4 +30,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-aggressive-1.c b/gcc/testsuite/gcc.dg/vect/vect-aggressive-1.c
index 8ef84b70808..b913b0c4992 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-aggressive-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-aggressive-1.c
@@ -59,4 +59,3 @@ default:
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-alias-check.c b/gcc/testsuite/gcc.dg/vect/vect-alias-check.c
index 7c8b7dd98c8..ab90895192f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-alias-check.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-alias-check.c
@@ -15,4 +15,3 @@ void foo (int *a, int *b)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-align-1.c b/gcc/testsuite/gcc.dg/vect/vect-align-1.c
index e63baff4bd1..ea5ac0444fa 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-align-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-align-1.c
@@ -50,4 +50,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target vect_hw_misalign } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { xfail vect_hw_misalign} } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-align-2.c b/gcc/testsuite/gcc.dg/vect/vect-align-2.c
index 293d07b241d..200d5569274 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-align-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-align-2.c
@@ -45,4 +45,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 1 "vect" { xfail vect_hw_misalign} } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-align-3.c b/gcc/testsuite/gcc.dg/vect/vect-align-3.c
index 65da84d7df8..156bb018241 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-align-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-align-3.c
@@ -52,4 +52,3 @@ f4 (int x, int y)
 
 /* { dg-final { scan-tree-dump-not "vect_do_peeling_for_loop_bound" "vect" } } */
 /* { dg-final { scan-tree-dump-not "loop peeled for vectorization" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-all-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-all-big-array.c
index c3bf50caf30..4826cdb93e8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-all-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-all-big-array.c
@@ -253,4 +253,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { { vect_aligned_arrays } && {! vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-all.c b/gcc/testsuite/gcc.dg/vect/vect-all.c
index e91e1f925de..cc41e2dd3d3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-all.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-all.c
@@ -219,4 +219,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" { target { { vect_aligned_arrays } && {! vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { {! vect_aligned_arrays } && {vect_sizes_32B_16B} } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-bool-1.c b/gcc/testsuite/gcc.dg/vect/vect-bool-1.c
index fd12f5c77a3..a91f9e2dd5f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-bool-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-bool-1.c
@@ -12,4 +12,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-bswap16.c b/gcc/testsuite/gcc.dg/vect/vect-bswap16.c
index c5627183d23..a158bf4d455 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-bswap16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-bswap16.c
@@ -41,4 +41,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-bswap32.c b/gcc/testsuite/gcc.dg/vect/vect-bswap32.c
index 9596677617f..3ca779bfb23 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-bswap32.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-bswap32.c
@@ -41,4 +41,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-bswap64.c b/gcc/testsuite/gcc.dg/vect/vect-bswap64.c
index 088c8c62a0a..10b9e0617df 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-bswap64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-bswap64.c
@@ -41,4 +41,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-complex-1.c b/gcc/testsuite/gcc.dg/vect/vect-complex-1.c
index 23f3651eb3b..2a87e2feade 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-complex-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-complex-1.c
@@ -52,4 +52,3 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-complex-2.c b/gcc/testsuite/gcc.dg/vect/vect-complex-2.c
index 498e742a33f..19b24e1eb87 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-complex-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-complex-2.c
@@ -52,4 +52,3 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-complex-4.c b/gcc/testsuite/gcc.dg/vect/vect-complex-4.c
index 288ff07c167..49cfdbe1738 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-complex-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-complex-4.c
@@ -105,4 +105,3 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-complex-5.c b/gcc/testsuite/gcc.dg/vect/vect-complex-5.c
index 83d04cd0464..a2e3590ed98 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-complex-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-complex-5.c
@@ -41,4 +41,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-1.c b/gcc/testsuite/gcc.dg/vect/vect-cond-1.c
index bd2d2fb6247..3a50c6f2d7e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-1.c
@@ -52,6 +52,5 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-10.c b/gcc/testsuite/gcc.dg/vect/vect-cond-10.c
index da2eb05fc3b..a75ac263fbf 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-10.c
@@ -163,4 +163,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 8 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-11.c b/gcc/testsuite/gcc.dg/vect/vect-cond-11.c
index 0301c890979..f28af658f33 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-11.c
@@ -113,4 +113,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-2.c b/gcc/testsuite/gcc.dg/vect/vect-cond-2.c
index 97d3241a93e..51418c2dd2c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-2.c
@@ -43,6 +43,5 @@ int main (void)
 /* The order of computation should not be changed for cond_expr, therefore, 
    it cannot be vectorized in reduction.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-3.c b/gcc/testsuite/gcc.dg/vect/vect-cond-3.c
index 0f36e848b55..65c4079b89c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-3.c
@@ -60,6 +60,5 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-4.c b/gcc/testsuite/gcc.dg/vect/vect-cond-4.c
index 9a6e117d912..cb2a1be0337 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-4.c
@@ -57,6 +57,5 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-5.c b/gcc/testsuite/gcc.dg/vect/vect-cond-5.c
index e8adedbe411..41e57f9235b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-5.c
@@ -57,5 +57,4 @@ int main ()
    of computation is the same, but vector results should be reduced to scalar
    result, which can'be done for cond_expr.  */
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-6.c b/gcc/testsuite/gcc.dg/vect/vect-cond-6.c
index 944c9c27262..65fdc4a9ef1 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-6.c
@@ -55,5 +55,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-7.c b/gcc/testsuite/gcc.dg/vect/vect-cond-7.c
index 227192cf24c..bd294751658 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-7.c
@@ -65,4 +65,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-8.c b/gcc/testsuite/gcc.dg/vect/vect-cond-8.c
index e5702c25a1d..1b31d7dd9ed 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-8.c
@@ -119,4 +119,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 5 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-9.c b/gcc/testsuite/gcc.dg/vect/vect-cond-9.c
index de88fc57f5b..6259ab6dc0e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-9.c
@@ -198,4 +198,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 10 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-1.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-1.c
index 0a9fc61c42b..033aafa0f97 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-1.c
@@ -16,5 +16,4 @@ int foo()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-2.c b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-2.c
index 2ab457cfb27..f963f432427 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cond-reduc-2.c
@@ -15,5 +15,4 @@ void foo(int k)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cselim-1.c b/gcc/testsuite/gcc.dg/vect/vect-cselim-1.c
index ce2db7d8b5d..2b010132984 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cselim-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cselim-1.c
@@ -83,4 +83,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { xfail { { vect_no_align && { ! vect_hw_misalign } } || { ! vect_strided2 } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-cselim-2.c b/gcc/testsuite/gcc.dg/vect/vect-cselim-2.c
index accfcf398c6..d57228300f2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-cselim-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-cselim-2.c
@@ -62,4 +62,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-1.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-1.c
index 7dd6b494d21..6abf76392c8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-1.c
@@ -51,5 +51,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-2.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-2.c
index 50d0141748b..4bfd1630c4e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-2.c
@@ -51,5 +51,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-3.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-3.c
index f5376b8bb41..f2becfa8b4a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-3.c
@@ -62,5 +62,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-4.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-4.c
index 7ab6b69ad2a..e5937705400 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-4.c
@@ -51,5 +51,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-5.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-5.c
index 48457628f97..0ba33895592 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-5.c
@@ -53,5 +53,4 @@ int main ()
 /* Vectorization of loops with multiple types and double reduction is not 
    supported yet.  */       
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6-big-array.c
index abf3f7db6d3..ce134b08a40 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6-big-array.c
@@ -61,5 +61,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
index 6b14e3bf590..3a4f087da81 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-6.c
@@ -45,5 +45,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-7.c b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-7.c
index 34a6f600ef1..c3145a2ad02 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-double-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-double-reduc-7.c
@@ -60,5 +60,4 @@ int main ()
 }
         
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 3 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
       
diff --git a/gcc/testsuite/gcc.dg/vect/vect-dv-1.c b/gcc/testsuite/gcc.dg/vect/vect-dv-1.c
index 0da4cd978a8..621e67df4c6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-dv-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-dv-1.c
@@ -19,4 +19,3 @@ void foo()
 	x[j-63]=x[j-3]-x[j];
       }
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c b/gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c
index 3035ee392b3..85a7ad1a6a9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-float-extend-1.c
@@ -38,4 +38,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail spu*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c b/gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c
index b7a9b47bbf7..81c23cfac7a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-float-truncate-1.c
@@ -37,4 +37,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail spu*-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-1.c b/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-1.c
index e5b72f1acab..fc5081b7e8e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-1.c
@@ -38,4 +38,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_floatint_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-2.c b/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-2.c
index 683b43c513d..27d248b9837 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-floatint-conversion-2.c
@@ -37,4 +37,3 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_floatint_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-fold-1.c b/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
index 8aca1e42063..2bd21a47a0b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-fold-1.c
@@ -13,4 +13,3 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-times "c =.* { 6, 8, 10, 12 }" 1 "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-10.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-10.c
index 8a4b24ed4c7..0fbb97f5157 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-10.c
@@ -9,4 +9,3 @@ foo (int j, double *v, double x)
       x = v[i];
   return x;
 }
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-16.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-16.c
index 8071c87d09c..7186875f021 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-16.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-17.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-17.c
index a02c8984e58..66f15dd71f3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-17.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-17.c
@@ -31,4 +31,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-2.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-2.c
index e899f126d8c..3aa4948ce5b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-2.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-3.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-3.c
index 1d8e9f52b23..2d80603164d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-3.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-4.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-4.c
index 1680cba8a88..f1b56ce2e37 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-4.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-5.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-5.c
index 5fc9674b317..05309ea1dd2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-5.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-6.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-6.c
index 24e8c969e1c..77a749d4ce4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-6.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-7.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-7.c
index fa4cf3a58fa..5ced2794ef5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-7.c
@@ -33,4 +33,3 @@ int main ()
 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-9.c b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-9.c
index 50eedb1d40a..f08b81d41a7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ifcvt-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ifcvt-9.c
@@ -36,4 +36,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-1.c b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-1.c
index 90f33a508a6..bef3efa5658 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-1.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_intfloat_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-2.c b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-2.c
index 87f200119d6..666ee34a4a7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-2.c
@@ -38,4 +38,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_intfloat_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-3.c b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-3.c
index d5f25df7190..6eb4fec77ee 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-3.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_intfloat_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4a.c b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4a.c
index af8344ba600..af8fe89a7b0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4a.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_intfloat_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4b.c b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4b.c
index 51ea056fa1d..49c83182026 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-intfloat-conversion-4b.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_intfloat_cvt } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-1.c b/gcc/testsuite/gcc.dg/vect/vect-iv-1.c
index 5d6ab5cd242..90163c440d3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-1.c
@@ -39,4 +39,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-10.c b/gcc/testsuite/gcc.dg/vect/vect-iv-10.c
index 7ec487253ac..195474b5644 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-10.c
@@ -33,4 +33,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-11.c b/gcc/testsuite/gcc.dg/vect/vect-iv-11.c
index 632b97c2950..7dc353f5362 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-11.c
@@ -29,4 +29,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-2.c b/gcc/testsuite/gcc.dg/vect/vect-iv-2.c
index df34a99c114..73e30ee9bac 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-2.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-3.c b/gcc/testsuite/gcc.dg/vect/vect-iv-3.c
index fac303a679b..f8ca94dd17d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-3.c
@@ -41,4 +41,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-4.c b/gcc/testsuite/gcc.dg/vect/vect-iv-4.c
index fe29cff18fb..dfe5bc14458 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-4.c
@@ -41,4 +41,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-5.c b/gcc/testsuite/gcc.dg/vect/vect-iv-5.c
index 88610950055..2015385fbf5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-5.c
@@ -37,4 +37,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail {! arm_neon_ok } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-6.c b/gcc/testsuite/gcc.dg/vect/vect-iv-6.c
index 96d3fbf525b..ccd7458a98f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-6.c
@@ -46,4 +46,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-7.c b/gcc/testsuite/gcc.dg/vect/vect-iv-7.c
index 0d96ac2d4ee..24b59fe55c4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-7.c
@@ -39,4 +39,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-8-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-iv-8-big-array.c
index 677b7a3534b..45d82c65e2f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-8-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-8-big-array.c
@@ -40,4 +40,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_pack_trunc && vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-8.c b/gcc/testsuite/gcc.dg/vect/vect-iv-8.c
index 6544988b247..dd37d250e91 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-8.c
@@ -40,4 +40,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_pack_trunc && vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-8a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-iv-8a-big-array.c
index 100c7513c40..63b6b6e893f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-8a-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-8a-big-array.c
@@ -40,4 +40,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_pack_trunc && vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-8a.c b/gcc/testsuite/gcc.dg/vect/vect-iv-8a.c
index dc742eb84fb..1f8fedf2716 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-8a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-8a.c
@@ -40,4 +40,3 @@ int main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_pack_trunc && vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-iv-9.c b/gcc/testsuite/gcc.dg/vect/vect-iv-9.c
index 28ce927bf89..99a7e18965e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-iv-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-iv-9.c
@@ -35,4 +35,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_int_mult } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target {! vect_int_mult } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ivdep-1.c b/gcc/testsuite/gcc.dg/vect/vect-ivdep-1.c
index 7900e59299b..76c9204b570 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ivdep-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ivdep-1.c
@@ -15,4 +15,3 @@ void foo(int n, int *a, int *b, int *c, int *d, int *e) {
 
 /* { dg-message "loop vectorized" "" { target *-*-* } 0 } */
 /* { dg-bogus " version\[^\n\r]* alias" "" { target *-*-* } 0 } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-ivdep-2.c b/gcc/testsuite/gcc.dg/vect/vect-ivdep-2.c
index 4e3dcbd322b..ac2dbc19dca 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-ivdep-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-ivdep-2.c
@@ -31,4 +31,3 @@ void bar(int n, int *a, int *b, int *c) {
 
 /* { dg-message "loop vectorized" "" { target *-*-* } 0 } */
 /* { dg-bogus " version\[^\n\r]* alias" "" { target *-*-* } 0 } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c b/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c
index 3f734252b81..eb12ea16278 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c
@@ -48,4 +48,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 1 "vect" { target avx_runtime } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c b/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c
index 493a18d5912..11e953302bf 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c
@@ -46,4 +46,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 1 "vect" { target avx_runtime } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-1.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-1.c
index b3a02aa6543..fd7cacb483d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-1.c
@@ -84,5 +84,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail {{ vect_no_align && { ! vect_hw_misalign } } || {vect_sizes_32B_16B }}} } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 4 "vect" { xfail {{ vect_no_align && { ! vect_hw_misalign } } || {vect_sizes_32B_16B }}} } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-10.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-10.c
index 60a4fc85481..891ba6d8e71 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-10.c
@@ -64,5 +64,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-11.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-11.c
index 9cb8c1dfe44..c58391f495e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-11.c
@@ -40,5 +40,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c
index 45b42cd264f..2f9bb0a7a58 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-12.c
@@ -42,5 +42,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target sparc*-*-* xfail ilp32 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { { ! sparc*-*-* }  && { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-13.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-13.c
index 4200e62a17a..2b185bb1f86 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-13.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-13.c
@@ -60,5 +60,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-14.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-14.c
index 816f4e49c58..ff5f8e989b2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-14.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-14.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-15.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-15.c
index 145bb5d7e9f..900cbfd7a1e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-15.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-15.c
@@ -46,5 +46,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_sdot_hi  || vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-16.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-16.c
index 176333c2b03..cf45703e018 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-16.c
@@ -36,5 +36,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_unpack } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-17.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-17.c
index b2f81058260..79ad80e3013 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-17.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-17.c
@@ -41,5 +41,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-2.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-2.c
index 4ae47f2c58e..7f93938349f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-2.c
@@ -45,5 +45,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-3.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-3.c
index 2fdd4b7c9e5..9e558b81b90 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-3.c
@@ -56,5 +56,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 3 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 3 "vect" {xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-4.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-4.c
index 37146def8cd..bd02e5aeee9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-4.c
@@ -97,5 +97,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { vect_no_align || vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 8 "vect" { xfail { vect_no_align || vect_element_align } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 4 "vect" { target { vect_element_align  } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-5.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-5.c
index 30ec6840687..ad11d78a548 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-5.c
@@ -49,5 +49,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { sparc*-*-* && ilp32 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-6.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-6.c
index a337ca4b649..930dc4c0c3d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-6.c
@@ -63,5 +63,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { sparc*-*-* && ilp32 } }} } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using versioning" 6 "vect" { target { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 6 "vect" {xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-7.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-7.c
index ae6ee1a06d5..c3ef4d4948d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-7.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_sdot_hi } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-8.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-8.c
index 699c87bd172..315c9aba731 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-8.c
@@ -47,5 +47,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-multitypes-9.c b/gcc/testsuite/gcc.dg/vect/vect-multitypes-9.c
index 9313f2a23aa..8c5c611947f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-multitypes-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-multitypes-9.c
@@ -60,5 +60,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-neg-store-1.c b/gcc/testsuite/gcc.dg/vect/vect-neg-store-1.c
index 178f0a1ec9d..1efecb43379 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-neg-store-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-neg-store-1.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-neg-store-2.c b/gcc/testsuite/gcc.dg/vect/vect-neg-store-2.c
index e97b9bf40ef..9099eb25559 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-neg-store-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-neg-store-2.c
@@ -36,4 +36,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-1.c b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-1.c
index 588751e85cb..f52f30aa24e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-1.c
@@ -44,5 +44,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-2.c b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-2.c
index 247d3272e8b..5aa977df633 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-2.c
@@ -43,5 +43,4 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-3.c b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-3.c
index 0c8f91307db..f2ab30c63b2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-nest-cycle-3.c
@@ -53,4 +53,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-nop-move.c b/gcc/testsuite/gcc.dg/vect/vect-nop-move.c
index 7e3c1d3317e..910e8c24a30 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-nop-move.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-nop-move.c
@@ -78,5 +78,3 @@ main ()
 }
 
 /* { dg-final { scan-rtl-dump "deleting noop move" "combine" { target aarch64*-*-* } } } */
-/* { dg-final { cleanup-rtl-dump "combine" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c
index 3f23aeedfcc..6c61b09472a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c
@@ -24,4 +24,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c
index 623d146d36f..5fdaa83f7da 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c
@@ -24,4 +24,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c
index 416cce18712..68b25f9b326 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c
@@ -22,4 +22,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c
index a8dce0512bd..85649afc748 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c
@@ -22,4 +22,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c
index 7c03540ec57..133347d29e4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c
@@ -24,4 +24,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c
index 2c4a7392c88..15b0a0bd084 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c
@@ -24,4 +24,3 @@ foo (){
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2-big-array.c
index ba3fa87b151..02f01cfb579 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2-big-array.c
@@ -38,4 +38,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2.c
index 38701977bc6..55023d594dd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2.c
@@ -38,4 +38,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2a-big-array.c
index 062e1fdd451..6b9fefedf3a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2a-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2a-big-array.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2a.c
index b8d0e51fee5..3a4dafee072 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2a.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c
index fccd13dcf74..1ddf176624f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c
@@ -39,4 +39,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2c-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2c-big-array.c
index cdea72aabe2..6adde976921 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2c-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2c-big-array.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2c.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2c.c
index 0ca868637ad..bf6abfef01f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2c.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2d.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2d.c
index 3e19d47b315..b75281bc318 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-2d.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2d.c
@@ -38,4 +38,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3-big-array.c
index 83b6f994cd7..fdc8a0544dd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3-big-array.c
@@ -49,4 +49,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3.c
index 924700c5840..921db48a0f7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3.c
@@ -49,4 +49,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c
index a3e5ed8979c..1316e80a657 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3a-big-array.c
@@ -50,4 +50,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c
index 186d853dc22..6a7ab916ec4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3a.c
@@ -50,4 +50,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "step doesn't divide the vector-size" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c
index de16fa5cc2a..2a9a2ce0f08 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c
@@ -51,4 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target { ! vect_multiple_sizes } } } } */
 /* { dg-final { scan-tree-dump-times "grouped access in outer loop" 4 "vect" { target vect_multiple_sizes } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3c.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3c.c
index 599137ba12e..091c6826f66 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-3c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3c.c
@@ -49,4 +49,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4.c
index 8f53f2553b4..9614b777ade 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4.c
@@ -52,4 +52,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "zero step in outer loop." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4a-big-array.c
index af9d2a88b29..b0d9a4bf743 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4a-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4a-big-array.c
@@ -23,4 +23,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target { vect_widen_mult_hi_to_si && vect_pack_trunc } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4a.c
index d7bcc9a2e8c..fedc23da482 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4a.c
@@ -23,4 +23,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target { vect_widen_mult_hi_to_si && vect_pack_trunc } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4b-big-array.c
index 703ac94835a..3c16fce8290 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4b-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4b-big-array.c
@@ -23,4 +23,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4b.c
index 407315a8dc3..df2528081d6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4b.c
@@ -23,4 +23,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4c-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4c-big-array.c
index ded4049877d..658920b3866 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4c-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4c-big-array.c
@@ -25,4 +25,3 @@ foo (){
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target { vect_short_mult && { ! vect_no_align } } } } } */
 /* { dg-final { scan-tree-dump-times "zero step in outer loop." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4c.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4c.c
index cde59a13539..f30f251cbf0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4c.c
@@ -25,4 +25,3 @@ foo (){
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target { vect_short_mult && { ! vect_no_align } } } } } */
 /* { dg-final { scan-tree-dump "zero step in outer loop." "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4d-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4d-big-array.c
index 0d85bed6059..b656064697c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4d-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4d-big-array.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4d.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4d.c
index c344fb1d67b..443a00d49e1 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4d.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4d.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4e.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4e.c
index 243cc1af7ea..13238dbe2f9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4e.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4e.c
@@ -24,4 +24,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4f.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4f.c
index c6cc4a8d1a4..d1fbe346a48 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4f.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4f.c
@@ -66,4 +66,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4g.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4g.c
index c6cc4a8d1a4..d1fbe346a48 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4g.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4g.c
@@ -66,4 +66,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4i.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4i.c
index a244ac20ac2..934eddb5d68 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4i.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4i.c
@@ -46,4 +46,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4j.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4j.c
index db8f61c5e37..fcfec3cf29a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4j.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4j.c
@@ -22,4 +22,3 @@ foo (){
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4k.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4k.c
index c6cc4a8d1a4..d1fbe346a48 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4k.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4k.c
@@ -66,4 +66,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4l.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4l.c
index c6cc4a8d1a4..d1fbe346a48 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4l.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4l.c
@@ -66,4 +66,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4m-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4m-big-array.c
index 9a1e02e0356..e99ce0f5725 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4m-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4m-big-array.c
@@ -55,4 +55,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-4m.c b/gcc/testsuite/gcc.dg/vect/vect-outer-4m.c
index 6e032f13c4f..d401acef3f3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-4m.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-4m.c
@@ -55,4 +55,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect"  { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-5.c b/gcc/testsuite/gcc.dg/vect/vect-outer-5.c
index f0cdcaebe85..d9451ab2b1f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-5.c
@@ -79,4 +79,3 @@ int main ()
 /* { dg-final { scan-tree-dump-times "not vectorized: possible dependence between data-refs" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
 /* { dg-final { scan-tree-dump "zero step in outer loop." "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-6.c b/gcc/testsuite/gcc.dg/vect/vect-outer-6.c
index 572f433cf50..546b5836437 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-6.c
@@ -63,4 +63,3 @@ int main ()
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "zero step in outer loop." 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-big-array.c
index 07db614484a..6299e9fed42 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-big-array.c
@@ -71,4 +71,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb-big-array.c
index 505eef58f17..d575229f2fb 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb-big-array.c
@@ -75,4 +75,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb.c b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb.c
index c1732d9fbca..9414e82f3ed 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-fir-lb.c
@@ -75,4 +75,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-fir.c b/gcc/testsuite/gcc.dg/vect/vect-outer-fir.c
index fa10263558f..0d181dfec24 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-outer-fir.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-outer-fir.c
@@ -71,4 +71,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 2 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-1-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-1-big-array.c
index 5df349a155e..94e4911aac1 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-1-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-1-big-array.c
@@ -62,5 +62,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 2 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 4 "vect" { target { ! vect_widen_shift } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-1.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-1.c
index e358209ab10..cfc724089c7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-1.c
@@ -63,5 +63,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 4 "vect" { target { { ! vect_sizes_32B_16B } && { ! vect_widen_shift } } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 8 "vect" { target vect_sizes_32B_16B } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-2-big-array.c
index bc738cef26c..5be9340cb69 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-2-big-array.c
@@ -61,5 +61,4 @@ int main (void)
 /* Final value stays in int, so no over-widening is detected at the moment.  */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-2.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-2.c
index fecc5ef3038..b7ee047471b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-2.c
@@ -61,5 +61,4 @@ int main (void)
 /* Final value stays in int, so no over-widening is detected at the moment.  */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 0 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-3-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-3-big-array.c
index d828c833f55..f5afc44c115 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-3-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-3-big-array.c
@@ -60,5 +60,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-3.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-3.c
index c69465898fa..ddbf1b21b48 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-3.c
@@ -60,5 +60,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump "vect_recog_over_widening_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-4-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-4-big-array.c
index 900250f0471..6e264f90c0b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-4-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-4-big-array.c
@@ -66,5 +66,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 2 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 4 "vect" { target { ! vect_widen_shift } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-over-widen-4.c b/gcc/testsuite/gcc.dg/vect/vect-over-widen-4.c
index 70f12fef7d3..5928c6d2315 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-over-widen-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-over-widen-4.c
@@ -67,5 +67,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 4 "vect" { target { { ! vect_sizes_32B_16B } && { ! vect_widen_shift } } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_over_widening_pattern: detected" 8 "vect" { target vect_sizes_32B_16B } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-peel-1.c b/gcc/testsuite/gcc.dg/vect/vect-peel-1.c
index b593411c7bc..0a4e732a08b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-peel-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-peel-1.c
@@ -50,4 +50,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-peel-2.c b/gcc/testsuite/gcc.dg/vect/vect-peel-2.c
index ea270436e1a..b6061c3b855 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-peel-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-peel-2.c
@@ -51,4 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-peel-3.c b/gcc/testsuite/gcc.dg/vect/vect-peel-3.c
index 7be44842651..8baee0d5657 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-peel-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-peel-3.c
@@ -51,4 +51,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect"  { xfail { { vect_no_align && { ! vect_hw_misalign } } || {vect_sizes_32B_16B } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || {vect_sizes_32B_16B } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-peel-4.c b/gcc/testsuite/gcc.dg/vect/vect-peel-4.c
index 0edfefb1080..937062ed6f2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-peel-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-peel-4.c
@@ -48,4 +48,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect"  { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
 /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-pre-interact.c b/gcc/testsuite/gcc.dg/vect/vect-pre-interact.c
index 8b7a72ba7e6..5417f0c4375 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-pre-interact.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-pre-interact.c
@@ -13,4 +13,3 @@ void foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-recip.c b/gcc/testsuite/gcc.dg/vect/vect-recip.c
index 4f130b05c0e..61c4f12171d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-recip.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-recip.c
@@ -17,4 +17,3 @@ void f(float *__restrict__ qa, float *__restrict__ qb,
   }
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-1.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-1.c
index dbb154d1233..99abe06901e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-1.c
@@ -53,4 +53,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail { vect_no_int_add || vect_no_int_max } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-10.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-10.c
index ad2199956be..2d0dac8d3d5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-10.c
@@ -48,4 +48,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-1char-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-1char-big-array.c
index 7462cb34cc5..a25b6cbfc90 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-1char-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-1char-big-array.c
@@ -68,4 +68,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-1char.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-1char.c
index 5a1c03d113f..644b474f57e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-1char.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-1char.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-1short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-1short.c
index 145722a1946..32eb324ae5a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-1short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-1short.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2.c
index 912e69c93c2..44f0fc701b8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2.c
@@ -50,4 +50,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail { vect_no_int_add || vect_no_int_max } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
index 7004e9e4e44..8692f42ae34 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char-big-array.c
@@ -66,4 +66,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
index 6d01f03174a..5f0551ee372 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2char.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
index 7d19e70018b..02c2bee8612 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-2short.c
@@ -46,4 +46,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail *-*-* } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-3.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-3.c
index 3e6f17c485a..551a88c925d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-3.c
@@ -39,4 +39,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_int_add } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-6.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-6.c
index 3f8e2ec69a0..1bbf10c7607 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-6.c
@@ -51,4 +51,3 @@ int main (void)
 /* need -ffast-math to vectorizer these loops.  */
 /* ARM NEON passes -ffast-math to these tests, so expect this to fail.  */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { xfail arm_neon_ok } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-7.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-7.c
index a59a24ac737..274f2124b07 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-7.c
@@ -75,4 +75,3 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-8.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-8.c
index fdfec0a8b7a..527f4f3f3a4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-8.c
@@ -75,4 +75,3 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-9.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-9.c
index ecf3bf1ac4f..8dc878711e8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-9.c
@@ -75,4 +75,3 @@ int main (void)
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16a.c
index c986344165b..171451872e5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16a.c
@@ -52,5 +52,4 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_sdot_hi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16b.c
index 1344ca95553..e8b25640749 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16b.c
@@ -53,5 +53,4 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_short_mult } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { { ! vect_widen_sum_hi_to_si } && { ! vect_unpack } } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16c.c
index 8ba823b044c..d6de4262236 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s16c.c
@@ -69,5 +69,4 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8a.c
index 96c2950c088..dc4f52019d5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8a.c
@@ -55,4 +55,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_sdot_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi && vect_widen_sum_hi_to_si } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
index 2ecb225a81a..b178662ccd5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c
@@ -63,4 +63,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8c.c
index 59b174e3f36..5335fb78d8e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8c.c
@@ -43,4 +43,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_unpack } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16a.c
index c09750d4454..4bf4a1e3c2c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16a.c
@@ -49,4 +49,3 @@ int main (void)
 /* The initialization loop in main also gets vectorized.  */
 /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_short_mult && vect_widen_sum_hi_to_si } } } } */ 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16b.c
index 42b104fb8f7..b2e6ab8861d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u16b.c
@@ -56,4 +56,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { xfail *-*-* } } } */ 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_pack_trunc } } } */ 
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8a.c
index d856754c902..f3cc6c78c25 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8a.c
@@ -52,5 +52,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_udot_qi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi && vect_widen_sum_qi_to_si } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8b.c
index 01c82b52c54..3155d97b3cd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8b.c
@@ -51,5 +51,4 @@ dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_udot
 */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" {target { vect_widen_mult_qi_to_hi || vect_unpack } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_1.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_1.c
index 44f026ff9b5..6a38e065b02 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_1.c
@@ -32,5 +32,4 @@ main (unsigned char argc, char **argv)
 }
 
 /* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_2.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_2.c
index 414fba7a5c9..840100ba5a3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-mul_2.c
@@ -28,5 +28,4 @@ main (unsigned char argc, char **argv)
 }
 
 /* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c
index 4e1a8577ce2..32f906968e4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_1.c
@@ -31,5 +31,4 @@ main (unsigned char argc, char **argv)
 }
 
 /* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c
index e25467e5922..dfe66984598 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-or_2.c
@@ -27,5 +27,4 @@ main (unsigned char argc, char **argv)
 }
 
 /* { dg-final { scan-tree-dump "Reduce using vector shifts" "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1a.c
index 2d5c5b9a809..a8cb21b4eb4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1a.c
@@ -37,4 +37,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_hi_to_si } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b-big-array.c
index 1967e3da6b2..1863403092c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b-big-array.c
@@ -46,4 +46,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_sum_qi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { { ! vect_widen_sum_qi_to_si } && { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b.c
index 553ab6fcdfd..1deb147da58 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1b.c
@@ -37,4 +37,3 @@ main (void)
 /* { dg-final { scan-tree-dump "vect_recog_widen_sum_pattern: detected" "vect"} } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_sum_qi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { { ! vect_widen_sum_qi_to_si } && { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c-big-array.c
index 5394adee00e..91dace25013 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c-big-array.c
@@ -46,4 +46,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_qi_to_hi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_qi_to_hi } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c.c
index 2fc7f9a5914..b7fe44cdbc1 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-1c.c
@@ -37,4 +37,3 @@ main (void)
 /* { dg-final { scan-tree-dump "vect_recog_widen_sum_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_qi_to_hi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_qi_to_hi } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2a.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2a.c
index 69573862955..81384300088 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2a.c
@@ -37,4 +37,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_hi_to_si } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b-big-array.c
index fa0100b9a9d..ce333978253 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b-big-array.c
@@ -47,4 +47,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_sum_qi_to_si && vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { { ! vect_widen_sum_qi_to_si } && { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b.c
index 6106ed8f53a..c8b97b99bc3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2b.c
@@ -37,4 +37,3 @@ main (void)
 /* { dg-final { scan-tree-dump "vect_recog_widen_sum_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_sum_qi_to_si && vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { { ! vect_widen_sum_qi_to_si } && { ! vect_unpack } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
index 36f51496f6b..8190622d5d7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-2c.c
@@ -45,4 +45,3 @@ main (void)
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_sum_pattern: detected" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_qi_to_hi } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-3.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-3.c
index 39f3b6b3b58..5dd2e504f36 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-pattern-3.c
@@ -37,5 +37,4 @@ main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-sad.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-sad.c
index e5879e01f95..2d8bc7c8601 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-reduc-sad.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-sad.c
@@ -51,5 +51,4 @@ main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_sad_pattern: detected" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c
index 7432fe76f5a..f2687ba7cbc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-btrunc.c
@@ -14,4 +14,3 @@ foo (double *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_btrunc } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c
index 0835e1b0f97..e5d307641a3 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-btruncf.c
@@ -14,4 +14,3 @@ foo (float *output, float *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_btruncf } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c
index a430690f558..f5fce164f7e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-ceil.c
@@ -14,4 +14,3 @@ foo (double *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_ceil } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c
index 4d00924d30a..9c731a1ade2 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-ceilf.c
@@ -14,4 +14,3 @@ foo (float *output, float *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_ceilf } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c
index 8f1c9ecc485..4ed3be760e7 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-floor.c
@@ -14,4 +14,3 @@ foo (double *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_floor } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c
index a68c2ec0a9f..d66bb01ab3a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-floorf.c
@@ -14,4 +14,3 @@ foo (float *output, float *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_floorf } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c
index b4ed236e418..8b8daa3b5e6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-lceil.c
@@ -14,4 +14,3 @@ foo (long *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_lceil } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c
index 5a366318387..84fda19ae5a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-lfloor.c
@@ -14,4 +14,3 @@ foo (long *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_lfloor } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c
index 572dbd3b68f..9c2847188c6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyint.c
@@ -14,4 +14,3 @@ foo (double *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_nearbyint } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c
index 73ca7deb059..9f01dde34d0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-nearbyintf.c
@@ -14,4 +14,3 @@ foo (float *output, float *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_nearbyintf } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-round.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-round.c
index c298bbbfcd1..017a0e4c5c4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-round.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-round.c
@@ -14,4 +14,3 @@ foo (double *output, double *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_round } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c b/gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c
index 362b9d655dc..2f3f35caa43 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-rounding-roundf.c
@@ -14,4 +14,3 @@ foo (float *output, float *input)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_call_roundf } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-sdivmod-1.c b/gcc/testsuite/gcc.dg/vect/vect-sdivmod-1.c
index c18204ea354..dfd8ebace56 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-sdivmod-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-sdivmod-1.c
@@ -95,4 +95,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 4 "vect" { target vect_condition } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-1.c b/gcc/testsuite/gcc.dg/vect/vect-shift-1.c
index 79699047eda..0c3086b1d68 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-1.c
@@ -29,4 +29,3 @@ int main ()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
index 0e1acfb7beb..46909ca7ecd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-2-big-array.c
@@ -187,4 +187,3 @@ int main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-2.c b/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
index 83211eba49f..68186dbbf3e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-2.c
@@ -187,4 +187,3 @@ int main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-3.c b/gcc/testsuite/gcc.dg/vect/vect-shift-3.c
index 78ed935ae59..a1b4b075229 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-3.c
@@ -34,4 +34,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-shift-4.c b/gcc/testsuite/gcc.dg/vect/vect-shift-4.c
index e705feadde0..09f6e5a9584 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-shift-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-shift-4.c
@@ -34,4 +34,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-1.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-1.c
index 9fdd0563889..50429049500 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-1.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-1.c
@@ -56,4 +56,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
index 923a9453c25..03acd375e08 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c
@@ -81,4 +81,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10a.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10a.c
index c49473df112..771b38ef1a0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10a.c
@@ -16,4 +16,3 @@ bar (int a, int b, long int c)
   return a + b + c;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-11.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-11.c
index a04530e251e..29acde22f17 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-11.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-11.c
@@ -64,4 +64,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
index 279abd7c682..c44471e35bc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c
@@ -5,4 +5,3 @@
 
 #include "vect-simd-clone-10.c"
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12a.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12a.c
index c76508f9ac4..1c8fd1aecc9 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12a.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12a.c
@@ -16,4 +16,3 @@ bar (int a, int b, long int c)
   return a + b + c;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-13.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-13.c
index c5066c0f92b..9fe1eb46557 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-13.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-13.c
@@ -4,4 +4,3 @@
 
 #include "vect-simd-clone-6.c"
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-14.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-14.c
index 59cd9524f02..5d49f956e9c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-14.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-14.c
@@ -4,4 +4,3 @@
 
 #include "vect-simd-clone-11.c"
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-2.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-2.c
index 0eae49db97a..f89c73a961b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-2.c
@@ -50,4 +50,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-3.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-3.c
index 857c6f783e3..75ce696ed66 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-3.c
@@ -43,4 +43,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-4.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-4.c
index c64f1b0bfe5..debbe77b79d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-4.c
@@ -46,4 +46,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-5.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-5.c
index 1d2b067a7d5..6a098d9a51a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-5.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-5.c
@@ -41,4 +41,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-6.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-6.c
index 26995da86e3..6143a91eaf0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-6.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-6.c
@@ -72,4 +72,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-7.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-7.c
index 2745c5e41d1..a0316e9e581 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-7.c
@@ -72,4 +72,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-8.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-8.c
index e0b09b645d4..1bfd19dc8ab 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-8.c
@@ -92,4 +92,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-9.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-9.c
index 0c5ff4fa438..a968b9ce91a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-9.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-9.c
@@ -92,4 +92,3 @@ main ()
   return 0;
 }
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-mult.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-mult.c
index 8bc2c48dbce..e7a006a8320 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-mult.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-mult.c
@@ -74,5 +74,4 @@ int main (void)
 }   
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i2.c
index dca34ef1f29..f1ce49f4725 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i2.c
@@ -58,5 +58,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i4.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i4.c
index 68114a68249..af33ed4abcd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-i4.c
@@ -71,5 +71,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-mult.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-mult.c
index 0b21522498f..5f71bed3f5c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-mult.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u16-mult.c
@@ -65,5 +65,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u32-mult.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u32-mult.c
index 4e742b20180..62a8a51e203 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u32-mult.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u32-mult.c
@@ -62,5 +62,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i2-gap.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i2-gap.c
index 22030b06ba8..bb983b19dda 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i2-gap.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i2-gap.c
@@ -72,5 +72,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2-big-array.c
index ca8bd12825c..dd144fefc5c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2-big-array.c
@@ -90,5 +90,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2.c
index b1ce8052a38..42ed2b7193a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap2.c
@@ -79,5 +79,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7-big-array.c
index 188e2882385..138cb3f6454 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7-big-array.c
@@ -99,5 +99,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7.c b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7.c
index 87e6ce22e64..716d7a59541 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-a-u8-i8-gap7.c
@@ -84,5 +84,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-float.c b/gcc/testsuite/gcc.dg/vect/vect-strided-float.c
index 302be5f578b..6d6bfae7bc5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-float.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-float.c
@@ -41,5 +41,4 @@ int main (void)
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided2 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { xfail vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-mult-char-ls.c b/gcc/testsuite/gcc.dg/vect/vect-strided-mult-char-ls.c
index cc877293cea..36735963e30 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-mult-char-ls.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-mult-char-ls.c
@@ -74,5 +74,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-mult.c b/gcc/testsuite/gcc.dg/vect/vect-strided-mult.c
index 3d2de09cbb0..21477f34686 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-mult.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-mult.c
@@ -74,5 +74,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-same-dr.c b/gcc/testsuite/gcc.dg/vect/vect-strided-same-dr.c
index 9768d72636a..b8bb8784b74 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-same-dr.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-same-dr.c
@@ -75,4 +75,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-store-a-u8-i2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-store-a-u8-i2.c
index 26311a8bc80..17169bda602 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-store-a-u8-i2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-store-a-u8-i2.c
@@ -56,5 +56,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target { vect_interleave || vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-store-u16-i4.c b/gcc/testsuite/gcc.dg/vect/vect-strided-store-u16-i4.c
index 19af351e6cf..9d1ad579e6a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-store-u16-i4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-store-u16-i4.c
@@ -67,6 +67,5 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect"  { target { { vect_interleave || vect_strided4 } && vect_pack_trunc } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target { { ! { vect_interleave || vect_strided4 } } && { vect_pack_trunc } } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-store-u32-i2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-store-u32-i2.c
index 3be94f10c8a..a081d4e396e 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-store-u32-i2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-store-u32-i2.c
@@ -41,5 +41,4 @@ int main (void)
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_interleave || vect_strided2 } } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" { xfail { vect_interleave || vect_strided2 } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-store.c b/gcc/testsuite/gcc.dg/vect/vect-strided-store.c
index 5014bc7cfcd..e8303b63bd4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-store.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-store.c
@@ -33,4 +33,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i2.c
index 57006846ff2..5bc23697372 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i2.c
@@ -58,5 +58,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i3.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i3.c
index e423148407d..63a4da797cb 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i3.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i3.c
@@ -109,4 +109,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 4 loops" 1 "vect"  { target vect_strided3 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i4.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i4.c
index 2e6fb02b817..90e58166669 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u16-i4.c
@@ -71,5 +71,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i4.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i4.c
index 4c2048820a1..4ddded37851 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i4.c
@@ -66,5 +66,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided4 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i8.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i8.c
index 4dbd8d9ab3c..4c2e30acb7f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-i8.c
@@ -80,5 +80,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-mult.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-mult.c
index d825898a469..cddd0c88f42 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u32-mult.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u32-mult.c
@@ -61,5 +61,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2-gap.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2-gap.c
index b83d54e2e37..fcbf2cc8c9f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2-gap.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2-gap.c
@@ -74,5 +74,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2.c
index 962ba51bd5f..55eddf5e9fd 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i2.c
@@ -57,5 +57,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
    
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2-big-array.c
index 473f560511a..3dd5c0610de 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2-big-array.c
@@ -93,5 +93,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2.c
index 4037572d970..dddce8543d8 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap2.c
@@ -81,5 +81,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-big-array.c
index da4b484b1ae..450784b92cc 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-big-array.c
@@ -114,5 +114,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-unknown.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-unknown.c
index 07e1a803f7c..fde3c78195d 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-unknown.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4-unknown.c
@@ -114,5 +114,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4.c
index 00796670480..6face14feb5 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap4.c
@@ -101,5 +101,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7-big-array.c
index 9697aaa8b6f..d16059fbc0a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7-big-array.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7-big-array.c
@@ -103,5 +103,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7.c
index 854a4aaabb8..dfd71b93b5f 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8-gap7.c
@@ -86,5 +86,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8.c b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8.c
index 37a0954001e..6cc3bde1509 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-strided-u8-i8.c
@@ -88,5 +88,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided8 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
   
diff --git a/gcc/testsuite/gcc.dg/vect/vect-vfa-01.c b/gcc/testsuite/gcc.dg/vect/vect-vfa-01.c
index 4ae967a19c6..ea35835465c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-vfa-01.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-vfa-01.c
@@ -36,4 +36,3 @@ main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-vfa-02.c b/gcc/testsuite/gcc.dg/vect/vect-vfa-02.c
index 13ab54a98ee..df6b999c5a4 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-vfa-02.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-vfa-02.c
@@ -44,4 +44,3 @@ main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-vfa-03.c b/gcc/testsuite/gcc.dg/vect/vect-vfa-03.c
index 2c06ce6b0ae..36861a059e0 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-vfa-03.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-vfa-03.c
@@ -55,4 +55,3 @@ main (void)
 /* Needs interleaving support.  */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_strided2 } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { xfail  vect_strided2 } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-vfa-04.c b/gcc/testsuite/gcc.dg/vect/vect-vfa-04.c
index bbe2996afc0..bfbb48b21ee 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-vfa-04.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-vfa-04.c
@@ -35,4 +35,3 @@ main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-vfa-slp.c b/gcc/testsuite/gcc.dg/vect/vect-vfa-slp.c
index f53985d3c3e..d775f320e0c 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-vfa-slp.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-vfa-slp.c
@@ -53,4 +53,3 @@ main (void)
 } 
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-s16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-s16.c
index 895bbd0276d..377dcb0896b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-s16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-s16.c
@@ -57,5 +57,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-u16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-u16.c
index f69abfd0cb9..9ab677a3f6a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-u16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-const-u16.c
@@ -74,4 +74,3 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 3 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c
index 3f0758544ed..298b7411aad 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half-u8.c
@@ -56,5 +56,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 2 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c
index 3fb162de79a..1c6e34445e6 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-half.c
@@ -45,5 +45,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s16.c
index 983d7e70c79..91a8a290263 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s16.c
@@ -42,5 +42,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s8.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s8.c
index 7a4c3c0089e..7e1f7457f10 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-s8.c
@@ -42,5 +42,4 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_qi_to_hi } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c
index 2898918306c..fc4b1118f08 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-sum.c
@@ -44,4 +44,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_mult_hi_to_si } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c
index 71faa11adb7..942f63d6f31 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u16.c
@@ -44,5 +44,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-s16-s32.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-s16-s32.c
index ae485499971..98f78d3b37a 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-s16-s32.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-s16-s32.c
@@ -44,5 +44,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_hi_to_si || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 1 "vect" { target vect_widen_mult_hi_to_si_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-u32.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-u32.c
index adc578ad503..4d20f1606af 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-u32.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8-u32.c
@@ -44,5 +44,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target vect_widen_mult_qi_to_hi_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 1 "vect" { target vect_widen_mult_qi_to_hi_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c
index ef8030215b8..620e115e639 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-mult-u8.c
@@ -44,5 +44,4 @@ int main (void)
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi || vect_unpack } } } } */
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target vect_widen_mult_qi_to_hi_pattern } } } */
 /* { dg-final { scan-tree-dump-times "pattern recognized" 1 "vect" { target vect_widen_mult_qi_to_hi_pattern } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s16.c
index efee6043707..5f6c047849b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s16.c
@@ -103,5 +103,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_shift_pattern: detected" 8 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s8.c b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s8.c
index e829a799568..46512f2c69b 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-s8.c
@@ -54,5 +54,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_shift_pattern: detected" 1 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u16.c b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u16.c
index 75834d481cb..212b5dbea18 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u16.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u16.c
@@ -54,5 +54,4 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_shift_pattern: detected" 1 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
 
diff --git a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u8.c b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u8.c
index 49d5a88a663..844e5df3269 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u8.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-widen-shift-u8.c
@@ -61,4 +61,3 @@ int main (void)
 
 /* { dg-final { scan-tree-dump-times "vect_recog_widen_shift_pattern: detected" 2 "vect" { target vect_widen_shift } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c b/gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c
index ee7c0b5e7c6..c4d2de1a64e 100644
--- a/gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c
+++ b/gcc/testsuite/gcc.dg/vect/wrapv-vect-7.c
@@ -50,4 +50,3 @@ int main (void)
 /* Fails for 32-bit targets that don't vectorize PLUS.  */
 /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
 /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c
index 4b04a9d41c3..6b3cd09e116 100644
--- a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c
+++ b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2char.c
@@ -48,4 +48,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c
index 0468b1966b9..0a4df48abb3 100644
--- a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c
+++ b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-2short.c
@@ -47,4 +47,3 @@ int main (void)
 }
 
 /* { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" { xfail vect_no_int_max } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c
index 68caa8bd1dd..176f183f3ce 100644
--- a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c
+++ b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c
@@ -54,4 +54,3 @@ dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_sdot
 /* In the meantime expect: */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_widen_mult_qi_to_hi || vect_unpack } } } } */
 
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-pattern-2c.c b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-pattern-2c.c
index 7611c353c0a..e3c33cff7e1 100644
--- a/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-pattern-2c.c
+++ b/gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-pattern-2c.c
@@ -38,4 +38,3 @@ main (void)
 /* { dg-final { scan-tree-dump "vect_recog_widen_sum_pattern: detected" "vect" } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target vect_widen_sum_qi_to_hi } } } */
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" { target { ! vect_widen_sum_qi_to_hi } } } } */
-/* { dg-final { cleanup-tree-dump "vect" } } */
diff --git a/gcc/testsuite/gcc.dg/vector-shift-2.c b/gcc/testsuite/gcc.dg/vector-shift-2.c
index 380f2dfb307..8e37d9dbb0c 100644
--- a/gcc/testsuite/gcc.dg/vector-shift-2.c
+++ b/gcc/testsuite/gcc.dg/vector-shift-2.c
@@ -10,4 +10,3 @@ f (vec *a)
 }
 
 /* { dg-final { scan-tree-dump "<< 5" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/gcc.dg/vector-shift.c b/gcc/testsuite/gcc.dg/vector-shift.c
index 2a4d415c5ff..f71a1d75db5 100644
--- a/gcc/testsuite/gcc.dg/vector-shift.c
+++ b/gcc/testsuite/gcc.dg/vector-shift.c
@@ -10,4 +10,3 @@ f (vec *x)
 }
 
 /* { dg-final { scan-tree-dump "<< 7" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/gcc.dg/volatile2.c b/gcc/testsuite/gcc.dg/volatile2.c
index d663123c83d..07f27947e51 100644
--- a/gcc/testsuite/gcc.dg/volatile2.c
+++ b/gcc/testsuite/gcc.dg/volatile2.c
@@ -19,4 +19,3 @@ void foo(struct GTeth_softc *sc)
 }
 
 /* { dg-final { scan-tree-dump "{v}" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/volatile3.c b/gcc/testsuite/gcc.dg/volatile3.c
index 4a5893d97cb..37394dd2e77 100644
--- a/gcc/testsuite/gcc.dg/volatile3.c
+++ b/gcc/testsuite/gcc.dg/volatile3.c
@@ -10,4 +10,3 @@ void foo(int i)
 }
 
 /* { dg-final { scan-tree-dump-not "{v}" "ssa" } } */
-/* { dg-final { cleanup-tree-dump "ssa" } } */
diff --git a/gcc/testsuite/gcc.dg/wmul-1.c b/gcc/testsuite/gcc.dg/wmul-1.c
index 3e762f4c18c..468a58db946 100644
--- a/gcc/testsuite/gcc.dg/wmul-1.c
+++ b/gcc/testsuite/gcc.dg/wmul-1.c
@@ -16,4 +16,3 @@ foo (ArrT Arr, int Idx)
 }
 
 /* { dg-final { scan-tree-dump-not "WIDEN_MULT_PLUS_EXPR" "widening_mul" } } */
-/* { dg-final { cleanup-tree-dump "widening_mul" } } */
author	Bernhard Reutner-Fischer <aldot@gcc.gnu.org>	2015-05-29 10:20:29 +0200
committer	Bernhard Reutner-Fischer <aldot@gcc.gnu.org>	2015-05-29 10:20:29 +0200
commit	c469078de7c017978bda033baff3e991987b5509 (patch)
tree	531d2e5e2630db6b51e375651cdb7371e09faa9e /gcc/testsuite/gcc.dg
parent	90bb09c4f70b65c0cf4725f4eb1920a35f70d654 (diff)
download	gcc-c469078de7c017978bda033baff3e991987b5509.tar.gz