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

68 files changed, 0 insertions, 69 deletions

diff --git a/gcc/testsuite/c-c++-common/asan/aggressive-opts.c b/gcc/testsuite/c-c++-common/asan/aggressive-opts.c
index 979b611..294b7fc 100644
--- a/gcc/testsuite/c-c++-common/asan/aggressive-opts.c
+++ b/gcc/testsuite/c-c++-common/asan/aggressive-opts.c
@@ -25,4 +25,3 @@ Perl_do_sv_dump()
 }
 
 /* { dg-final { scan-tree-dump-times "ASAN_CHECK" 2 "asan1" } } */
-/* { dg-final { cleanup-tree-dump "asan1" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/inc.c b/gcc/testsuite/c-c++-common/asan/inc.c
index 36cc3d8..5abf373 100644
--- a/gcc/testsuite/c-c++-common/asan/inc.c
+++ b/gcc/testsuite/c-c++-common/asan/inc.c
@@ -18,4 +18,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "ASAN_" 1 "asan0" } }  */
 /* { dg-final { scan-tree-dump "ASAN_CHECK \\(.*, 4\\);" "asan0" } }  */
-/* { dg-final { cleanup-tree-dump "asan0" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-asan-check-glob.c b/gcc/testsuite/c-c++-common/asan/no-asan-check-glob.c
index 02ca646..c0505e3 100644
--- a/gcc/testsuite/c-c++-common/asan/no-asan-check-glob.c
+++ b/gcc/testsuite/c-c++-common/asan/no-asan-check-glob.c
@@ -10,4 +10,3 @@ int foo ()
 }
 
 /* { dg-final { scan-tree-dump-times "ASAN_CHECK" 0 "asan1" } } */
-/* { dg-final { cleanup-tree-dump "asan1" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-1.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-1.c
index baacb1e..a9b5160 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-1.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-1.c
@@ -57,4 +57,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store1" 3 "sanopt" } } */
 /* { dg-final { scan-tree-dump-not "__builtin___asan_report_load1" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-10.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-10.c
index 24dfcfe..84d469d 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-10.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-10.c
@@ -15,4 +15,3 @@ foo ()
 }
 
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store4" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-11.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-11.c
index 4082f32..8303430 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-11.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-11.c
@@ -17,4 +17,3 @@ foo ()
 
 /* { dg-final { scan-tree-dump-not "& 7" "sanopt" } } */
 /* { dg-final { scan-tree-dump-not "__builtin___asan_report_store" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-12.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-12.c
index 65e1d96..cf216be 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-12.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-12.c
@@ -13,4 +13,3 @@ foo (char *p)
 }
 
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store1" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-13.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-13.c
index c04be06..63a299e 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-13.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-13.c
@@ -12,4 +12,3 @@ foo (char *p)
 }
 
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store1" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-14.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-14.c
index fadce90..0750f1b 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-14.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-14.c
@@ -12,4 +12,3 @@ foo (char *p)
 }
 
 /* { dg-final { scan-tree-dump-not "__builtin___asan_report_store1" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-15.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-15.c
index 00676da..ad6a0bb 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-15.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-15.c
@@ -13,4 +13,3 @@ foo (char *p)
 }
 
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store1" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-3.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-3.c
index 5193ae0..6432236 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-3.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-3.c
@@ -15,4 +15,3 @@ foo (__INT32_TYPE__ *p)
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report" 2 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load1" 1 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_store" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-4.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-4.c
index a613b92..d24d1c2 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-4.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-4.c
@@ -14,4 +14,3 @@ foo  (int *a, char *b, char *c)
 /* { dg-final { scan-tree-dump-times "& 7" 2 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load1" 1 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load4" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-5.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-5.c
index f4ca603..15418ba 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-5.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-5.c
@@ -13,4 +13,3 @@ foo  (int *a, char *b, char *c)
 
 /* { dg-final { scan-tree-dump-times "& 7" 1 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load4" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-6.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-6.c
index 757f0ee..0ea1fab 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-6.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-6.c
@@ -16,4 +16,3 @@ foo  (int *a, char *b, char *c)
 /* { dg-final { scan-tree-dump-times "& 7" 4 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load1" 2 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load4" 2 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-7.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-7.c
index 0c50145..6fb88f8 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-7.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-7.c
@@ -20,4 +20,3 @@ foo  (int *a, char *b, char *c)
 
 /* { dg-final { scan-tree-dump-not "& 7" "sanopt" } } */
 /* { dg-final { scan-tree-dump-not "__builtin___asan_report_load4" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-8.c b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-8.c
index 4eeedce..556aa1e 100644
--- a/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-8.c
+++ b/gcc/testsuite/c-c++-common/asan/no-redundant-instrumentation-8.c
@@ -17,4 +17,3 @@ foo  (int *a, char *b, char *c)
 /* { dg-final { scan-tree-dump-times "& 7" 4 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load1" 2 "sanopt" } } */
 /* { dg-final { scan-tree-dump-times "__builtin___asan_report_load4" 2 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/red-align-1.c b/gcc/testsuite/c-c++-common/asan/red-align-1.c
index afd7467..1b44524 100644
--- a/gcc/testsuite/c-c++-common/asan/red-align-1.c
+++ b/gcc/testsuite/c-c++-common/asan/red-align-1.c
@@ -17,4 +17,3 @@ int foo (struct st * s_p)
 }
 
 /* { dg-final { scan-tree-dump-times "& 7" 0 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/red-align-2.c b/gcc/testsuite/c-c++-common/asan/red-align-2.c
index d30b1ad..e0f00c5 100644
--- a/gcc/testsuite/c-c++-common/asan/red-align-2.c
+++ b/gcc/testsuite/c-c++-common/asan/red-align-2.c
@@ -17,4 +17,3 @@ int foo (struct st * s_p)
 }
 
 /* { dg-final { scan-tree-dump-times "& 7" 1 "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/shadow-offset-1.c b/gcc/testsuite/c-c++-common/asan/shadow-offset-1.c
index 2ca0fd6..d868fd0 100644
--- a/gcc/testsuite/c-c++-common/asan/shadow-offset-1.c
+++ b/gcc/testsuite/c-c++-common/asan/shadow-offset-1.c
@@ -8,4 +8,3 @@ int f (int *p)
 }
 
 /* { dg-final { scan-tree-dump "12345" "sanopt" }  } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-1.c b/gcc/testsuite/c-c++-common/asan/user-section-1.c
index 51e2b99..7bcc4bc 100644
--- a/gcc/testsuite/c-c++-common/asan/user-section-1.c
+++ b/gcc/testsuite/c-c++-common/asan/user-section-1.c
@@ -7,5 +7,4 @@ int y __attribute__((section(".yyy"))) = 1;
 int z __attribute__((section(".zzz"))) = 1;
 
 /* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 2\\);" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
 
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-2.c b/gcc/testsuite/c-c++-common/asan/user-section-2.c
index f602116..0c035c3 100644
--- a/gcc/testsuite/c-c++-common/asan/user-section-2.c
+++ b/gcc/testsuite/c-c++-common/asan/user-section-2.c
@@ -7,5 +7,4 @@ int y __attribute__((section(".x2"))) = 1;
 int z __attribute__((section(".x3"))) = 1;
 
 /* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 3\\);" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
 
diff --git a/gcc/testsuite/c-c++-common/asan/user-section-3.c b/gcc/testsuite/c-c++-common/asan/user-section-3.c
index 66e5f9a..3e32591 100644
--- a/gcc/testsuite/c-c++-common/asan/user-section-3.c
+++ b/gcc/testsuite/c-c++-common/asan/user-section-3.c
@@ -7,5 +7,4 @@ int y __attribute__((section(".x2"))) = 1;
 int z __attribute__((section(".y1"))) = 1;
 
 /* { dg-final { scan-tree-dump "__builtin___asan_unregister_globals \\(.*, 1\\);" "sanopt" } } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
 
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/PS/clauses2.c b/gcc/testsuite/c-c++-common/cilk-plus/PS/clauses2.c
index 71589c2..0f7b500 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/PS/clauses2.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/PS/clauses2.c
@@ -15,4 +15,3 @@ void foo()
 /* { dg-final { scan-tree-dump-times "linear\\(j:4\\)" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "linear\\(k:1\\)" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "safelen\\(4\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/PS/safelen.c b/gcc/testsuite/c-c++-common/cilk-plus/PS/safelen.c
index 2c59de9..5af2909 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/PS/safelen.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/PS/safelen.c
@@ -11,4 +11,3 @@ void foo()
 }
 
 /* { dg-final { scan-tree-dump-times "safelen\\(8\\)" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c
index 9cef5a5..d219a85 100644
--- a/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.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/c-c++-common/cpp/pr63831-2.c b/gcc/testsuite/c-c++-common/cpp/pr63831-2.c
index cc87d1d..2479ce8 100644
--- a/gcc/testsuite/c-c++-common/cpp/pr63831-2.c
+++ b/gcc/testsuite/c-c++-common/cpp/pr63831-2.c
@@ -4,4 +4,3 @@
 
 #include "pr63831-1.c"
 
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/c-c++-common/fold-bitand-4.c b/gcc/testsuite/c-c++-common/fold-bitand-4.c
index a5d3168b..1b9c3885 100644
--- a/gcc/testsuite/c-c++-common/fold-bitand-4.c
+++ b/gcc/testsuite/c-c++-common/fold-bitand-4.c
@@ -42,4 +42,3 @@ int f5 (int i)
 /* { dg-final { scan-tree-dump-times "\& 15" 1 "original" } } */
 /* { dg-final { scan-tree-dump-times "return \[^\n0-9\]*0;" 2 "original" } } */
 /* { dg-final { scan-tree-dump-times "\& 7" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/fold-divmul-1.c b/gcc/testsuite/c-c++-common/fold-divmul-1.c
index 5c86792..0196114 100644
--- a/gcc/testsuite/c-c++-common/fold-divmul-1.c
+++ b/gcc/testsuite/c-c++-common/fold-divmul-1.c
@@ -8,4 +8,3 @@ fx (int *b, int *e)
 }
 
 /* { dg-final { scan-tree-dump-not "/\\\[ex\\\]" "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
index ea31047..59c72f7 100644
--- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
+++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2-off.c
@@ -22,4 +22,3 @@ f (void)
 /* Without -fopenacc, we're expecting one call.
    { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 1 "expand" } } */
 
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
index 2f4ee2b..8db0a66 100644
--- a/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
+++ b/gcc/testsuite/c-c++-common/goacc/acc_on_device-2.c
@@ -26,4 +26,3 @@ f (void)
    <openacc.h>.
    { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail c++ } } } */
 
-/* { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/loop-private-1.c b/gcc/testsuite/c-c++-common/goacc/loop-private-1.c
index a54edb2..38a4a7d 100644
--- a/gcc/testsuite/c-c++-common/goacc/loop-private-1.c
+++ b/gcc/testsuite/c-c++-common/goacc/loop-private-1.c
@@ -11,4 +11,3 @@ f (int i, int j)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc loop collapse\\(2\\) private\\(j\\) private\\(i\\)" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/pcopy.c b/gcc/testsuite/c-c++-common/goacc/pcopy.c
index fd16525..02c4383 100644
--- a/gcc/testsuite/c-c++-common/goacc/pcopy.c
+++ b/gcc/testsuite/c-c++-common/goacc/pcopy.c
@@ -8,4 +8,3 @@ f (char *cp)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(tofrom:\\*\\(cp \\+ 3\\) \\\[len: 5]\\) map\\(alloc:cp \\\[pointer assign, bias: 3]\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/pcopyin.c b/gcc/testsuite/c-c++-common/goacc/pcopyin.c
index c009d24..10911fc 100644
--- a/gcc/testsuite/c-c++-common/goacc/pcopyin.c
+++ b/gcc/testsuite/c-c++-common/goacc/pcopyin.c
@@ -8,4 +8,3 @@ f (char *cp)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(to:\\*\\(cp \\+ 4\\) \\\[len: 6]\\) map\\(alloc:cp \\\[pointer assign, bias: 4]\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/pcopyout.c b/gcc/testsuite/c-c++-common/goacc/pcopyout.c
index 6099eff..703ac2f 100644
--- a/gcc/testsuite/c-c++-common/goacc/pcopyout.c
+++ b/gcc/testsuite/c-c++-common/goacc/pcopyout.c
@@ -8,4 +8,3 @@ f (char *cp)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(from:\\*\\(cp \\+ 5\\) \\\[len: 7]\\) map\\(alloc:cp \\\[pointer assign, bias: 5]\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/pcreate.c b/gcc/testsuite/c-c++-common/goacc/pcreate.c
index 2f6e836e6..00bf155 100644
--- a/gcc/testsuite/c-c++-common/goacc/pcreate.c
+++ b/gcc/testsuite/c-c++-common/goacc/pcreate.c
@@ -8,4 +8,3 @@ f (char *cp)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(alloc:\\*\\(cp \\+ 6\\) \\\[len: 8]\\) map\\(alloc:cp \\\[pointer assign, bias: 6]\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/goacc/present-1.c b/gcc/testsuite/c-c++-common/goacc/present-1.c
index 03ee592..7537948 100644
--- a/gcc/testsuite/c-c++-common/goacc/present-1.c
+++ b/gcc/testsuite/c-c++-common/goacc/present-1.c
@@ -8,4 +8,3 @@ f (char *cp)
 }
 
 /* { dg-final { scan-tree-dump-times "#pragma acc parallel map\\(force_present:\\*\\(cp \\+ 7\\) \\\[len: 9]\\) map\\(alloc:cp \\\[pointer assign, bias: 7]\\)" 1 "original" } } */
-/* { dg-final { cleanup-tree-dump "original" } } */
diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-10.c b/gcc/testsuite/c-c++-common/gomp/atomic-10.c
index 21d035e..6a2542e 100644
--- a/gcc/testsuite/c-c++-common/gomp/atomic-10.c
+++ b/gcc/testsuite/c-c++-common/gomp/atomic-10.c
@@ -22,4 +22,3 @@ foo (void)
 }
 
 /* { dg-final { scan-tree-dump-times "__atomic_fetch_add" 4 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-12.c b/gcc/testsuite/c-c++-common/gomp/atomic-12.c
index 618c4c8..145e420 100644
--- a/gcc/testsuite/c-c++-common/gomp/atomic-12.c
+++ b/gcc/testsuite/c-c++-common/gomp/atomic-12.c
@@ -4,7 +4,6 @@
 /* atomicvar should never be referenced in between the barrier and
    following #pragma omp atomic_load.  */
 /* { dg-final { scan-tree-dump-not "barrier\[^#\]*atomicvar" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
 #ifdef __cplusplus
 bool atomicvar, c;
diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-13.c b/gcc/testsuite/c-c++-common/gomp/atomic-13.c
index 0146825..2452035 100644
--- a/gcc/testsuite/c-c++-common/gomp/atomic-13.c
+++ b/gcc/testsuite/c-c++-common/gomp/atomic-13.c
@@ -4,6 +4,5 @@
 /* atomicvar should never be referenced in between the barrier and
    following #pragma omp atomic_load.  */
 /* { dg-final { scan-tree-dump-not "barrier\[^#\]*atomicvar" "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
 
 #include "atomic-12.c"
diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-3.c b/gcc/testsuite/c-c++-common/gomp/atomic-3.c
index 5b9e60c..37fff73 100644
--- a/gcc/testsuite/c-c++-common/gomp/atomic-3.c
+++ b/gcc/testsuite/c-c++-common/gomp/atomic-3.c
@@ -11,4 +11,3 @@ void f1(void)
 }
 
 /* { dg-final { scan-tree-dump-times "xyzzy, 4" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/c-c++-common/gomp/atomic-9.c b/gcc/testsuite/c-c++-common/gomp/atomic-9.c
index ff5cb40..c07da8f 100644
--- a/gcc/testsuite/c-c++-common/gomp/atomic-9.c
+++ b/gcc/testsuite/c-c++-common/gomp/atomic-9.c
@@ -11,4 +11,3 @@ void f1(void)
 }
 
 /* { dg-final { scan-tree-dump-times "__atomic_fetch_add" 1 "ompexp" } } */
-/* { dg-final { cleanup-tree-dump "ompexp" } } */
diff --git a/gcc/testsuite/c-c++-common/pr46562-2.c b/gcc/testsuite/c-c++-common/pr46562-2.c
index e64432c..3c64404 100644
--- a/gcc/testsuite/c-c++-common/pr46562-2.c
+++ b/gcc/testsuite/c-c++-common/pr46562-2.c
@@ -10,4 +10,3 @@ int foo(void)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "fre1" } } */
-/* { dg-final { cleanup-tree-dump "fre1" } } */
diff --git a/gcc/testsuite/c-c++-common/pr46562.c b/gcc/testsuite/c-c++-common/pr46562.c
index 3065907..c6b8574 100644
--- a/gcc/testsuite/c-c++-common/pr46562.c
+++ b/gcc/testsuite/c-c++-common/pr46562.c
@@ -10,4 +10,3 @@ int foo(void)
 }
 
 /* { dg-final { scan-tree-dump "return 0;" "ccp1" } } */
-/* { dg-final { cleanup-tree-dump "ccp1" } } */
diff --git a/gcc/testsuite/c-c++-common/pr56493.c b/gcc/testsuite/c-c++-common/pr56493.c
index 4181260..aa7f6f4 100644
--- a/gcc/testsuite/c-c++-common/pr56493.c
+++ b/gcc/testsuite/c-c++-common/pr56493.c
@@ -13,4 +13,3 @@ foo (void)
 
 /* Verify we narrow the addition from unsigned long long to unsigned int type.  */
 /* { dg-final { scan-tree-dump "  (\[a-zA-Z._0-9]*) = \\(unsigned int\\) \[^;\n\r]*;.*  (\[a-zA-Z._0-9]*) = \\(unsigned int\\) \[^;\n\r]*;.* = \\1 \\+ \\2;" "gimple" { target { ilp32 || lp64 } } } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc/testsuite/c-c++-common/raw-string-11.c b/gcc/testsuite/c-c++-common/raw-string-11.c
index 49ceba2..19210c5 100644
--- a/gcc/testsuite/c-c++-common/raw-string-11.c
+++ b/gcc/testsuite/c-c++-common/raw-string-11.c
@@ -10,4 +10,3 @@ int main ()
 			   sizeof ("foo%sbar%sfred%sbob?""?""?""?""?"));
 }
 
-// { dg-final { cleanup-saved-temps } }
diff --git a/gcc/testsuite/c-c++-common/raw-string-18.c b/gcc/testsuite/c-c++-common/raw-string-18.c
index 01dd339..6709946 100644
--- a/gcc/testsuite/c-c++-common/raw-string-18.c
+++ b/gcc/testsuite/c-c++-common/raw-string-18.c
@@ -18,4 +18,3 @@ main ()
 
 /* Verify call to foo is on line 15.  */
 /* { dg-final { scan-tree-dump "c:15:\[^\n\r\]*foo" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/raw-string-19.c b/gcc/testsuite/c-c++-common/raw-string-19.c
index abbecfb..7ab9e6c 100644
--- a/gcc/testsuite/c-c++-common/raw-string-19.c
+++ b/gcc/testsuite/c-c++-common/raw-string-19.c
@@ -18,5 +18,3 @@ main ()
 
 /* Verify call to foo is on line 15.  */
 /* { dg-final { scan-tree-dump "c:15:\[^\n\r\]*foo" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
-/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/c-c++-common/restrict-1.c b/gcc/testsuite/c-c++-common/restrict-1.c
index 08fc10f..15b9daf 100644
--- a/gcc/testsuite/c-c++-common/restrict-1.c
+++ b/gcc/testsuite/c-c++-common/restrict-1.c
@@ -17,4 +17,3 @@ int main()
 }
 
 /* { dg-final { scan-tree-dump-not "link_error" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/restrict-2.c b/gcc/testsuite/c-c++-common/restrict-2.c
index 3f71b77..5e8bca7 100644
--- a/gcc/testsuite/c-c++-common/restrict-2.c
+++ b/gcc/testsuite/c-c++-common/restrict-2.c
@@ -11,4 +11,3 @@ void foo (float * __restrict__ a, float * __restrict__ b, int n, int j)
 /* We should move the RHS of the store out of the loop.  */
 
 /* { dg-final { scan-tree-dump-times "Moving statement" 11 "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/c-c++-common/restrict-4.c b/gcc/testsuite/c-c++-common/restrict-4.c
index 3a36def..cea6cd8 100644
--- a/gcc/testsuite/c-c++-common/restrict-4.c
+++ b/gcc/testsuite/c-c++-common/restrict-4.c
@@ -16,4 +16,3 @@ void bar(struct Foo f, int * __restrict__ q)
 }
 
 /* { dg-final { scan-tree-dump "Executing store motion" "lim1" } } */
-/* { dg-final { cleanup-tree-dump "lim1" } } */
diff --git a/gcc/testsuite/c-c++-common/rotate-1.c b/gcc/testsuite/c-c++-common/rotate-1.c
index bca9dd8..0777c6b 100644
--- a/gcc/testsuite/c-c++-common/rotate-1.c
+++ b/gcc/testsuite/c-c++-common/rotate-1.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fno-ipa-icf -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-times "r\[<>]\[<>]" 96 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 unsigned int
 f1 (unsigned int x, unsigned int y)
diff --git a/gcc/testsuite/c-c++-common/rotate-2.c b/gcc/testsuite/c-c++-common/rotate-2.c
index 4ffa218..c8359cd 100644
--- a/gcc/testsuite/c-c++-common/rotate-2.c
+++ b/gcc/testsuite/c-c++-common/rotate-2.c
@@ -4,7 +4,6 @@
 /* Rotates should be recognized only in functions with | instead of + or ^,
    or in functions that have constant shift counts (unused attribute on y).  */
 /* { dg-final { scan-tree-dump-times "r\[<>]\[<>]" 48 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 unsigned int
 f1 (unsigned int x, unsigned int y)
diff --git a/gcc/testsuite/c-c++-common/rotate-3.c b/gcc/testsuite/c-c++-common/rotate-3.c
index aaa9f50..def2e8f 100644
--- a/gcc/testsuite/c-c++-common/rotate-3.c
+++ b/gcc/testsuite/c-c++-common/rotate-3.c
@@ -2,7 +2,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -fno-ipa-icf -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-times "r\[<>]\[<>]" 96 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 unsigned int
 f1 (unsigned int x, int y)
diff --git a/gcc/testsuite/c-c++-common/rotate-4.c b/gcc/testsuite/c-c++-common/rotate-4.c
index 0a21177..44fd1d0 100644
--- a/gcc/testsuite/c-c++-common/rotate-4.c
+++ b/gcc/testsuite/c-c++-common/rotate-4.c
@@ -4,7 +4,6 @@
 /* Rotates should be recognized only in functions with | instead of + or ^,
    or in functions that have constant shift counts (unused attribute on y).  */
 /* { dg-final { scan-tree-dump-times "r\[<>]\[<>]" 48 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
 
 unsigned int
 f1 (unsigned int x, int y)
diff --git a/gcc/testsuite/c-c++-common/tm/20100127.c b/gcc/testsuite/c-c++-common/tm/20100127.c
index c25336d..59f949e 100644
--- a/gcc/testsuite/c-c++-common/tm/20100127.c
+++ b/gcc/testsuite/c-c++-common/tm/20100127.c
@@ -33,4 +33,3 @@ void test(void *data)
 }
 
 /* { dg-final { scan-tree-dump-times "_ITM_W.*nontrxn" 0 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/ipa-1.c b/gcc/testsuite/c-c++-common/tm/ipa-1.c
index 961f7fe..2f9972b 100644
--- a/gcc/testsuite/c-c++-common/tm/ipa-1.c
+++ b/gcc/testsuite/c-c++-common/tm/ipa-1.c
@@ -20,4 +20,3 @@ int set_remove(void)
 
 
 /* { dg-final { scan-ipa-dump-not "getTMCloneOrIrrevocable" "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/malloc.c b/gcc/testsuite/c-c++-common/tm/malloc.c
index 81bcc56..4312765 100644
--- a/gcc/testsuite/c-c++-common/tm/malloc.c
+++ b/gcc/testsuite/c-c++-common/tm/malloc.c
@@ -23,4 +23,3 @@ void foobar(void)
 /* { dg-final { scan-tree-dump-times "__builtin__ITM_malloc" 1 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "__builtin__ITM_calloc" 1 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "__builtin__ITM_free" 2 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/pr54893.c b/gcc/testsuite/c-c++-common/tm/pr54893.c
index 8967f38..3766078 100644
--- a/gcc/testsuite/c-c++-common/tm/pr54893.c
+++ b/gcc/testsuite/c-c++-common/tm/pr54893.c
@@ -13,4 +13,3 @@ int main()
 }
 
 /* { dg-final { scan-ipa-dump "GTMA_DOES_GO_IRREVOCABLE" "tmipa" } } */
-/* { dg-final { cleanup-ipa-dump "tmipa" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c b/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
index db66873..27ff633 100644
--- a/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
+++ b/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
@@ -11,4 +11,3 @@ int f2()
 
 /* { dg-final { scan-tree-dump-times "ITM_RU" 2 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "ITM_commitTransaction" 4 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/trxn-expr.c b/gcc/testsuite/c-c++-common/tm/trxn-expr.c
index 53d4677..eb27c88 100644
--- a/gcc/testsuite/c-c++-common/tm/trxn-expr.c
+++ b/gcc/testsuite/c-c++-common/tm/trxn-expr.c
@@ -10,4 +10,3 @@ void foobar(void)
 
 /* { dg-final { scan-tree-dump-times "_ITM_RU.*york" 1 "tmmark" } } */
 /* { dg-final { scan-tree-dump-times "_ITM_RU" 1 "tmmark" } } */
-/* { dg-final { cleanup-tree-dump "tmmark" } } */
diff --git a/gcc/testsuite/c-c++-common/tm/wrap-1.c b/gcc/testsuite/c-c++-common/tm/wrap-1.c
index 04b5b6f..eec43a1 100644
--- a/gcc/testsuite/c-c++-common/tm/wrap-1.c
+++ b/gcc/testsuite/c-c++-common/tm/wrap-1.c
@@ -7,4 +7,3 @@ void xyzzy(void) __attribute__((transaction_wrap (orig)));
 void foo() { __transaction_relaxed { orig (); } }
 
 /* { dg-final { scan-tree-dump-times "xyzzy" 1 "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/align-7.c b/gcc/testsuite/c-c++-common/ubsan/align-7.c
index b441ef6..ec4e87f 100644
--- a/gcc/testsuite/c-c++-common/ubsan/align-7.c
+++ b/gcc/testsuite/c-c++-common/ubsan/align-7.c
@@ -30,4 +30,3 @@ main ()
 
 /* { dg-output "\.c:16:\[0-9]*: \[^\n\r]*member access within misaligned address 0x\[0-9a-fA-F]* for type 'struct S', which requires \[48] byte alignment" } */
 /* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/align-8.c b/gcc/testsuite/c-c++-common/ubsan/align-8.c
index 4e43a09f..61c1ceb 100644
--- a/gcc/testsuite/c-c++-common/ubsan/align-8.c
+++ b/gcc/testsuite/c-c++-common/ubsan/align-8.c
@@ -29,4 +29,3 @@ main ()
 }
 
 /* { dg-final { scan-tree-dump-times "Optimizing" 4 "sanopt"} } */
-/* { dg-final { cleanup-tree-dump "sanopt" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/pr63866.c b/gcc/testsuite/c-c++-common/ubsan/pr63866.c
index e70daa7..2b53dd1 100644
--- a/gcc/testsuite/c-c++-common/ubsan/pr63866.c
+++ b/gcc/testsuite/c-c++-common/ubsan/pr63866.c
@@ -8,4 +8,3 @@ foo (int x, int y)
   return x + y;
 }
 
-/* { dg-final { cleanup-ipa-dump "cgraph" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-2.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-2.c
index 6ae6f3c..4c631af 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-2.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-2.c
@@ -38,4 +38,3 @@ main ()
 
 /* { dg-final { scan-tree-dump-not "__ubsan_" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "UBSAN_CHECK_" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-3.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-3.c
index 9be62ac..dc6ed1b 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-3.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-3.c
@@ -39,4 +39,3 @@ main ()
 /* { dg-final { scan-tree-dump "__ubsan_" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "__ubsan_\[a-z_\]*_abort" "optimized" } } */
 /* { dg-final { scan-tree-dump "UBSAN_CHECK_" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-4.c b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-4.c
index 1f7ec2b..adc7069 100644
--- a/gcc/testsuite/c-c++-common/ubsan/sanitize-all-4.c
+++ b/gcc/testsuite/c-c++-common/ubsan/sanitize-all-4.c
@@ -39,4 +39,3 @@ main ()
 /* { dg-final { scan-tree-dump "__ubsan_\[a-z_\]*_abort" "optimized" } } */
 /* { dg-final { scan-tree-dump-not "__ubsan_\[a-z_\]*\[^et\] " "optimized" } } */
 /* { dg-final { scan-tree-dump "UBSAN_CHECK_" "optimized" } } */
-/* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/c-c++-common/vector-scalar-2.c b/gcc/testsuite/c-c++-common/vector-scalar-2.c
index f624c4c..1957ffc 100644
--- a/gcc/testsuite/c-c++-common/vector-scalar-2.c
+++ b/gcc/testsuite/c-c++-common/vector-scalar-2.c
@@ -11,4 +11,3 @@ void f (veci *a)
 }
 
 /* { dg-final { scan-tree-dump-times " \\\+ 1" 1 "gimple" } } */
-/* { dg-final { cleanup-tree-dump "gimple" } } */