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/gfortran.dg
parent: 90bb09c4f70b65c0cf4725f4eb1920a35f70d654 (diff)
download: gcc-c469078de7c017978bda033baff3e991987b5509.tar.gz
345 files changed, 0 insertions, 352 deletions
diff --git a/gcc/testsuite/gfortran.dg/PR40660.f90 b/gcc/testsuite/gfortran.dg/PR40660.f90
index a269ca3b2fe..dbd53396155 100644
--- a/gcc/testsuite/gfortran.dg/PR40660.f90
+++ b/gcc/testsuite/gfortran.dg/PR40660.f90
@@ -11,5 +11,4 @@ PROGRAM test
 end program test
 
 ! { dg-final { scan-tree-dump-times ": 3\] _gfortran" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90
index c4c4ae21e01..556e2724374 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_2.f90
@@ -37,4 +37,3 @@ end module grid_io
   use grid_io
   call read_grid_header
 end
-! { dg-final { cleanup-tree-dump "grid_io" } }
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_3.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_3.f90
index 57835131f1f..eaeaf54b470 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_3.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_auto_array_3.f90
@@ -27,4 +27,3 @@ contains
 end
 ! { dg-final { scan-tree-dump-times "builtin_malloc" 3 "original" } }
 ! { dg-final { scan-tree-dump-times "builtin_free" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
index 65724fe4b72..0b5ef274cc4 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_basics_1.f90
@@ -142,4 +142,3 @@ contains
 
 end program alloc
 ! { dg-final { scan-tree-dump-times "builtin_free" 18 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_constructor_1.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_constructor_1.f90
index 8003c051477..acdb64b7b19 100644
--- a/gcc/testsuite/gfortran.dg/alloc_comp_constructor_1.f90
+++ b/gcc/testsuite/gfortran.dg/alloc_comp_constructor_1.f90
@@ -108,4 +108,3 @@ contains
 
 end program test_constructor
 ! { dg-final { scan-tree-dump-times "builtin_free" 19 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/allocatable_function_1.f90 b/gcc/testsuite/gfortran.dg/allocatable_function_1.f90
index 05e0be069f4..7c19017003b 100644
--- a/gcc/testsuite/gfortran.dg/allocatable_function_1.f90
+++ b/gcc/testsuite/gfortran.dg/allocatable_function_1.f90
@@ -108,4 +108,3 @@ contains
 
 end program alloc_fun
 ! { dg-final { scan-tree-dump-times "free" 10 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/allocatable_function_4.f90 b/gcc/testsuite/gfortran.dg/allocatable_function_4.f90
index 9aff3a85a2d..df9d886c72f 100644
--- a/gcc/testsuite/gfortran.dg/allocatable_function_4.f90
+++ b/gcc/testsuite/gfortran.dg/allocatable_function_4.f90
@@ -52,5 +52,4 @@ function unique_A (x, sorted) result (x_unique)
 end function unique_A
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 5 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/allocatable_scalar_9.f90 b/gcc/testsuite/gfortran.dg/allocatable_scalar_9.f90
index fd0b4dbf216..d36175cd8d3 100644
--- a/gcc/testsuite/gfortran.dg/allocatable_scalar_9.f90
+++ b/gcc/testsuite/gfortran.dg/allocatable_scalar_9.f90
@@ -53,4 +53,3 @@ end block
 end
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 32 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_14.f90 b/gcc/testsuite/gfortran.dg/array_constructor_14.f90
index f2f89cd0430..c318bb8587f 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_14.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_14.f90
@@ -12,4 +12,3 @@ subroutine bar(x)
 end subroutine
 
 ! { dg-final { scan-tree-dump-times "data" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_15.f90 b/gcc/testsuite/gfortran.dg/array_constructor_15.f90
index 71260169d58..67f3aff390e 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_15.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_15.f90
@@ -4,4 +4,3 @@
   if (any(x(:,:) .ne. reshape ((/ 3, 1, 4, 1 /), (/ 2, 2 /)))) call abort ()
 end
 ! { dg-final { scan-tree-dump-times "atmp" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_40.f90 b/gcc/testsuite/gfortran.dg/array_constructor_40.f90
index 424f6f4fe75..63c1259bf3d 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_40.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_40.f90
@@ -49,4 +49,3 @@ program main
   if (abs(res - 8.1) > 1e-5) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "while" 5 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_41.f90 b/gcc/testsuite/gfortran.dg/array_constructor_41.f90
index eb5fd92a1ee..acdedd29bf4 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_41.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_41.f90
@@ -30,4 +30,3 @@ PROGRAM TEST
 END
 
 ! { dg-final { scan-tree-dump-times "realloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_43.f90 b/gcc/testsuite/gfortran.dg/array_constructor_43.f90
index 0fe96377e97..f8fd2723c1c 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_43.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_43.f90
@@ -10,4 +10,3 @@ program main
   if (any ([a,b,c,d] < 0.2)) print *,"foo"
 end program main
 ! { dg-final { scan-tree-dump-times "\\\|\\\|" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_46.f90 b/gcc/testsuite/gfortran.dg/array_constructor_46.f90
index 471c6a86fbd..4fac322c557 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_46.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_46.f90
@@ -12,4 +12,3 @@ program main
   if (abs (product([[11._dp, thirteen], a]) - 30030._dp) > 1e-8) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "while" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_47.f90 b/gcc/testsuite/gfortran.dg/array_constructor_47.f90
index 2ad85be3496..9570c66017d 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_47.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_47.f90
@@ -20,5 +20,4 @@ program main
   end function eleven_ones
 end program main
 ! { dg-final { scan-tree-dump-times "while" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/array_constructor_49.f90 b/gcc/testsuite/gfortran.dg/array_constructor_49.f90
index 6a198d676fe..ca963d3ac73 100644
--- a/gcc/testsuite/gfortran.dg/array_constructor_49.f90
+++ b/gcc/testsuite/gfortran.dg/array_constructor_49.f90
@@ -10,4 +10,3 @@ program t
   if (line /= ' 3 4 5 6') call abort
 end program t
 ! { dg-final { scan-tree-dump-times "__var" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memcpy_1.f90 b/gcc/testsuite/gfortran.dg/array_memcpy_1.f90
index 2d2f8f73073..b5a3c82c3bd 100644
--- a/gcc/testsuite/gfortran.dg/array_memcpy_1.f90
+++ b/gcc/testsuite/gfortran.dg/array_memcpy_1.f90
@@ -25,4 +25,3 @@ subroutine testl(a,b)
 end subroutine
 
 ! { dg-final { scan-tree-dump-times "memcpy" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memcpy_2.f90 b/gcc/testsuite/gfortran.dg/array_memcpy_2.f90
index be8f00d1738..5f54bf1d0c6 100644
--- a/gcc/testsuite/gfortran.dg/array_memcpy_2.f90
+++ b/gcc/testsuite/gfortran.dg/array_memcpy_2.f90
@@ -17,4 +17,3 @@
   z = y
 end
 ! { dg-final { scan-tree-dump-times "memcpy" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memcpy_3.f90 b/gcc/testsuite/gfortran.dg/array_memcpy_3.f90
index 0c4964d8fe3..7635a302257 100644
--- a/gcc/testsuite/gfortran.dg/array_memcpy_3.f90
+++ b/gcc/testsuite/gfortran.dg/array_memcpy_3.f90
@@ -12,4 +12,3 @@ subroutine bar(x)
 end subroutine
 
 ! { dg-final { scan-tree-dump-times "memcpy|ref-all\[^\\n\]*ref-all" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memcpy_4.f90 b/gcc/testsuite/gfortran.dg/array_memcpy_4.f90
index 4a794fae2a1..45a4d77b04e 100644
--- a/gcc/testsuite/gfortran.dg/array_memcpy_4.f90
+++ b/gcc/testsuite/gfortran.dg/array_memcpy_4.f90
@@ -10,4 +10,3 @@
   d = s
 end
 ! { dg-final { scan-tree-dump-times "memcpy" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memset_1.f90 b/gcc/testsuite/gfortran.dg/array_memset_1.f90
index cd6cb0d6d5d..f87398b05ad 100644
--- a/gcc/testsuite/gfortran.dg/array_memset_1.f90
+++ b/gcc/testsuite/gfortran.dg/array_memset_1.f90
@@ -61,4 +61,3 @@ subroutine l3(a)
 end subroutine
 
 ! { dg-final { scan-tree-dump-times "memset" 12 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_memset_2.f90 b/gcc/testsuite/gfortran.dg/array_memset_2.f90
index 28c15ae59ad..125b5685464 100644
--- a/gcc/testsuite/gfortran.dg/array_memset_2.f90
+++ b/gcc/testsuite/gfortran.dg/array_memset_2.f90
@@ -34,4 +34,3 @@ program test
 end program
 
 ! { dg-final { scan-tree-dump-times "= {}" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/array_section_2.f90 b/gcc/testsuite/gfortran.dg/array_section_2.f90
index ed5208cf3ad..272f0e5834e 100644
--- a/gcc/testsuite/gfortran.dg/array_section_2.f90
+++ b/gcc/testsuite/gfortran.dg/array_section_2.f90
@@ -13,4 +13,3 @@ program test
    temp(1:size(a)) = a
 end program
 ! { dg-final { scan-tree-dump-times "MAX_EXPR\[^\n\t\]+ubound\[^\n\t\]+lbound" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/assign_10.f90 b/gcc/testsuite/gfortran.dg/assign_10.f90
index e52302556fe..58124b69b78 100644
--- a/gcc/testsuite/gfortran.dg/assign_10.f90
+++ b/gcc/testsuite/gfortran.dg/assign_10.f90
@@ -25,4 +25,3 @@ end
 !
 ! { dg-final { scan-tree-dump-times "parm" 18 "original" } }
 ! { dg-final { scan-tree-dump-times "atmp" 18 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/associate_11.f90 b/gcc/testsuite/gfortran.dg/associate_11.f90
index 182c80b18b1..3ef31f48fa1 100644
--- a/gcc/testsuite/gfortran.dg/associate_11.f90
+++ b/gcc/testsuite/gfortran.dg/associate_11.f90
@@ -22,4 +22,3 @@ contains
 end program bug
 
 ! { dg-final { scan-tree-dump-times "foo ..integer.kind=4..0:. . restrict. a.data.;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/associate_6.f03 b/gcc/testsuite/gfortran.dg/associate_6.f03
index 356d388ef40..bedfb665ef2 100644
--- a/gcc/testsuite/gfortran.dg/associate_6.f03
+++ b/gcc/testsuite/gfortran.dg/associate_6.f03
@@ -35,4 +35,3 @@ PROGRAM main
   END ASSOCIATE
 END PROGRAM main
 ! { dg-final { scan-tree-dump-times "func" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/associative_1.f90 b/gcc/testsuite/gfortran.dg/associative_1.f90
index c4103a7f3e4..977584939ff 100644
--- a/gcc/testsuite/gfortran.dg/associative_1.f90
+++ b/gcc/testsuite/gfortran.dg/associative_1.f90
@@ -7,4 +7,3 @@ SUBROUTINE S1(a)
  a=1+a-1
 END SUBROUTINE S1
 ! { dg-final { scan-tree-dump-times " \\\+ " 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/assumed_charlen_substring_1.f90 b/gcc/testsuite/gfortran.dg/assumed_charlen_substring_1.f90
index b4697dc7bbf..808c1f44a53 100644
--- a/gcc/testsuite/gfortran.dg/assumed_charlen_substring_1.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_charlen_substring_1.f90
@@ -7,4 +7,3 @@ subroutine foo(a,b)
   if (a(1:) /= a(1:)) call do_not_use
 end subroutine foo
 ! { dg-final { scan-tree-dump-times "do_not_use" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/assumed_rank_10.f90 b/gcc/testsuite/gfortran.dg/assumed_rank_10.f90
index ac282839494..4a6b9088de0 100644
--- a/gcc/testsuite/gfortran.dg/assumed_rank_10.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_rank_10.f90
@@ -103,4 +103,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "iia = .integer.kind=4. .. desc.\[0-9\]+.data;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "jjp = .struct t .. desc.\[0-9\]+.data;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "jja = .struct t .. desc.\[0-9\]+.data;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/assumed_rank_12.f90 b/gcc/testsuite/gfortran.dg/assumed_rank_12.f90
index f947f4941fe..873498f82d7 100644
--- a/gcc/testsuite/gfortran.dg/assumed_rank_12.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_rank_12.f90
@@ -17,5 +17,4 @@ end function f
 end
 
 ! { dg-final { scan-tree-dump " = f \\(\\);.*desc.0.dtype = .*;.*desc.0.data = .void .. D.*;.*sub \\(&desc.0\\);.*D.*= .integer.kind=4. .. desc.0.data;" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/assumed_type_2.f90 b/gcc/testsuite/gfortran.dg/assumed_type_2.f90
index 28d38a16982..ec51b8bcaa8 100644
--- a/gcc/testsuite/gfortran.dg/assumed_type_2.f90
+++ b/gcc/testsuite/gfortran.dg/assumed_type_2.f90
@@ -175,4 +175,3 @@ end
 ! { dg-final { scan-tree-dump-times "sub_array_shape \\(&array_class_t1_alloc._data," 1 "original" } }
 ! { dg-final { scan-tree-dump-times "sub_array_shape \\(&array_class_t1_ptr._data," 1 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/auto_dealloc_1.f90 b/gcc/testsuite/gfortran.dg/auto_dealloc_1.f90
index 7e5fbd1486e..4f15bcd6159 100644
--- a/gcc/testsuite/gfortran.dg/auto_dealloc_1.f90
+++ b/gcc/testsuite/gfortran.dg/auto_dealloc_1.f90
@@ -54,4 +54,3 @@ end module
 
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/auto_dealloc_2.f90 b/gcc/testsuite/gfortran.dg/auto_dealloc_2.f90
index 04ee7f26997..4ee7121cc27 100644
--- a/gcc/testsuite/gfortran.dg/auto_dealloc_2.f90
+++ b/gcc/testsuite/gfortran.dg/auto_dealloc_2.f90
@@ -28,4 +28,3 @@ end program
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 4 "original" } }
 ! { dg-final { scan-tree-dump-times "x->_vptr->_final \\(" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/auto_save_2.f90 b/gcc/testsuite/gfortran.dg/auto_save_2.f90
index 07d5d0c96d9..0ec469d93ae 100644
--- a/gcc/testsuite/gfortran.dg/auto_save_2.f90
+++ b/gcc/testsuite/gfortran.dg/auto_save_2.f90
@@ -81,4 +81,3 @@ end
 
 ! { dg-final { scan-tree-dump-times "  static integer\\\(kind=4\\\) a = 0;" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "  b = 0;" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90 b/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90
index 8f0e77f7da7..c8eb50d621f 100644
--- a/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90
+++ b/gcc/testsuite/gfortran.dg/bind_c_array_params_2.f90
@@ -19,4 +19,3 @@ end
 ! { dg-final { scan-assembler-times "\[ \t\]\[$,_0-9\]*myBindC" 1 { target { ! { hppa*-*-* } } } } }
 ! { dg-final { scan-assembler-times "myBindC,%r2" 1 { target { hppa*-*-* } } } }
 ! { dg-final { scan-tree-dump-times "test \\\(&parm\\." 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bind_c_usage_13.f03 b/gcc/testsuite/gfortran.dg/bind_c_usage_13.f03
index b8c22618669..470bd59ed38 100644
--- a/gcc/testsuite/gfortran.dg/bind_c_usage_13.f03
+++ b/gcc/testsuite/gfortran.dg/bind_c_usage_13.f03
@@ -148,4 +148,3 @@ end program test
 ! { dg-final { scan-tree-dump "subiso_val .121.;" "original" } }
 ! { dg-final { scan-tree-dump "subiso2_val ..z..;" "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bind_c_usage_14.f03 b/gcc/testsuite/gfortran.dg/bind_c_usage_14.f03
index 2d6726af8ba..b7bd100056d 100644
--- a/gcc/testsuite/gfortran.dg/bind_c_usage_14.f03
+++ b/gcc/testsuite/gfortran.dg/bind_c_usage_14.f03
@@ -112,4 +112,3 @@ end subroutine sub6NoIso
 ! { dg-final { scan-tree-dump "master.3.sub6noiso .0, 0B, 0B, 0B, b, a, 0, 0, 1, 1\\);" "original" } }
 ! { dg-final { scan-tree-dump "master.3.sub6noiso .1, z, y, x, 0B, 0B, 1, 1, 0, 0\\);" "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/block_2.f08 b/gcc/testsuite/gfortran.dg/block_2.f08
index 484b6ce72fb..a2ba2d5caea 100644
--- a/gcc/testsuite/gfortran.dg/block_2.f08
+++ b/gcc/testsuite/gfortran.dg/block_2.f08
@@ -36,4 +36,3 @@ PROGRAM main
   END BLOCK
 END PROGRAM main
 ! { dg-final { scan-tree-dump-times "free \\(\\(void \\*\\) alloc_arr\\.data" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bound_9.f90 b/gcc/testsuite/gfortran.dg/bound_9.f90
index b88ff143462..9d1e15a4103 100644
--- a/gcc/testsuite/gfortran.dg/bound_9.f90
+++ b/gcc/testsuite/gfortran.dg/bound_9.f90
@@ -68,4 +68,3 @@ program main
   if (n .ne. 1) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "\\*one = 1" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_3.f90
index de3a3dc8a94..728f131d8ba 100644
--- a/gcc/testsuite/gfortran.dg/bound_simplification_3.f90
+++ b/gcc/testsuite/gfortran.dg/bound_simplification_3.f90
@@ -20,4 +20,3 @@ end program testit
 
 ! { dg-final { scan-tree-dump-times "bound" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "abort" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_4.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_4.f90
index 28a8d67137d..fc399251159 100644
--- a/gcc/testsuite/gfortran.dg/bound_simplification_4.f90
+++ b/gcc/testsuite/gfortran.dg/bound_simplification_4.f90
@@ -27,4 +27,3 @@
 end
 ! { dg-final { scan-tree-dump-not "bound" "original" } }
 ! { dg-final { scan-tree-dump-not "abort" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_5.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_5.f90
index 7c9f040b842..b1cf6eb6d7d 100644
--- a/gcc/testsuite/gfortran.dg/bound_simplification_5.f90
+++ b/gcc/testsuite/gfortran.dg/bound_simplification_5.f90
@@ -72,4 +72,3 @@ contains
   end subroutine
 end
 ! { dg-final { scan-tree-dump-not "abort" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_6.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_6.f90
index fb178364d15..9ab757dd5f2 100644
--- a/gcc/testsuite/gfortran.dg/bound_simplification_6.f90
+++ b/gcc/testsuite/gfortran.dg/bound_simplification_6.f90
@@ -24,4 +24,3 @@ MODULE qs_integrate_potential_low
 END MODULE qs_integrate_potential_low
 ! { dg-final { scan-tree-dump-not "bound" "original" } }
 ! { dg-final { scan-tree-dump-not "abort" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/c_f_pointer_tests_3.f90 b/gcc/testsuite/gfortran.dg/c_f_pointer_tests_3.f90
index 29072b814f7..ece08339990 100644
--- a/gcc/testsuite/gfortran.dg/c_f_pointer_tests_3.f90
+++ b/gcc/testsuite/gfortran.dg/c_f_pointer_tests_3.f90
@@ -39,4 +39,3 @@ end program test
 ! Check c_f_procpointer
 ! { dg-final { scan-tree-dump-times "  fprocptr = .integer.kind=4. .\\*<.*>. ... cfunptr;" 1 "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/c_funloc_tests_7.f90 b/gcc/testsuite/gfortran.dg/c_funloc_tests_7.f90
index 8e51c892cbd..7a4464ab552 100644
--- a/gcc/testsuite/gfortran.dg/c_funloc_tests_7.f90
+++ b/gcc/testsuite/gfortran.dg/c_funloc_tests_7.f90
@@ -18,5 +18,4 @@ end
 
 ! { dg-final { scan-tree-dump-times "cfp =\[^;\]+ nocsub;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "fint =\[^;\]+ cfp;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/c_loc_test_22.f90 b/gcc/testsuite/gfortran.dg/c_loc_test_22.f90
index 2eea2a52777..5f4f9775b4a 100644
--- a/gcc/testsuite/gfortran.dg/c_loc_test_22.f90
+++ b/gcc/testsuite/gfortran.dg/c_loc_test_22.f90
@@ -21,4 +21,3 @@ end
 ! { dg-final { scan-tree-dump-times "parm.\[0-9\]+.data = \\(void .\\) &\\(.yyy.\[0-9\]+\\)\\\[D.\[0-9\]+ \\* 4\\\];" 1 "original" } }
 
 ! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = parm.\[0-9\]+.data;\[^;]+ptr\[1-4\] = D.\[0-9\]+;" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/c_ptr_tests_14.f90 b/gcc/testsuite/gfortran.dg/c_ptr_tests_14.f90
index 2bf4262898b..999a3efd0bc 100644
--- a/gcc/testsuite/gfortran.dg/c_ptr_tests_14.f90
+++ b/gcc/testsuite/gfortran.dg/c_ptr_tests_14.f90
@@ -49,4 +49,3 @@ end program test
 
 ! { dg-final { scan-tree-dump-times "bbb =" 0 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/c_ptr_tests_15.f90 b/gcc/testsuite/gfortran.dg/c_ptr_tests_15.f90
index dec2e8e4ad9..19dd2d11b2e 100644
--- a/gcc/testsuite/gfortran.dg/c_ptr_tests_15.f90
+++ b/gcc/testsuite/gfortran.dg/c_ptr_tests_15.f90
@@ -51,4 +51,3 @@ end program test
 
 ! { dg-final { scan-tree-dump-times "bbb =" 0 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/c_ptr_tests_16.f90 b/gcc/testsuite/gfortran.dg/c_ptr_tests_16.f90
index 8855d62abaa..68c1da161a0 100644
--- a/gcc/testsuite/gfortran.dg/c_ptr_tests_16.f90
+++ b/gcc/testsuite/gfortran.dg/c_ptr_tests_16.f90
@@ -59,4 +59,3 @@ function fun()
 end function fun 
 
 ! { dg-final { scan-tree-dump-times "i_do_not_exist" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/char_cast_1.f90 b/gcc/testsuite/gfortran.dg/char_cast_1.f90
index 2eca9cfdaad..02e695d2d7b 100644
--- a/gcc/testsuite/gfortran.dg/char_cast_1.f90
+++ b/gcc/testsuite/gfortran.dg/char_cast_1.f90
@@ -28,4 +28,3 @@ end
 ! The sign that all is well is that [S.6][1] appears twice.
 ! Platform dependent variations are [S$6][1], [__S_6][1], [S___6][1]
 ! { dg-final { scan-tree-dump-times "6\\\]\\\[1\\\]" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/char_cast_2.f90 b/gcc/testsuite/gfortran.dg/char_cast_2.f90
index 4c175bd0fd7..4c038b36684 100644
--- a/gcc/testsuite/gfortran.dg/char_cast_2.f90
+++ b/gcc/testsuite/gfortran.dg/char_cast_2.f90
@@ -23,4 +23,3 @@ end
 ! Platform dependent variations are [S$5][1], [__S_5][1], [S___5][1]
 ! so we count the occurrences of 5][1].
 ! { dg-final { scan-tree-dump-times "5\\\]\\\[1\\\]" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/char_eoshift_5.f90 b/gcc/testsuite/gfortran.dg/char_eoshift_5.f90
index a3bbd40d52b..93c701a4f1b 100644
--- a/gcc/testsuite/gfortran.dg/char_eoshift_5.f90
+++ b/gcc/testsuite/gfortran.dg/char_eoshift_5.f90
@@ -22,4 +22,3 @@ END
 
 ! Check that _gfortran_eoshift* is called with 8 arguments:
 ! { dg-final { scan-tree-dump "_gfortran_eoshift\[0-9_\]+char \\(\[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*\\)" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/char_length_17.f90 b/gcc/testsuite/gfortran.dg/char_length_17.f90
index 5752dd1f7d1..a9cf1f75586 100644
--- a/gcc/testsuite/gfortran.dg/char_length_17.f90
+++ b/gcc/testsuite/gfortran.dg/char_length_17.f90
@@ -12,4 +12,3 @@ program main
   if (c(i+1:i+1) /= 'b') call abort ()
 end program main
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_1.f90 b/gcc/testsuite/gfortran.dg/character_comparison_1.f90
index d34af304da5..e7f25adb725 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_1.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_1.f90
@@ -33,5 +33,4 @@ subroutine yes
 end subroutine yes
 
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_2.f90 b/gcc/testsuite/gfortran.dg/character_comparison_2.f90
index d2736f874a6..d4c38e82784 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_2.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_2.f90
@@ -36,5 +36,4 @@ subroutine yes
 end subroutine yes
 
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_3.f90 b/gcc/testsuite/gfortran.dg/character_comparison_3.f90
index c5acace53a4..0c93e14476c 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_3.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_3.f90
@@ -27,5 +27,4 @@ end program main
 
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_memcmp" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_4.f90 b/gcc/testsuite/gfortran.dg/character_comparison_4.f90
index 1ff8b470732..a08c45c058f 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_4.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_4.f90
@@ -35,5 +35,4 @@ subroutine yes
 end subroutine yes
 
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_5.f90 b/gcc/testsuite/gfortran.dg/character_comparison_5.f90
index 08af59a579d..aef698ef20b 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_5.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_5.f90
@@ -17,5 +17,4 @@ end program main
 
 ! { dg-final { scan-tree-dump-times "gfortran_concat_string" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_memcmp" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_6.f90 b/gcc/testsuite/gfortran.dg/character_comparison_6.f90
index 78f647705a2..5391f88697d 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_6.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_6.f90
@@ -16,5 +16,4 @@ end program main
 
 ! { dg-final { scan-tree-dump-times "gfortran_concat_string" 4 "original" } }
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_7.f90 b/gcc/testsuite/gfortran.dg/character_comparison_7.f90
index 7983969a8ba..850e23408bd 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_7.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_7.f90
@@ -22,5 +22,4 @@ subroutine no(a)
 end subroutine no
 
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_8.f90 b/gcc/testsuite/gfortran.dg/character_comparison_8.f90
index 54e31a6454b..ee22486ca55 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_8.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_8.f90
@@ -10,5 +10,4 @@ program main
   if (LGT(a,a)) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "gfortran_compare_string" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/character_comparison_9.f90 b/gcc/testsuite/gfortran.dg/character_comparison_9.f90
index 9d17b3c99c9..18b7b5e4812 100644
--- a/gcc/testsuite/gfortran.dg/character_comparison_9.f90
+++ b/gcc/testsuite/gfortran.dg/character_comparison_9.f90
@@ -13,4 +13,3 @@ program main
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_compare_string_char4" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_memcmp" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_19.f03 b/gcc/testsuite/gfortran.dg/class_19.f03
index 428015c99ec..ff84dc44901 100644
--- a/gcc/testsuite/gfortran.dg/class_19.f03
+++ b/gcc/testsuite/gfortran.dg/class_19.f03
@@ -40,4 +40,3 @@ program main
 end program main
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 12 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_51.f90 b/gcc/testsuite/gfortran.dg/class_51.f90
index 1fdad92dd04..a24cae772df 100644
--- a/gcc/testsuite/gfortran.dg/class_51.f90
+++ b/gcc/testsuite/gfortran.dg/class_51.f90
@@ -22,4 +22,3 @@
   End Program
 
 ! { dg-final { scan-tree-dump-times "sub \\(&class" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_alias.f90 b/gcc/testsuite/gfortran.dg/class_alias.f90
index 961514eb7d4..baf41c737f9 100644
--- a/gcc/testsuite/gfortran.dg/class_alias.f90
+++ b/gcc/testsuite/gfortran.dg/class_alias.f90
@@ -92,4 +92,3 @@ use test_module
   deallocate (var_a)
   deallocate (var_p)
 end
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_allocate_14.f90 b/gcc/testsuite/gfortran.dg/class_allocate_14.f90
index 0c7aeb432d3..0eed2bd3c85 100644
--- a/gcc/testsuite/gfortran.dg/class_allocate_14.f90
+++ b/gcc/testsuite/gfortran.dg/class_allocate_14.f90
@@ -27,5 +27,4 @@ end
 
 ! { dg-final { scan-tree-dump-times "static struct __class_m_T_1_0a b = {._data={.data=0B}, ._vptr=&__vtab_m_T};" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "static struct __class_m_T_a y = {._data=0B, ._vptr=&__vtab_m_T};" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/class_allocate_15.f90 b/gcc/testsuite/gfortran.dg/class_allocate_15.f90
index 07c1cb49dbc..d0e85a2a9ba 100644
--- a/gcc/testsuite/gfortran.dg/class_allocate_15.f90
+++ b/gcc/testsuite/gfortran.dg/class_allocate_15.f90
@@ -25,4 +25,3 @@ contains
   end
 end
 ! { dg-final { scan-tree-dump-times "__builtin_free" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_allocate_16.f90 b/gcc/testsuite/gfortran.dg/class_allocate_16.f90
index 28776084d86..57fcc447449 100644
--- a/gcc/testsuite/gfortran.dg/class_allocate_16.f90
+++ b/gcc/testsuite/gfortran.dg/class_allocate_16.f90
@@ -25,4 +25,3 @@
 end
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_allocate_17.f90 b/gcc/testsuite/gfortran.dg/class_allocate_17.f90
index 639ba80ea60..6a768d93d67 100644
--- a/gcc/testsuite/gfortran.dg/class_allocate_17.f90
+++ b/gcc/testsuite/gfortran.dg/class_allocate_17.f90
@@ -29,4 +29,3 @@ contains
 end
 
 ! { dg-final { scan-tree-dump-times "fini_coarray" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_array_15.f03 b/gcc/testsuite/gfortran.dg/class_array_15.f03
index d3a123259fc..fd9e04c2828 100644
--- a/gcc/testsuite/gfortran.dg/class_array_15.f03
+++ b/gcc/testsuite/gfortran.dg/class_array_15.f03
@@ -116,4 +116,3 @@ subroutine pr54992  ! This test remains as the original.
   if (loc (b) .ne. loc(bh%hostNode)) call abort
 end
 ! { dg-final { scan-tree-dump-times "builtin_free" 12 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_array_16.f90 b/gcc/testsuite/gfortran.dg/class_array_16.f90
index fc8edbf140a..3630ad19234 100644
--- a/gcc/testsuite/gfortran.dg/class_array_16.f90
+++ b/gcc/testsuite/gfortran.dg/class_array_16.f90
@@ -68,4 +68,3 @@ end
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 5 "original" } }
 ! { dg-final { scan-tree-dump-times "finally" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/class_array_17.f90 b/gcc/testsuite/gfortran.dg/class_array_17.f90
index e5961e11035..5e86c288a64 100644
--- a/gcc/testsuite/gfortran.dg/class_array_17.f90
+++ b/gcc/testsuite/gfortran.dg/class_array_17.f90
@@ -31,4 +31,3 @@ program test
 end
 
 ! { dg-final { scan-tree-dump-times "__builtin_malloc \\(40\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_11.f90 b/gcc/testsuite/gfortran.dg/coarray_11.f90
index 7ec73535732..250eaca19fb 100644
--- a/gcc/testsuite/gfortran.dg/coarray_11.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_11.f90
@@ -61,4 +61,3 @@ subroutine boundsTest()
 end subroutine boundsTest
 
 ! { dg-final { scan-tree-dump-times "not_existing" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_12.f90 b/gcc/testsuite/gfortran.dg/coarray_12.f90
index c1b7342129d..70efaaff516 100644
--- a/gcc/testsuite/gfortran.dg/coarray_12.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_12.f90
@@ -74,4 +74,3 @@ end subroutine testAlloc5
 ! { dg-final { scan-tree-dump-times "yyy.dim.4..lbound = .*ooo;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "yyy.dim.4..ubound"          0 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_30.f90 b/gcc/testsuite/gfortran.dg/coarray_30.f90
index 2cfb50abfb9..d68bcccf794 100644
--- a/gcc/testsuite/gfortran.dg/coarray_30.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_30.f90
@@ -12,4 +12,3 @@ program main
 end
 
 ! { dg-final { scan-tree-dump-times "greeting.data = \\(void . restrict\\) __builtin_malloc \\(25\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_31.f90 b/gcc/testsuite/gfortran.dg/coarray_31.f90
index bab8b0aecf7..0da4d90ce14 100644
--- a/gcc/testsuite/gfortran.dg/coarray_31.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_31.f90
@@ -19,4 +19,3 @@ end
 ! { dg-final { scan-tree-dump "a.y.x.data = D.\[0-9\]+.y.x.data;" "original" } }
 ! { dg-final { scan-tree-dump "a.y.z._data.data = D.\[0-9\]+.y.z._data.data;" "original" } }
 ! { dg-final { scan-tree-dump "a.y.d._data.data = D.\[0-9\]+.y.d._data.data;" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_32.f90 b/gcc/testsuite/gfortran.dg/coarray_32.f90
index 8e6dc54330e..09c11fdbb2a 100644
--- a/gcc/testsuite/gfortran.dg/coarray_32.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_32.f90
@@ -14,5 +14,4 @@ end
 
 ! { dg-final { scan-tree-dump-times "ubound.. = " 1 "original" } }
 ! { dg-final { scan-tree-dump-times "size.. = " 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/coarray_atomic_4.f90 b/gcc/testsuite/gfortran.dg/coarray_atomic_4.f90
index be91a9f0112..b6368de5ad4 100644
--- a/gcc/testsuite/gfortran.dg/coarray_atomic_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_atomic_4.f90
@@ -66,4 +66,3 @@ end
 ! All calls should have a stat=0
 ! { dg-final { scan-tree-dump-times "stat = 0;" 14 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90 b/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90
index 11d52badef1..005f3e5eae8 100644
--- a/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_atomic_5.f90
@@ -23,4 +23,3 @@ end program
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_define \\(caf_token.0, 0, 1, &value.., 0B, 1, 4\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_op \\(1, caf_token.0, 0, 1, &me, 0B, 0B, 1, 4\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_atomic_ref \\(caf_token.0, 0, 1, &me, 0B, 1, 4\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_11.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_11.f90
index b10ba62be9f..2d2854ae149 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_11.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_11.f90
@@ -12,4 +12,3 @@ program test
 end program test
 
 ! { dg-final { scan-tree-dump-times "stat1 = 0;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_12.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_12.f90
index e3ba9d8adba..299ea62b093 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_12.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_12.f90
@@ -23,4 +23,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_broadcast \\(&desc.., _gfortran_caf_num_images \\(0, -1\\), &stat1, errmesg1, 6\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_broadcast \\(&val2, 4, &stat2, errmesg2, 7\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_broadcast \\(&desc.., res, &stat3, errmesg3, 8\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_15.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_15.f90
index 1e14dbbc037..2ddbe5a793b 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_15.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_15.f90
@@ -17,4 +17,3 @@ contains
 end program test
 
 ! { dg-final { scan-tree-dump-times "stat1 = 0;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_16.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_16.f90
index d7fb00b336f..0426e848fbf 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_16.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_16.f90
@@ -36,4 +36,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_reduce \\(&desc.., &fr, 4, _gfortran_caf_num_images \\(0, -1\\), &stat1, errmesg1, 0, 6\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_reduce \\(&val2, &gz, 0, 4, &stat2, errmesg2, 0, 7\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_reduce \\(&desc.., &hc, 1, res, &stat3, errmesg3, 99, 8\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_4.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_4.f90
index 8b3da94642a..9510b189f59 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_4.f90
@@ -16,5 +16,4 @@ end program test
 ! { dg-final { scan-tree-dump-times "stat1 = 0;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "stat2 = 0;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "stat3 = 0;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_5.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_5.f90
index ce260172160..19f8d09affc 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_5.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_5.f90
@@ -16,4 +16,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_max \\(&desc.., 0, &stat1, 0B, 0, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_min \\(&desc.., 0, &stat2, 0B, 0, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_sum \\(&desc.., 0, &stat3, 0B, 0\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_6.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_6.f90
index cd83644ef3d..af728287242 100644
--- a/gcc/testsuite/gfortran.dg/coarray_collectives_6.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_collectives_6.f90
@@ -23,4 +23,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_max \\(&desc.., 0, &stat1, errmesg1, 0, 6\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_sum \\(&val2, 4, &stat2, errmesg2, 7\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_co_min \\(&desc.., res, &stat3, errmesg3, 99, 8\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
index 926d531ef7d..f3c29485927 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_1.f90
@@ -19,4 +19,3 @@
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy.token, &stat.., &errmsg, 200.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy.token, 0B, 0B, 0.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx.token, 0B, 0B, 0.;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
index 472e0beb719..19c60a0b59c 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_2.f90
@@ -21,4 +21,3 @@
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, &stat.., &errmsg, 200.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, 0B, 0B, 0.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx._data.token, 0B, 0B, 0.;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
index bec7ee225fe..696c937e600 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_alloc_3.f90
@@ -22,4 +22,3 @@ subroutine test
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, &stat.., &errmsg, 200.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&yy._data.token, 0B, 0B, 0.;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister .&xx._data.token, 0B, 0B, 0.;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
index e57b328c0a0..bfa758e432a 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
@@ -44,4 +44,3 @@ end
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_get \\\(caf_token.1, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) b, 1, &parm.\[0-9\]+, 0B, &p, 4, 4, 0\\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_sendget \\\(caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, caf_token.0, \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, 4, 4, 0\\\);" 1 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_move_alloc_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_move_alloc_1.f90
index fef9d718bf7..e344eb834a4 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_move_alloc_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_move_alloc_1.f90
@@ -20,4 +20,3 @@ end
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_deregister" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "\\*bb = \\*aa" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "\\*dd = \\*cc" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_realloc_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_realloc_1.f90
index 4fd0e9b899f..c55507b5821 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_realloc_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_realloc_1.f90
@@ -32,4 +32,3 @@ end
 ! But copy "ii" and "CAF":
 ! { dg-final { scan-tree-dump-times "__builtin_memcpy|= MEM" 2 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_this_image_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_this_image_1.f90
index 2fcaacde394..63cca3e32c7 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_this_image_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_this_image_1.f90
@@ -24,4 +24,3 @@ end
 ! { dg-final { scan-tree-dump-times "mythis_image = _gfortran_caf_this_image \\(0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "bar \\(x, caf_token.., 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_init \\(&argc, &argv\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_this_image_2.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_this_image_2.f90
index 6e72a153a25..196a2d3b93e 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_this_image_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_this_image_2.f90
@@ -24,4 +24,3 @@ end
 ! { dg-final { scan-tree-dump-times "mythis_image = _gfortran_caf_this_image \\(0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "bar \\(&parm.\[0-9\]+, caf_token.\[0-9\]+, \\(integer\\(kind=\[48\]\\)\\) parm.\[0-9\]+.data - \\(integer\\(kind=\[48\]\\)\\) x\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_init \\(&argc, &argv\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_token_1.f90
index 299986df49c..2833d45e7ff 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_1.f90
@@ -85,4 +85,3 @@ end program main
 !
 ! { dg-final { scan-tree-dump-times "sub_opt \\(.integer.kind=4. .. caf, caf_token.\[0-9\]+, 0\\)" 1 "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
index fe4df3b0da6..b408529184b 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_2.f90
@@ -112,4 +112,3 @@ end program main
 !
 ! { dg-final { scan-tree-dump-times "sub_opt \\(.integer.kind=4. .. caf.data, caf.token, 0\\)" 1 "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
index 2725549a3ed..1a92f02d48a 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_3.f90
@@ -10,4 +10,3 @@ end
 
 ! { dg-final { scan-tree-dump-times "caf.data = \\(void . restrict\\) _gfortran_caf_register \\(4, 1, &caf.token, 0B, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "caf_scalar.data = \\(void . restrict\\) _gfortran_caf_register \\(4, 1, &caf_scalar.token, 0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
index 9e445f4a0de..8183140bd93 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_token_4.f90
@@ -49,4 +49,3 @@ end program test_caf
 !
 ! { dg-final { scan-tree-dump-times "foo \\(&parm.\[0-9\]+, &a, &C.\[0-9\]+, caf_token.\[0-9\]+, \\(integer\\(kind=.\\)\\) parm.\[0-9\]+.data - \\(integer\\(kind=.\\)\\) b, a.token, 0\\);" 1 "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90 b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
index d489b84598e..b8920f1240d 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lock_7.f90
@@ -44,4 +44,3 @@ end
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_lock \\(four.token, 1 - \\(integer\\(kind=4\\)\\) four.dim\\\[0\\\].lbound, 7 - \\(integer\\(kind=4\\)\\) four.dim\\\[1\\\].lbound, &acquired.., &ii, 0B, 0\\);|_gfortran_caf_lock \\(four.token, 1 - four.dim\\\[0\\\].lbound, 7 - four.dim\\\[1\\\].lbound, &acquired.., &ii, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_unlock \\(four.token, 2 - \\(integer\\(kind=4\\)\\) four.dim\\\[0\\\].lbound, 8 - \\(integer\\(kind=4\\)\\) four.dim\\\[1\\\].lbound, 0B, 0B, 0\\);|_gfortran_caf_unlock \\(four.token, 2 - four.dim\\\[0\\\].lbound, 8 - four.dim\\\[1\\\].lbound, 0B, 0B, 0\\);" 1 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_4.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
index ceb1c858301..ff574c1ef65 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_4.f90
@@ -20,4 +20,3 @@ call sub(var%x)
 end subroutine test
 
 ! { dg-final { scan-tree-dump-times "sub \\(\\(real\\(kind=4\\) \\*\\) var.x.data, var.x.token, 0\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_5.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
index 29c9c8c3140..f406da8d352 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_5.f90
@@ -11,4 +11,3 @@ allocate(x%x[*])
 end subroutine test
 
 ! { dg-final { scan-tree-dump-times "x->_data->x.data = _gfortran_caf_register \\(4, 1, &x->_data->x.token, 0B, 0B, 0\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_6.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
index 3fff5e0d59d..06c07430b08 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_6.f90
@@ -19,4 +19,3 @@ end
 ! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_0_1t \\* x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\) caf_offset..\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "foo \\(&class.., y._data._data.token, \\(integer\\(kind=\[48\]\\)\\) class..._data.data - \\(integer\\(kind=\[48\]\\)\\) y._data._data.data\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_7.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
index b50319a0f36..65d1c93fede 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_7.f90
@@ -19,4 +19,3 @@ end
 ! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_1_1t \\* x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\) caf_offset..\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "foo \\(&class.., y._data._data.token, \\(integer\\(kind=\[48\]\\)\\) class..._data.data - \\(integer\\(kind=\[48\]\\)\\) y._data._data.data\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_poly_8.f90 b/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
index 7775605732c..bfca8a46d10 100644
--- a/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_poly_8.f90
@@ -19,4 +19,3 @@ end
 ! { dg-final { scan-tree-dump-times "bar \\(struct __class_MAIN___T_1_1t \\* x, void \\* restrict caf_token.., integer\\(kind=\[48\]\\) caf_offset..\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "bar \\(0B, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "foo \\(&class.., y._data._data.token, \\(integer\\(kind=\[48\]\\)\\) class..._data.data - \\(integer\\(kind=\[48\]\\)\\) y._data._data.data\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_sync_memory.f90 b/gcc/testsuite/gfortran.dg/coarray_sync_memory.f90
index 6e1aee32e3c..c4e660b8cf7 100644
--- a/gcc/testsuite/gfortran.dg/coarray_sync_memory.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_sync_memory.f90
@@ -16,4 +16,3 @@ end
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_sync_memory \\(&stat, 0B, 0\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_sync_memory \\(0B, &&msg, 42\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_caf_sync_memory \\(&stat, &&msg, 42\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_this_image_1.f90 b/gcc/testsuite/gfortran.dg/coarray_this_image_1.f90
index bbdbab7f236..1fe231888a4 100644
--- a/gcc/testsuite/gfortran.dg/coarray_this_image_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_this_image_1.f90
@@ -17,4 +17,3 @@ end
 ! { dg-final { scan-tree-dump-times "k3 = 1;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "k4 = 0;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "k5 = 1;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/coarray_this_image_2.f90 b/gcc/testsuite/gfortran.dg/coarray_this_image_2.f90
index 35156baad7a..002c897ac8e 100644
--- a/gcc/testsuite/gfortran.dg/coarray_this_image_2.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_this_image_2.f90
@@ -17,4 +17,3 @@ end
 ! { dg-final { scan-tree-dump-times "k3 = _gfortran_caf_num_images \\(7, -1\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "k4 = _gfortran_caf_num_images \\(8, 1\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "k5 = _gfortran_caf_num_images \\(0, 0\\);" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90 b/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90
index dcc6bf91f92..88e2db80551 100644
--- a/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90
+++ b/gcc/testsuite/gfortran.dg/complex_intrinsic_7.f90
@@ -41,4 +41,3 @@ if (abs(tanh(z81_1) - cmplx(1.0839233273386946_8,0.27175258531951174_8,8)) > eps
 
 end
 ! { dg-final { scan-tree-dump-times "abort" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/constructor_2.f90 b/gcc/testsuite/gfortran.dg/constructor_2.f90
index 0e3d8af29f3..294319aebce 100644
--- a/gcc/testsuite/gfortran.dg/constructor_2.f90
+++ b/gcc/testsuite/gfortran.dg/constructor_2.f90
@@ -70,4 +70,3 @@ program main
   if (b%bar /= 4) call abort ()
 end program main
 
-! { dg-final { cleanup-tree-dump "foo_module bar_module" } }
diff --git a/gcc/testsuite/gfortran.dg/contiguous_3.f90 b/gcc/testsuite/gfortran.dg/contiguous_3.f90
index aac55367a45..0999f7b5b91 100644
--- a/gcc/testsuite/gfortran.dg/contiguous_3.f90
+++ b/gcc/testsuite/gfortran.dg/contiguous_3.f90
@@ -62,4 +62,3 @@ end subroutine test3
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_unpack .&parm" 2 "original" } }
 
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/default_initialization_5.f90 b/gcc/testsuite/gfortran.dg/default_initialization_5.f90
index 50860e0d064..0effcccb1ed 100644
--- a/gcc/testsuite/gfortran.dg/default_initialization_5.f90
+++ b/gcc/testsuite/gfortran.dg/default_initialization_5.f90
@@ -62,4 +62,3 @@ end program
 
 ! { dg-final { scan-tree-dump-times "my_data.head = 0B" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "my_data.head = &tgt" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90 b/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
index 62d633d3f5c..7f030e0bf87 100644
--- a/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
+++ b/gcc/testsuite/gfortran.dg/default_numeric_type_1.f90
@@ -16,4 +16,3 @@ end subroutine
 program testprog
   call mysub1((/1.,2./),(/1.,2.,3./),-2, 3.2)
 end
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_10.f90 b/gcc/testsuite/gfortran.dg/dependency_10.f90
index d6edde2bd04..246a945196d 100644
--- a/gcc/testsuite/gfortran.dg/dependency_10.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_10.f90
@@ -10,4 +10,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_11.f90 b/gcc/testsuite/gfortran.dg/dependency_11.f90
index 3874a79a310..22c368c8ea1 100644
--- a/gcc/testsuite/gfortran.dg/dependency_11.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_11.f90
@@ -10,4 +10,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_12.f90 b/gcc/testsuite/gfortran.dg/dependency_12.f90
index 09fe19650dd..22006145bd1 100644
--- a/gcc/testsuite/gfortran.dg/dependency_12.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_12.f90
@@ -9,4 +9,3 @@ subroutine foo(a,b)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_13.f90 b/gcc/testsuite/gfortran.dg/dependency_13.f90
index 887da9dbba6..488aed972c6 100644
--- a/gcc/testsuite/gfortran.dg/dependency_13.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_13.f90
@@ -10,4 +10,3 @@
    end where
    end
 ! { dg-final { scan-tree-dump-times "temp" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_14.f90 b/gcc/testsuite/gfortran.dg/dependency_14.f90
index 71e962c15dc..153764d81c1 100644
--- a/gcc/testsuite/gfortran.dg/dependency_14.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_14.f90
@@ -9,4 +9,3 @@ subroutine foo(a,i)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_15.f90 b/gcc/testsuite/gfortran.dg/dependency_15.f90
index 36eb3a46423..4182caea724 100644
--- a/gcc/testsuite/gfortran.dg/dependency_15.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_15.f90
@@ -9,4 +9,3 @@ subroutine foo(a,i)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_16.f90 b/gcc/testsuite/gfortran.dg/dependency_16.f90
index b669771b898..b2b5fee9dc8 100644
--- a/gcc/testsuite/gfortran.dg/dependency_16.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_16.f90
@@ -9,4 +9,3 @@ subroutine foo(a,i)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_17.f90 b/gcc/testsuite/gfortran.dg/dependency_17.f90
index 06d15082c78..06b9d84df06 100644
--- a/gcc/testsuite/gfortran.dg/dependency_17.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_17.f90
@@ -9,4 +9,3 @@ subroutine foo(a,i)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_18.f90 b/gcc/testsuite/gfortran.dg/dependency_18.f90
index cb0799d1fab..7b95453bbbb 100644
--- a/gcc/testsuite/gfortran.dg/dependency_18.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_18.f90
@@ -17,4 +17,3 @@ subroutine foo(a,i,j,k)
   a(k:k+2) = a(k+1:k+3)
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_20.f90 b/gcc/testsuite/gfortran.dg/dependency_20.f90
index ed8fa14a112..64f8f6fa559 100644
--- a/gcc/testsuite/gfortran.dg/dependency_20.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_20.f90
@@ -7,4 +7,3 @@
   endwhere
 end
 ! { dg-final { scan-tree-dump-times "temp" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_26.f90 b/gcc/testsuite/gfortran.dg/dependency_26.f90
index 0be18a35a8d..3b652ea0c87 100644
--- a/gcc/testsuite/gfortran.dg/dependency_26.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_26.f90
@@ -49,4 +49,3 @@ END MODULE M1
 end
 ! { dg-final { scan-tree-dump-times "&a" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "pack" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_4.f90 b/gcc/testsuite/gfortran.dg/dependency_4.f90
index 9eabaf1e587..ea314fb9cad 100644
--- a/gcc/testsuite/gfortran.dg/dependency_4.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_4.f90
@@ -8,4 +8,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_5.f90 b/gcc/testsuite/gfortran.dg/dependency_5.f90
index 307fbd74868..bc52ad91c68 100644
--- a/gcc/testsuite/gfortran.dg/dependency_5.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_5.f90
@@ -8,4 +8,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_6.f90 b/gcc/testsuite/gfortran.dg/dependency_6.f90
index e90571ea978..7cf067f712b 100644
--- a/gcc/testsuite/gfortran.dg/dependency_6.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_6.f90
@@ -8,4 +8,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_7.f90 b/gcc/testsuite/gfortran.dg/dependency_7.f90
index 52bac8f9f61..4aebabfa2b2 100644
--- a/gcc/testsuite/gfortran.dg/dependency_7.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_7.f90
@@ -8,4 +8,3 @@ subroutine foo(a)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_8.f90 b/gcc/testsuite/gfortran.dg/dependency_8.f90
index 9f7837d6037..949edf2d2f6 100644
--- a/gcc/testsuite/gfortran.dg/dependency_8.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_8.f90
@@ -10,4 +10,3 @@ subroutine foo(a,i,j)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "temp" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dependency_9.f90 b/gcc/testsuite/gfortran.dg/dependency_9.f90
index d1f6f5e3fed..0ab4870afb9 100644
--- a/gcc/testsuite/gfortran.dg/dependency_9.f90
+++ b/gcc/testsuite/gfortran.dg/dependency_9.f90
@@ -10,4 +10,3 @@ subroutine foo(a,i,j)
   endwhere
 end subroutine
 ! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90 b/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90
index 274aada6aad..07d89854eb7 100644
--- a/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90
+++ b/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90
@@ -28,4 +28,3 @@
     j = total
   end
 ! { dg-final { scan-tree-dump-times "j = 50" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90 b/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
index 20f3cf93e21..892a9c9f4c1 100644
--- a/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
+++ b/gcc/testsuite/gfortran.dg/derived_constructor_char_1.f90
@@ -47,4 +47,3 @@ end subroutine
 ! { dg-final { scan-tree-dump-times "four = ..txt=..ABC  ., .ZYX  ...;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "five = ..txt=..AbCdE., .ZyXwV...;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "six = ..txt=..aBcDe., .zYxWv...;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dot_product_2.f90 b/gcc/testsuite/gfortran.dg/dot_product_2.f90
index a5fe3b05178..d3a037db73a 100644
--- a/gcc/testsuite/gfortran.dg/dot_product_2.f90
+++ b/gcc/testsuite/gfortran.dg/dot_product_2.f90
@@ -35,4 +35,3 @@ end
 
 
 ! { dg-final { scan-tree-dump-not "abort" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/dot_product_3.f90 b/gcc/testsuite/gfortran.dg/dot_product_3.f90
index 6e11556ee86..c5650479948 100644
--- a/gcc/testsuite/gfortran.dg/dot_product_3.f90
+++ b/gcc/testsuite/gfortran.dg/dot_product_3.f90
@@ -12,4 +12,3 @@ program main
    stop
 end program main
 ! { dg-final { scan-tree-dump-times "8\\.0e\\+0" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/elemental_dependency_1.f90 b/gcc/testsuite/gfortran.dg/elemental_dependency_1.f90
index d76fad642e3..39ba453c287 100644
--- a/gcc/testsuite/gfortran.dg/elemental_dependency_1.f90
+++ b/gcc/testsuite/gfortran.dg/elemental_dependency_1.f90
@@ -80,4 +80,3 @@ CONTAINS
 END PROGRAM main
 
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_unpack" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/elemental_dependency_3.f90 b/gcc/testsuite/gfortran.dg/elemental_dependency_3.f90
index 98cfd7be48a..ac0a8825ebb 100644
--- a/gcc/testsuite/gfortran.dg/elemental_dependency_3.f90
+++ b/gcc/testsuite/gfortran.dg/elemental_dependency_3.f90
@@ -25,4 +25,3 @@ program gfcbu84_main
   end subroutine tq_tvgh
 end program gfcbu84_main
 ! { dg-final { scan-tree-dump-times "atmp" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/elemental_dependency_4.f90 b/gcc/testsuite/gfortran.dg/elemental_dependency_4.f90
index fc15e641812..9aa2f88dfdd 100644
--- a/gcc/testsuite/gfortran.dg/elemental_dependency_4.f90
+++ b/gcc/testsuite/gfortran.dg/elemental_dependency_4.f90
@@ -164,4 +164,3 @@ CONTAINS
     END FUNCTION Romeo
 END PROGRAM Main
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/extends_11.f03 b/gcc/testsuite/gfortran.dg/extends_11.f03
index 58bde73acb1..7b32cdf547f 100644
--- a/gcc/testsuite/gfortran.dg/extends_11.f03
+++ b/gcc/testsuite/gfortran.dg/extends_11.f03
@@ -38,4 +38,3 @@
 end
 
 ! { dg-final { scan-tree-dump-times " +recruit\\.service\\.education\\.person\\.ss =" 8 "original"} }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/extends_14.f03 b/gcc/testsuite/gfortran.dg/extends_14.f03
index 15e38ff9081..f85f87ba6a5 100644
--- a/gcc/testsuite/gfortran.dg/extends_14.f03
+++ b/gcc/testsuite/gfortran.dg/extends_14.f03
@@ -26,4 +26,3 @@ program evolve_aflow
 end program 
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/extends_type_of_3.f90 b/gcc/testsuite/gfortran.dg/extends_type_of_3.f90
index 346542fe5c3..4c1a6a0f5a0 100644
--- a/gcc/testsuite/gfortran.dg/extends_type_of_3.f90
+++ b/gcc/testsuite/gfortran.dg/extends_type_of_3.f90
@@ -108,4 +108,3 @@ end
 
 ! { dg-final { scan-tree-dump-times "abort" 13 "original" } }
 ! { dg-final { scan-tree-dump-times "should_not_exist" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/finalize_10.f90 b/gcc/testsuite/gfortran.dg/finalize_10.f90
index 32386ce5703..937dff5a167 100644
--- a/gcc/testsuite/gfortran.dg/finalize_10.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_10.f90
@@ -36,4 +36,3 @@ end subroutine foo
 ! { dg-final { scan-tree-dump-times "desc.\[0-9\]+.data = \\(void \\* restrict\\) bb;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__final_m_T2 \\(&desc.\[0-9\]+, 0, 0\\);" 1 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/finalize_18.f90 b/gcc/testsuite/gfortran.dg/finalize_18.f90
index f018ae2e195..c8b4afcff50 100644
--- a/gcc/testsuite/gfortran.dg/finalize_18.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_18.f90
@@ -44,4 +44,3 @@ end
 ! { dg-final { scan-tree-dump "y.cc._vptr->_final \\(&desc.\[0-9\]+, (\\(integer\\(kind=8\\)\\) )?y.cc._vptr->_size, 1\\);" "original" } }
 ! { dg-final { scan-tree-dump "y.dd._vptr->_final \\(&y.dd._data, (\\(integer\\(kind=8\\)\\) )?y.dd._vptr->_size, 1\\);" "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/finalize_21.f90 b/gcc/testsuite/gfortran.dg/finalize_21.f90
index 6f6ede3e46a..6df1f31b10f 100644
--- a/gcc/testsuite/gfortran.dg/finalize_21.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_21.f90
@@ -9,4 +9,3 @@ class(*), allocatable :: var
 end
 
 ! { dg-final { scan-tree-dump "static struct __vtype__STAR __vtab__STAR = {._hash=0, ._size=., ._extends=0B, ._def_init=0B, ._copy=0B, ._final=0B};" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/finalize_28.f90 b/gcc/testsuite/gfortran.dg/finalize_28.f90
index 3d7b2416719..03de5d0d28b 100644
--- a/gcc/testsuite/gfortran.dg/finalize_28.f90
+++ b/gcc/testsuite/gfortran.dg/finalize_28.f90
@@ -22,4 +22,3 @@ contains
   end subroutine coo_dump_edges
 end module coo_graphs
 ! { dg-final { scan-tree-dump-times "__builtin_free" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/fmt_en.f90 b/gcc/testsuite/gfortran.dg/fmt_en.f90
index 89a6d95adb6..e511af58b3b 100644
--- a/gcc/testsuite/gfortran.dg/fmt_en.f90
+++ b/gcc/testsuite/gfortran.dg/fmt_en.f90
@@ -183,4 +183,3 @@ contains
     end subroutine
 end program
 ! { dg-final { scan-file fmt_en.res "All kinds rounded to nearest" { xfail hppa*-*-hpux* } } }
-! { dg-final { cleanup-saved-temps } }
diff --git a/gcc/testsuite/gfortran.dg/forall_15.f90 b/gcc/testsuite/gfortran.dg/forall_15.f90
index c875e033312..d832783eede 100644
--- a/gcc/testsuite/gfortran.dg/forall_15.f90
+++ b/gcc/testsuite/gfortran.dg/forall_15.f90
@@ -23,4 +23,3 @@ program test
 end program test
 ! { dg-final { scan-tree-dump-times "__builtin_cos" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_sin" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/forall_8.f90 b/gcc/testsuite/gfortran.dg/forall_8.f90
index b06f3028a0f..2a96ea30f13 100644
--- a/gcc/testsuite/gfortran.dg/forall_8.f90
+++ b/gcc/testsuite/gfortran.dg/forall_8.f90
@@ -6,4 +6,3 @@
   end forall
   end
 ! { dg-final { scan-tree-dump-times "temp" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/forall_9.f90 b/gcc/testsuite/gfortran.dg/forall_9.f90
index 12084b16744..1e7947371d5 100644
--- a/gcc/testsuite/gfortran.dg/forall_9.f90
+++ b/gcc/testsuite/gfortran.dg/forall_9.f90
@@ -6,4 +6,3 @@
   end forall
   end
 ! { dg-final { scan-tree-dump-times "temp" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_1.f90 b/gcc/testsuite/gfortran.dg/function_optimize_1.f90
index 88527a3334e..9ac3746099c 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_1.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_1.f90
@@ -44,4 +44,3 @@ end program main
 ! { dg-final { scan-tree-dump-times "element" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "mypure" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "elem_impure" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_2.f90 b/gcc/testsuite/gfortran.dg/function_optimize_2.f90
index 153270b5312..e73f9ca4a41 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_2.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_2.f90
@@ -44,4 +44,3 @@ end program main
 ! { dg-final { scan-tree-dump-times "element" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "mypure" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "elem_impure" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_6.f90 b/gcc/testsuite/gfortran.dg/function_optimize_6.f90
index cda7ab06283..e8f8bddf2b3 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_6.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_6.f90
@@ -11,6 +11,5 @@ program main
   ENDDO
 END program main
 ! { dg-final { scan-tree-dump-times "mypure" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
 
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_7.f90 b/gcc/testsuite/gfortran.dg/function_optimize_7.f90
index 115a5a66bbb..a8245de4a09 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_7.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_7.f90
@@ -44,4 +44,3 @@ end subroutine xx
 ! { dg-final { scan-tree-dump-times "mypure" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "elem_impure" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "sum_r4" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_8.f90 b/gcc/testsuite/gfortran.dg/function_optimize_8.f90
index 56e48c50347..a6fe1036d13 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_8.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_8.f90
@@ -32,4 +32,3 @@ program main
 end program main
 ! { dg-final { scan-tree-dump-times "myfunc" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "mychar" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/function_optimize_9.f90 b/gcc/testsuite/gfortran.dg/function_optimize_9.f90
index 350ce9a8f66..f220e475570 100644
--- a/gcc/testsuite/gfortran.dg/function_optimize_9.f90
+++ b/gcc/testsuite/gfortran.dg/function_optimize_9.f90
@@ -20,4 +20,3 @@ program main
   print *,a
 end program main
 ! { dg-final { scan-tree-dump-times "purefunc" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/generic_18.f90 b/gcc/testsuite/gfortran.dg/generic_18.f90
index 8bfd770b9bf..3fb9e9ab82b 100644
--- a/gcc/testsuite/gfortran.dg/generic_18.f90
+++ b/gcc/testsuite/gfortran.dg/generic_18.f90
@@ -50,4 +50,3 @@ PROGRAM MakeAChoice
 END PROGRAM MakeAChoice
 ! { dg-final { scan-tree-dump-times "specproc" 3 "original" } }
 ! { dg-final { scan-tree-dump-times "elemproc" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
index 0126d9c6d99..79dc7316599 100644
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-1.f95
@@ -19,4 +19,3 @@ end function f
 ! 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/gfortran.dg/goacc/acc_on_device-2-off.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
index 0a4978e3f6b..28120f0f2c2 100644
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2-off.f95
@@ -36,4 +36,3 @@ end function f
 ! 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/gfortran.dg/goacc/acc_on_device-2.f95 b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
index 43ad022fb40..4719a47ac42 100644
--- a/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/acc_on_device-2.f95
@@ -37,4 +37,3 @@ end function f
 ! TODO: not working.
 ! { dg-final { scan-rtl-dump-times "\\\(call \[^\\n\]* acc_on_device" 0 "expand" { xfail *-*-* } } }
 
-! { dg-final { cleanup-rtl-dump "expand" } }
diff --git a/gcc/testsuite/gfortran.dg/goacc/data-tree.f95 b/gcc/testsuite/gfortran.dg/goacc/data-tree.f95
index 32c50fd6b0b..23745f333d2 100644
--- a/gcc/testsuite/gfortran.dg/goacc/data-tree.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/data-tree.f95
@@ -27,4 +27,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "map\\(alloc:t\\)" 1 "original" } } 
 
 ! { dg-final { scan-tree-dump-times "map\\(force_deviceptr:u\\)" 1 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/declare-1.f95 b/gcc/testsuite/gfortran.dg/goacc/declare-1.f95
index 03540f13bcf..5cf737f269b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/declare-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/declare-1.f95
@@ -17,4 +17,3 @@ contains
 end program test
 ! { dg-prune-output "unimplemented" }
 ! { dg-final { scan-tree-dump-times "pragma acc declare map\\(force_tofrom:i\\)" 2 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95 b/gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95
index 19e741185ef..e4c8205a591 100644
--- a/gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95
@@ -10,4 +10,3 @@ program test
 end program test
 ! { dg-prune-output "unimplemented" }
 ! { dg-final { scan-tree-dump-times "pragma acc host_data use_device\\(i\\)" 1 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95
index 7585a16de8f..fac5b85217f 100644
--- a/gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/kernels-tree.f95
@@ -29,4 +29,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "map\\(alloc:t\\)" 1 "original" } } 
 
 ! { dg-final { scan-tree-dump-times "map\\(force_deviceptr:u\\)" 1 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90 b/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90
index 966e75bcde3..d72bae43930 100644
--- a/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/loop-tree-1.f90
@@ -45,4 +45,3 @@ end program test
 
 ! { dg-final { scan-tree-dump-times "private\\(m\\)" 1 "original" } } 
 ! { dg-final { scan-tree-dump-times "reduction\\(\\+:sum\\)" 1 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95 b/gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95
index 48061b112fe..4915744de6b 100644
--- a/gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/parallel-tree.f95
@@ -38,4 +38,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "map\\(force_deviceptr:u\\)" 1 "original" } } 
 ! { dg-final { scan-tree-dump-times "private\\(v\\)" 1 "original" } } 
 ! { dg-final { scan-tree-dump-times "firstprivate\\(w\\)" 1 "original" } } 
-! { dg-final { cleanup-tree-dump "original" } } 
diff --git a/gcc/testsuite/gfortran.dg/goacc/private-1.f95 b/gcc/testsuite/gfortran.dg/goacc/private-1.f95
index 8bbe4702faf..23ce95ad8d2 100644
--- a/gcc/testsuite/gfortran.dg/goacc/private-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/private-1.f95
@@ -35,4 +35,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "private\\(i\\)" 3 "omplower" } }
 ! { dg-final { scan-tree-dump-times "private\\(j\\)" 2 "omplower" } }
 ! { dg-final { scan-tree-dump-times "private\\(k\\)" 1 "omplower" } }
-! { dg-final { cleanup-tree-dump "omplower" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/do-1.f90 b/gcc/testsuite/gfortran.dg/gomp/do-1.f90
index a9c9cf11df6..19549988792 100644
--- a/gcc/testsuite/gfortran.dg/gomp/do-1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/do-1.f90
@@ -23,4 +23,3 @@ end subroutine bar
 
 ! { dg-final { scan-tree-dump-times "GOMP_parallel_loop_dynamic_start" 2 "omplower" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "GOMP_parallel_loop_guided_start" 2 "omplower" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "omplower" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/omp_parse1.f90 b/gcc/testsuite/gfortran.dg/gomp/omp_parse1.f90
index 3ab43670762..0fbc9bcf7ff 100644
--- a/gcc/testsuite/gfortran.dg/gomp/omp_parse1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/omp_parse1.f90
@@ -17,4 +17,3 @@ call bar
 end
 
 ! { dg-final { scan-tree-dump-times "pragma omp parallel" 3 "omplower" } }
-! { dg-final { cleanup-tree-dump "omplower" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/omp_parse2.f b/gcc/testsuite/gfortran.dg/gomp/omp_parse2.f
index 510d337952c..b0946c3b37b 100644
--- a/gcc/testsuite/gfortran.dg/gomp/omp_parse2.f
+++ b/gcc/testsuite/gfortran.dg/gomp/omp_parse2.f
@@ -11,4 +11,3 @@ C$omp 	 	p
       end
 
 ! { dg-final { scan-tree-dump-times "pragma omp parallel" 2 "omplower" } }
-! { dg-final { cleanup-tree-dump "omplower" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-1.f90 b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-1.f90
index c9ce70c4f44..4765586982d 100644
--- a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-1.f90
@@ -134,4 +134,3 @@ end
 ! { dg-final { scan-tree-dump-times "pragma omp simd" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "pragma omp" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-2.f90 b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-2.f90
index 4b2046a58cc..e218a3b4e3c 100644
--- a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-2.f90
@@ -25,4 +25,3 @@ include 'openmp-simd-1.f90'
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_cancel" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_taskyield" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_taskwait" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-3.f90 b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-3.f90
index 2dece895f39..cbf757e20e5 100644
--- a/gcc/testsuite/gfortran.dg/gomp/openmp-simd-3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/openmp-simd-3.f90
@@ -25,4 +25,3 @@ include 'openmp-simd-1.f90'
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_cancel" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_taskyield" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_GOMP_taskwait" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare2.f90 b/gcc/testsuite/gfortran.dg/gomp/workshare2.f90
index 26023c8da15..9260a5b9b1e 100644
--- a/gcc/testsuite/gfortran.dg/gomp/workshare2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/workshare2.f90
@@ -50,4 +50,3 @@ program foo
 
 end program foo
 ! { dg-final { scan-tree-dump-times "__var" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/gomp/workshare3.f90 b/gcc/testsuite/gfortran.dg/gomp/workshare3.f90
index 579eb717329..111959ba6bd 100644
--- a/gcc/testsuite/gfortran.dg/gomp/workshare3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/workshare3.f90
@@ -36,4 +36,3 @@ program foo
 
 end program foo
 ! { dg-final { scan-tree-dump-times "__builtin_cosf" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/block-1.f90 b/gcc/testsuite/gfortran.dg/graphite/block-1.f90
index 115549bb4dc..253efd74a0a 100644
--- a/gcc/testsuite/gfortran.dg/graphite/block-1.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/block-1.f90
@@ -9,5 +9,4 @@ end subroutine matrix_multiply
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
 
diff --git a/gcc/testsuite/gfortran.dg/graphite/block-2.f b/gcc/testsuite/gfortran.dg/graphite/block-2.f
index 047d47897d6..5cc1445ea41 100644
--- a/gcc/testsuite/gfortran.dg/graphite/block-2.f
+++ b/gcc/testsuite/gfortran.dg/graphite/block-2.f
@@ -18,4 +18,3 @@
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "will be loop blocked" 2 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/block-3.f90 b/gcc/testsuite/gfortran.dg/graphite/block-3.f90
index 9a66adffd92..452de734905 100644
--- a/gcc/testsuite/gfortran.dg/graphite/block-3.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/block-3.f90
@@ -14,5 +14,4 @@ end subroutine matrix_multiply
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
 
diff --git a/gcc/testsuite/gfortran.dg/graphite/block-4.f90 b/gcc/testsuite/gfortran.dg/graphite/block-4.f90
index 061830fb973..42af5b62444 100644
--- a/gcc/testsuite/gfortran.dg/graphite/block-4.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/block-4.f90
@@ -17,5 +17,4 @@ end subroutine matrix_multiply
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
 
diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-1.f b/gcc/testsuite/gfortran.dg/graphite/interchange-1.f
index 334fbd8246a..d19cf70c166 100644
--- a/gcc/testsuite/gfortran.dg/graphite/interchange-1.f
+++ b/gcc/testsuite/gfortran.dg/graphite/interchange-1.f
@@ -42,4 +42,3 @@
 ! kernel from bwaves.
 
 ! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-2.f b/gcc/testsuite/gfortran.dg/graphite/interchange-2.f
index 8e2e87f12ab..90fe15e8c07 100644
--- a/gcc/testsuite/gfortran.dg/graphite/interchange-2.f
+++ b/gcc/testsuite/gfortran.dg/graphite/interchange-2.f
@@ -40,4 +40,3 @@
 ! as the number of iterations for f4 is not known.
 
 ! { dg-final { scan-tree-dump-times "will be interchanged" 0 "graphite" } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 b/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90
index 06da2b3aa53..ffc84b60703 100644
--- a/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90
@@ -25,4 +25,3 @@ Program FOO
 end Program FOO
 
 ! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-4.f b/gcc/testsuite/gfortran.dg/graphite/interchange-4.f
index 3d42811bc56..567b3953a99 100644
--- a/gcc/testsuite/gfortran.dg/graphite/interchange-4.f
+++ b/gcc/testsuite/gfortran.dg/graphite/interchange-4.f
@@ -26,4 +26,3 @@ c
       end
 
 ! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-5.f b/gcc/testsuite/gfortran.dg/graphite/interchange-5.f
index 658f10a74d7..04ab49fb568 100644
--- a/gcc/testsuite/gfortran.dg/graphite/interchange-5.f
+++ b/gcc/testsuite/gfortran.dg/graphite/interchange-5.f
@@ -27,4 +27,3 @@ c
       end
 
 ! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/pr14741.f90 b/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
index 3fe1d690c38..4dfdd077fcf 100644
--- a/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr14741.f90
@@ -26,4 +26,3 @@ END SUBROUTINE mult
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } }
 ! { dg-final { scan-tree-dump-times "will be loop blocked" 1 "graphite" { xfail *-*-* } } }
-! { dg-final { cleanup-tree-dump "graphite" } }
diff --git a/gcc/testsuite/gfortran.dg/graphite/scop-1.f b/gcc/testsuite/gfortran.dg/graphite/scop-1.f
index 5bd463c4e9c..d633f756783 100644
--- a/gcc/testsuite/gfortran.dg/graphite/scop-1.f
+++ b/gcc/testsuite/gfortran.dg/graphite/scop-1.f
@@ -10,4 +10,3 @@
       end
 
 ! { dg-final { scan-tree-dump-times "number of SCoPs: 1" 1 "graphite" { xfail *-*-* } } } 
-! { dg-final { cleanup-tree-dump "graphite" } } 
diff --git a/gcc/testsuite/gfortran.dg/graphite/vect-pr40979.f90 b/gcc/testsuite/gfortran.dg/graphite/vect-pr40979.f90
index f620d0c85cc..a42290948c4 100644
--- a/gcc/testsuite/gfortran.dg/graphite/vect-pr40979.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/vect-pr40979.f90
@@ -24,4 +24,3 @@ contains
 end module mqc_m
 
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 b/gcc/testsuite/gfortran.dg/implicit_pure_3.f90
index d9d7734dab3..d3751596a45 100644
--- a/gcc/testsuite/gfortran.dg/implicit_pure_3.f90
+++ b/gcc/testsuite/gfortran.dg/implicit_pure_3.f90
@@ -106,4 +106,3 @@ END MODULE
 
 ! { dg-final { scan-module-absence "parallel_rng_types" "IMPLICIT_PURE" } }
 ! { dg-final { scan-tree-dump-times "rn32 \\(rng_stream" 3 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/index_2.f90 b/gcc/testsuite/gfortran.dg/index_2.f90
index 74845b96656..9b92f0acee7 100644
--- a/gcc/testsuite/gfortran.dg/index_2.f90
+++ b/gcc/testsuite/gfortran.dg/index_2.f90
@@ -53,4 +53,3 @@
 
 ! { dg-final { scan-tree-dump-times "if ..integer.kind=1.. _gfortran_string_index" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "if ..integer.kind=1.. _gfortran_string_scan" 6 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_1.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_1.f90
index 2199fc68605..266aad073d4 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_1.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_1.f90
@@ -150,4 +150,3 @@ program main
 end program main
 
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_11.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_11.f90
index c3733bac427..783c83c729a 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_11.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_11.f90
@@ -30,4 +30,3 @@ program main
   if (any(conjg(c) /= res2)) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_2.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_2.f90
index 6f56f65e0b0..007e4a38150 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_2.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_2.f90
@@ -62,4 +62,3 @@ program main
 
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 8 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_3.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_3.f90
index 4f00c1a2921..96e53dc4633 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_3.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_3.f90
@@ -62,4 +62,3 @@ program main
 
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 8 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_4.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_4.f90
index b2253b14daa..bd25e6b1a9f 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_4.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_4.f90
@@ -64,5 +64,3 @@ program main
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 4 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "original" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_6.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_6.f90
index 54b0ecc230e..b3030162f86 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_6.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_6.f90
@@ -46,4 +46,3 @@ program main
 end program main
 
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_7.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_7.f90
index 24f610a1850..fa2021dd856 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_7.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_7.f90
@@ -32,4 +32,3 @@ program main
 
 END program main
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_8.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_8.f90
index f7d2846de58..bc8bc4a5b18 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_8.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_8.f90
@@ -15,4 +15,3 @@ program main
 end program main
 
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_9.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_9.f90
index ae80b18a91c..67b9fcad398 100644
--- a/gcc/testsuite/gfortran.dg/inline_matmul_9.f90
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_9.f90
@@ -22,4 +22,3 @@ program main
 end program main
 
 ! { dg-final { scan-tree-dump-times "_gfortran_matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_product_1.f90 b/gcc/testsuite/gfortran.dg/inline_product_1.f90
index 72c096bff4a..3ecf0dff677 100644
--- a/gcc/testsuite/gfortran.dg/inline_product_1.f90
+++ b/gcc/testsuite/gfortran.dg/inline_product_1.f90
@@ -29,4 +29,3 @@ end
 ! { dg-final { scan-tree-dump-times "struct array._integer\\(kind=4\\) atmp" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "struct array\[^\\n\]*atmp" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_product_" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_sum_1.f90 b/gcc/testsuite/gfortran.dg/inline_sum_1.f90
index 4538e5e117f..a9d4f7baa78 100644
--- a/gcc/testsuite/gfortran.dg/inline_sum_1.f90
+++ b/gcc/testsuite/gfortran.dg/inline_sum_1.f90
@@ -191,4 +191,3 @@ end
 ! { dg-final { scan-tree-dump-times "struct array._integer\\(kind=4\\) atmp" 13 "original" } }
 ! { dg-final { scan-tree-dump-times "struct array\[^\\n\]*atmp" 13 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_sum_" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/inline_transpose_1.f90 b/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
index a364842517c..5efd9558d61 100644
--- a/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
+++ b/gcc/testsuite/gfortran.dg/inline_transpose_1.f90
@@ -234,5 +234,3 @@ end subroutine titi
 ! { # Commented out as failing at -O0: dg-final { scan-tree-dump-times "_gfortran_abort" 37 "optimized" } }
 !
 ! cleanup
-! { dg-final { cleanup-tree-dump "original" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/intent_optimize_1.f90 b/gcc/testsuite/gfortran.dg/intent_optimize_1.f90
index dbe0128d7f0..029557d00c6 100644
--- a/gcc/testsuite/gfortran.dg/intent_optimize_1.f90
+++ b/gcc/testsuite/gfortran.dg/intent_optimize_1.f90
@@ -21,4 +21,3 @@ if (y /= 5) call does_not_exist ()
 end
 
 ! { dg-final { scan-tree-dump-times "does_not_exist" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_11.f90 b/gcc/testsuite/gfortran.dg/internal_pack_11.f90
index 8f573b4fd95..a1d357cee73 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_11.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_11.f90
@@ -15,4 +15,3 @@
   call foo (ot(0:time_steps)) ! Was an unnecessary temporary
   end
 ! { dg-final { scan-tree-dump-times "unpack" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_12.f90 b/gcc/testsuite/gfortran.dg/internal_pack_12.f90
index bdcc7d10908..532cac112ed 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_12.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_12.f90
@@ -56,4 +56,3 @@ subroutine bar(x)
   if (any (x(1:3) /= [1,3,5])) call abort ()
 end subroutine bar
 ! { dg-final { scan-tree-dump-times "unpack" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_4.f90 b/gcc/testsuite/gfortran.dg/internal_pack_4.f90
index 0bcfc799a8e..368e9804bc4 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_4.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_4.f90
@@ -28,4 +28,3 @@ END
 
 ! { dg-final { scan-tree-dump-times "a != 0B \\? \\\(.*\\\) _gfortran_internal_pack" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "if \\(a != 0B &&" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_5.f90 b/gcc/testsuite/gfortran.dg/internal_pack_5.f90
index 87705fa716a..3c5868f9efc 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_5.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_5.f90
@@ -18,4 +18,3 @@ end program test
 
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_pack" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_unpack" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_6.f90 b/gcc/testsuite/gfortran.dg/internal_pack_6.f90
index 7ec32257592..7928fecd442 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_6.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_6.f90
@@ -55,4 +55,3 @@ END SUBROUTINE S2
  call s2
 end
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_pack" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_7.f90 b/gcc/testsuite/gfortran.dg/internal_pack_7.f90
index 2a056fcb90c..967835e5f56 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_7.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_7.f90
@@ -31,4 +31,3 @@ CONTAINS
   END FUNCTION S2
 END MODULE M1
 ! { dg-final { scan-tree-dump-times "pack" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/internal_pack_9.f90 b/gcc/testsuite/gfortran.dg/internal_pack_9.f90
index 6e69745e68a..9ce53f44354 100644
--- a/gcc/testsuite/gfortran.dg/internal_pack_9.f90
+++ b/gcc/testsuite/gfortran.dg/internal_pack_9.f90
@@ -38,4 +38,3 @@ subroutine foobar
   call foo(A(:,3:7:-1)) ! temporary(3) OK because of stride
 end
 ! { dg-final { scan-tree-dump-times "unpack" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/intrinsic_optional_char_arg_1.f90 b/gcc/testsuite/gfortran.dg/intrinsic_optional_char_arg_1.f90
index 3215f43fa40..5352ee4bf26 100644
--- a/gcc/testsuite/gfortran.dg/intrinsic_optional_char_arg_1.f90
+++ b/gcc/testsuite/gfortran.dg/intrinsic_optional_char_arg_1.f90
@@ -29,4 +29,3 @@ END PROGRAM main
 ! { dg-final { scan-tree-dump "_eoshift\[0-9_\]+char \\(\[&a-zA-Z0-9._, \]+, 1, 0\\)" "original" } }
 ! { dg-final { scan-tree-dump "_reshape\[0-9_\]+char \\(\[&a-zA-Z0-9._, \]+, 1, 0\\)" "original" } }
 ! { dg-final { scan-tree-dump "_pack\[0-9_\]+char \\(\[&a-zA-Z0-9._, \]+, 1, 0\\)" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/intrinsic_size_3.f90 b/gcc/testsuite/gfortran.dg/intrinsic_size_3.f90
index 5856509bf59..923cbc3473d 100644
--- a/gcc/testsuite/gfortran.dg/intrinsic_size_3.f90
+++ b/gcc/testsuite/gfortran.dg/intrinsic_size_3.f90
@@ -23,4 +23,3 @@ program bug
 end program bug
 
 ! { dg-final { scan-tree-dump-times "iszs = \\(integer\\(kind=2\\)\\) MAX_EXPR <\\(D.\[0-9\]+->dim.0..ubound - D.\[0-9\]+->dim.0..lbound\\) \\+ 1, 0>;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/intrinsic_std_6.f90 b/gcc/testsuite/gfortran.dg/intrinsic_std_6.f90
index 6b2eee459b1..24e35668d4f 100644
--- a/gcc/testsuite/gfortran.dg/intrinsic_std_6.f90
+++ b/gcc/testsuite/gfortran.dg/intrinsic_std_6.f90
@@ -38,4 +38,3 @@ END SUBROUTINE implicit_type
 ! { dg-final { scan-tree-dump " abort " "original" } }
 ! { dg-final { scan-tree-dump " asinh " "original" } }
 ! { dg-final { scan-tree-dump " acosh " "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/ipcp-array-1.f90 b/gcc/testsuite/gfortran.dg/ipcp-array-1.f90
index e39109c976c..81cc61509cc 100644
--- a/gcc/testsuite/gfortran.dg/ipcp-array-1.f90
+++ b/gcc/testsuite/gfortran.dg/ipcp-array-1.f90
@@ -13,7 +13,5 @@ end
 
 ! { dg-final { scan-ipa-dump "Creating a specialized node of foo" "cp" } }
 ! { dg-final { scan-ipa-dump-times "Aggregate replacements\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=" 2 "cp" } }
-! { dg-final { cleanup-ipa-dump "cp" } }
 ! { dg-final { scan-tree-dump-not "stride;" "optimized" } }
 ! { dg-final { scan-tree-dump-not "lbound;" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/ishft_4.f90 b/gcc/testsuite/gfortran.dg/ishft_4.f90
index 4e2ad2b137f..bb914651ba5 100644
--- a/gcc/testsuite/gfortran.dg/ishft_4.f90
+++ b/gcc/testsuite/gfortran.dg/ishft_4.f90
@@ -37,4 +37,3 @@ end program
 !
 ! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 5 "original" } }
 ! { dg-final { scan-tree-dump-times "bar *\\\(\\\)" 5 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/iso_c_binding_param_2.f90 b/gcc/testsuite/gfortran.dg/iso_c_binding_param_2.f90
index 7b78743452a..2beb2dfafb7 100644
--- a/gcc/testsuite/gfortran.dg/iso_c_binding_param_2.f90
+++ b/gcc/testsuite/gfortran.dg/iso_c_binding_param_2.f90
@@ -17,4 +17,3 @@ if (c_float128_complex >= 0 .and. c_float128_complex /= 16) call unreachable()
 end
 
 ! { dg-final { scan-tree-dump-times "unreachable" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90 b/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90
index 92c2e40dea5..d87ce43f31f 100644
--- a/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90
+++ b/gcc/testsuite/gfortran.dg/iso_fortran_env_5.f90
@@ -23,5 +23,4 @@ if (STAT_LOCKED == STAT_UNLOCKED) call abort()
 end
 
 ! { dg-final { scan-tree-dump-times "abort" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/ldist-1.f90 b/gcc/testsuite/gfortran.dg/ldist-1.f90
index bbce2f355e1..ea3990d12b4 100644
--- a/gcc/testsuite/gfortran.dg/ldist-1.f90
+++ b/gcc/testsuite/gfortran.dg/ldist-1.f90
@@ -33,4 +33,3 @@ end Subroutine PADEC
 ! locality heuristic, this loop should not be split.
 
 ! { dg-final { scan-tree-dump-not "distributed: split to" "ldist" } }
-! { dg-final { cleanup-tree-dump "ldist" } }
diff --git a/gcc/testsuite/gfortran.dg/ldist-pr45199.f b/gcc/testsuite/gfortran.dg/ldist-pr45199.f
index e01d32f2664..2a02ba8b58b 100644
--- a/gcc/testsuite/gfortran.dg/ldist-pr45199.f
+++ b/gcc/testsuite/gfortran.dg/ldist-pr45199.f
@@ -24,4 +24,3 @@
 
 ! { dg-final { scan-tree-dump "distributed: split to 0 loops and 9 library calls" "ldist" } }
 ! { dg-final { scan-tree-dump-times "generated memset zero" 9 "ldist" } }
-! { dg-final { cleanup-tree-dump "ldist" } }
diff --git a/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90 b/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
index b54a11f63da..e6ad9f385d1 100644
--- a/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
+++ b/gcc/testsuite/gfortran.dg/leadz_trailz_3.f90
@@ -27,4 +27,3 @@ end program
 !   -- plus as many times as the function is called
 !
 ! { dg-final { scan-tree-dump-times "foo *\\\(\\\)" 7 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/matmul_9.f90 b/gcc/testsuite/gfortran.dg/matmul_9.f90
index bf2a299c821..4d582647775 100644
--- a/gcc/testsuite/gfortran.dg/matmul_9.f90
+++ b/gcc/testsuite/gfortran.dg/matmul_9.f90
@@ -43,5 +43,4 @@ program name
 end program name
 
 ! { dg-final { scan-tree-dump-times "matmul" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/merge_init_expr_2.f90 b/gcc/testsuite/gfortran.dg/merge_init_expr_2.f90
index 9b20310caf5..71bc3a5b083 100644
--- a/gcc/testsuite/gfortran.dg/merge_init_expr_2.f90
+++ b/gcc/testsuite/gfortran.dg/merge_init_expr_2.f90
@@ -55,4 +55,3 @@ end subroutine test
 ! { dg-final { scan-tree-dump-times "check1 = 1275069467;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "check2 = 1;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "__builtin_memmove ..void .. &three, .void .. &one, 3.;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/missing_optional_dummy_4.f90 b/gcc/testsuite/gfortran.dg/missing_optional_dummy_4.f90
index 30db273c5d9..1558f17d8fb 100644
--- a/gcc/testsuite/gfortran.dg/missing_optional_dummy_4.f90
+++ b/gcc/testsuite/gfortran.dg/missing_optional_dummy_4.f90
@@ -23,4 +23,3 @@ contains
 end module krmod
 
 ! { dg-final { scan-tree-dump " tm_doit \\(0B, 0\\);" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90 b/gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90
index 1130d43f408..e3324f57600 100644
--- a/gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90
+++ b/gcc/testsuite/gfortran.dg/missing_optional_dummy_5.f90
@@ -24,4 +24,3 @@ contains
 end module krmod
 
 ! { dg-final { scan-tree-dump " tm_doit \\(&parm\.., 0B, 0\\);" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/missing_optional_dummy_6.f90 b/gcc/testsuite/gfortran.dg/missing_optional_dummy_6.f90
index 408582289f1..8c2ea6a8a89 100644
--- a/gcc/testsuite/gfortran.dg/missing_optional_dummy_6.f90
+++ b/gcc/testsuite/gfortran.dg/missing_optional_dummy_6.f90
@@ -57,4 +57,3 @@ end program test
 ! { dg-final { scan-tree-dump-times "assumed_shape2 \\(as1" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "explicit_shape2 \\(as1" 0 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/move_alloc_4.f90 b/gcc/testsuite/gfortran.dg/move_alloc_4.f90
index b23ef70bb93..71b1f874473 100644
--- a/gcc/testsuite/gfortran.dg/move_alloc_4.f90
+++ b/gcc/testsuite/gfortran.dg/move_alloc_4.f90
@@ -21,4 +21,3 @@ program testmv3
 end program testmv3 
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 9 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/no_arg_check_2.f90 b/gcc/testsuite/gfortran.dg/no_arg_check_2.f90
index 5ff98940d6f..3645dedeb21 100644
--- a/gcc/testsuite/gfortran.dg/no_arg_check_2.f90
+++ b/gcc/testsuite/gfortran.dg/no_arg_check_2.f90
@@ -150,4 +150,3 @@ end
 ! { dg-final { scan-tree-dump-times "sub_array_assumed \\(\\(struct t1.0:. . restrict\\) array_class_t1_alloc._data.data\\);" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "sub_array_assumed \\(\\(struct t1.0:. .\\) array_class_t1_ptr._data.data\\);" 1 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90 b/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
index f5a33f8b0db..9be3041a1d2 100644
--- a/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
+++ b/gcc/testsuite/gfortran.dg/parameter_array_element_1.f90
@@ -15,5 +15,4 @@
 END
 ! Scan for the 105 in the declaration real8 out_val[105];
 ! { dg-final { scan-tree-dump-times "105" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/power_3.f90 b/gcc/testsuite/gfortran.dg/power_3.f90
index 381c5d31859..001ea7347a0 100644
--- a/gcc/testsuite/gfortran.dg/power_3.f90
+++ b/gcc/testsuite/gfortran.dg/power_3.f90
@@ -35,4 +35,3 @@ program main
 
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_pow_i4_i4" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/power_4.f90 b/gcc/testsuite/gfortran.dg/power_4.f90
index 1d532596649..3b2688c77b8 100644
--- a/gcc/testsuite/gfortran.dg/power_4.f90
+++ b/gcc/testsuite/gfortran.dg/power_4.f90
@@ -26,4 +26,3 @@ program main
   if (any(d /= e)) call abort
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_pow_i4_i4" 3 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/power_5.f90 b/gcc/testsuite/gfortran.dg/power_5.f90
index f42b26051cb..e9e591e7dd2 100644
--- a/gcc/testsuite/gfortran.dg/power_5.f90
+++ b/gcc/testsuite/gfortran.dg/power_5.f90
@@ -33,4 +33,3 @@ program main
 
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_pow_i4_i4" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/power_6.f90 b/gcc/testsuite/gfortran.dg/power_6.f90
index 65d1bd02684..7d3a1f412f3 100644
--- a/gcc/testsuite/gfortran.dg/power_6.f90
+++ b/gcc/testsuite/gfortran.dg/power_6.f90
@@ -12,4 +12,3 @@ end
 ! { dg-final { scan-tree-dump-not "__builtin_powif"  "optimized" } }
 ! { dg-final { scan-tree-dump "powi_cond_\[0-9\] = k_\[0-9\]\\(D\\) & 1;"  "optimized" } }
 ! { dg-final { scan-tree-dump "powi_\[0-9\] = powi_cond_\[0-9\] \\? -1.0e\\+0 : 1.0e\\+0;"  "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/pr26246_1.f90 b/gcc/testsuite/gfortran.dg/pr26246_1.f90
index a1cb45535fe..49f3f8cafdc 100644
--- a/gcc/testsuite/gfortran.dg/pr26246_1.f90
+++ b/gcc/testsuite/gfortran.dg/pr26246_1.f90
@@ -15,4 +15,3 @@ module pr26246_1
 end module pr26246_1
 
 ! { dg-final { scan-tree-dump-times "static int" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/pr26246_2.f90 b/gcc/testsuite/gfortran.dg/pr26246_2.f90
index 440e868561c..3ed2c12653e 100644
--- a/gcc/testsuite/gfortran.dg/pr26246_2.f90
+++ b/gcc/testsuite/gfortran.dg/pr26246_2.f90
@@ -10,4 +10,3 @@ subroutine foo(string, n)
 end subroutine foo
 
 ! { dg-final { scan-tree-dump-times "static int" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/pr32921.f b/gcc/testsuite/gfortran.dg/pr32921.f
index 45ea6479b8a..1c45d1e8921 100644
--- a/gcc/testsuite/gfortran.dg/pr32921.f
+++ b/gcc/testsuite/gfortran.dg/pr32921.f
@@ -46,4 +46,3 @@
       RETURN
       END
 ! { dg-final { scan-tree-dump-times "stride" 4 "lim1" } }
-! { dg-final { cleanup-tree-dump "lim1" } }
diff --git a/gcc/testsuite/gfortran.dg/pr34163.f90 b/gcc/testsuite/gfortran.dg/pr34163.f90
index 642617736b9..1c948961ed9 100644
--- a/gcc/testsuite/gfortran.dg/pr34163.f90
+++ b/gcc/testsuite/gfortran.dg/pr34163.f90
@@ -13,4 +13,3 @@ do i = i1+1 , i2
 enddo
 end subroutine trisolve2
 ! { dg-final { scan-tree-dump "Executing predictive commoning" "pcom" } }
-! { dg-final { cleanup-tree-dump "pcom" } }
diff --git a/gcc/testsuite/gfortran.dg/pr38868.f b/gcc/testsuite/gfortran.dg/pr38868.f
index 6acd52b186c..a8c4469f089 100644
--- a/gcc/testsuite/gfortran.dg/pr38868.f
+++ b/gcc/testsuite/gfortran.dg/pr38868.f
@@ -14,4 +14,3 @@
       END
 
 ! { dg-final { scan-rtl-dump-times "line\\\+80" 0 "expand" } }
-! { dg-final { cleanup-rtl-dump "expand" } } */
diff --git a/gcc/testsuite/gfortran.dg/pr42108.f90 b/gcc/testsuite/gfortran.dg/pr42108.f90
index 020a0a13ac4..c823edbf792 100644
--- a/gcc/testsuite/gfortran.dg/pr42108.f90
+++ b/gcc/testsuite/gfortran.dg/pr42108.f90
@@ -25,5 +25,3 @@ end subroutine eval
 ! { dg-final { scan-tree-dump "in all uses of countm1\[^\n\]* / " "pre" } }
 ! There should be only one load from n left
 ! { dg-final { scan-tree-dump-times "\\*n_" 1 "fre1" } }
-! { dg-final { cleanup-tree-dump "fre1" } }
-! { dg-final { cleanup-tree-dump "pre" } }
diff --git a/gcc/testsuite/gfortran.dg/pr43984.f90 b/gcc/testsuite/gfortran.dg/pr43984.f90
index 40c81b84c6c..bae70a6f153 100644
--- a/gcc/testsuite/gfortran.dg/pr43984.f90
+++ b/gcc/testsuite/gfortran.dg/pr43984.f90
@@ -53,4 +53,3 @@ end
 ! There should be three loads from iyz.data, not four.
 
 ! { dg-final { scan-tree-dump-times "= iyz.data" 3 "pre" } }
-! { dg-final { cleanup-tree-dump "pre" } }
diff --git a/gcc/testsuite/gfortran.dg/pr45636.f90 b/gcc/testsuite/gfortran.dg/pr45636.f90
index fcf2bec60a2..38ec634e9ee 100644
--- a/gcc/testsuite/gfortran.dg/pr45636.f90
+++ b/gcc/testsuite/gfortran.dg/pr45636.f90
@@ -13,4 +13,3 @@ end program main
 ! This test will fail on targets which prefer memcpy/memset over
 ! move_by_pieces/store_by_pieces.
 ! { dg-final { scan-tree-dump-times "memset" 0 "forwprop2" { xfail { { hppa*-*-* && { ! lp64 } } || { { mips*-*-* && { ! nomips16 } } || { aarch64*-*-* } } } } } }
-! { dg-final { cleanup-tree-dump "forwprop2" } }
diff --git a/gcc/testsuite/gfortran.dg/pr48636-2.f90 b/gcc/testsuite/gfortran.dg/pr48636-2.f90
index bab77fa43b5..30a7e75614a 100644
--- a/gcc/testsuite/gfortran.dg/pr48636-2.f90
+++ b/gcc/testsuite/gfortran.dg/pr48636-2.f90
@@ -35,4 +35,3 @@ end program main
 
 ! { dg-final { scan-ipa-dump "Creating a specialized node of \[^\n\r\]*bar/\[0-9\]*\\." "cp" } }
 ! { dg-final { scan-ipa-dump-times "Aggregate replacements\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=\[^=\]*=" 2 "cp" } }
-! { dg-final { cleanup-ipa-dump "cp" } }
diff --git a/gcc/testsuite/gfortran.dg/pr48636.f90 b/gcc/testsuite/gfortran.dg/pr48636.f90
index f35eb519f61..94826fa4790 100644
--- a/gcc/testsuite/gfortran.dg/pr48636.f90
+++ b/gcc/testsuite/gfortran.dg/pr48636.f90
@@ -36,4 +36,3 @@ end program main
 ! { dg-final { scan-ipa-dump "bar\[^\\n\]*inline copy in MAIN" "inline" } }
 ! { dg-final { scan-ipa-dump-times "phi predicate:" 5 "inline" } }
 ! { dg-final { scan-ipa-dump "inline hints: loop_iterations" "inline" } }
-! { dg-final { cleanup-ipa-dump "inline" } }
diff --git a/gcc/testsuite/gfortran.dg/pr52835.f90 b/gcc/testsuite/gfortran.dg/pr52835.f90
index 3141b88b258..dab4078d5d3 100644
--- a/gcc/testsuite/gfortran.dg/pr52835.f90
+++ b/gcc/testsuite/gfortran.dg/pr52835.f90
@@ -13,4 +13,3 @@ subroutine foo (x, y, z, n)
 end subroutine
 
 ! { dg-final { scan-tree-dump "bar\[ _\]" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/pr53787.f90 b/gcc/testsuite/gfortran.dg/pr53787.f90
index 0103e9ddceb..f366a30bf59 100644
--- a/gcc/testsuite/gfortran.dg/pr53787.f90
+++ b/gcc/testsuite/gfortran.dg/pr53787.f90
@@ -18,4 +18,3 @@ end subroutine init
 
 ! { dg-final { scan-ipa-dump "Creating a specialized node of init" "cp" } }
 ! { dg-final { scan-ipa-dump-times "Aggregate replacements" 2 "cp" } }
-! { dg-final { cleanup-ipa-dump "cp" } }
diff --git a/gcc/testsuite/gfortran.dg/pr57987.f90 b/gcc/testsuite/gfortran.dg/pr57987.f90
index c881e6d64a3..12b60c5d7b5 100644
--- a/gcc/testsuite/gfortran.dg/pr57987.f90
+++ b/gcc/testsuite/gfortran.dg/pr57987.f90
@@ -21,4 +21,3 @@ contains
 end program test
 
 ! { dg-final { scan-ipa-dump-not "redefined extern inline functions are not considered for inlining" "inline" } }
-! { dg-final { cleanup-ipa-dump "inline" } }
diff --git a/gcc/testsuite/gfortran.dg/proc_decl_23.f90 b/gcc/testsuite/gfortran.dg/proc_decl_23.f90
index fa50dc13c86..6db9897e306 100644
--- a/gcc/testsuite/gfortran.dg/proc_decl_23.f90
+++ b/gcc/testsuite/gfortran.dg/proc_decl_23.f90
@@ -40,4 +40,3 @@ end module m_string
   print *, t%char3 (["g","h","i"])
   print *, char1 (["j","k","l"])
 end
-! { dg-final { cleanup-tree-dump "m_string" } }
diff --git a/gcc/testsuite/gfortran.dg/promotion_2.f90 b/gcc/testsuite/gfortran.dg/promotion_2.f90
index 3acf249705c..e5365093da7 100644
--- a/gcc/testsuite/gfortran.dg/promotion_2.f90
+++ b/gcc/testsuite/gfortran.dg/promotion_2.f90
@@ -13,4 +13,3 @@ end program test
 
 ! { dg-final { scan-tree-dump-times "sgemm_" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "dgemm_" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/rank_4.f90 b/gcc/testsuite/gfortran.dg/rank_4.f90
index a370df01c7d..d09d3fb1337 100644
--- a/gcc/testsuite/gfortran.dg/rank_4.f90
+++ b/gcc/testsuite/gfortran.dg/rank_4.f90
@@ -16,4 +16,3 @@ program test_rank
 end program test_rank
 
 ! { dg-final { scan-tree-dump-times "not_existing" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_18.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_18.f90
index d1743551e36..7dcd22e11b0 100644
--- a/gcc/testsuite/gfortran.dg/realloc_on_assign_18.f90
+++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_18.f90
@@ -17,4 +17,3 @@ end
 
 ! { dg-final { scan-tree-dump "x = \\(struct t .\\) __builtin_malloc \\(1\\);" "original" } }
 ! { dg-final { scan-tree-dump "y.data = \\(void . restrict\\) __builtin_malloc \\(1\\);" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/realloc_on_assign_19.f90 b/gcc/testsuite/gfortran.dg/realloc_on_assign_19.f90
index c54a35f40da..b1500418bb4 100644
--- a/gcc/testsuite/gfortran.dg/realloc_on_assign_19.f90
+++ b/gcc/testsuite/gfortran.dg/realloc_on_assign_19.f90
@@ -18,4 +18,3 @@ contains
   end subroutine bar
 end module foo
 ! { dg-final { scan-tree-dump-times "alloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_1.f90 b/gcc/testsuite/gfortran.dg/reassoc_1.f90
index 3857dedf71e..e3d84c4ffd9 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_1.f90
+++ b/gcc/testsuite/gfortran.dg/reassoc_1.f90
@@ -10,4 +10,3 @@ end
 ! We need an explicit +5 and -5, and an intermediate ((bla)) expression
 ! (the reassoc barrier).  Make use of "." matching lineends.
 ! { dg-final { scan-tree-dump "\\\+ 5.*\\\)\\\).* - 5" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_10.f b/gcc/testsuite/gfortran.dg/reassoc_10.f
index 698e2c49bb4..3720d8f414e 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_10.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_10.f
@@ -14,4 +14,3 @@
 ! and power expansion.
 
 ! { dg-final { scan-tree-dump-times " \\\* " 5 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_2.f90 b/gcc/testsuite/gfortran.dg/reassoc_2.f90
index 053cb865f3c..3e323eb0134 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_2.f90
+++ b/gcc/testsuite/gfortran.dg/reassoc_2.f90
@@ -13,4 +13,3 @@ function test(a)
 end
 
 ! { dg-final { scan-tree-dump "- 5" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_3.f90 b/gcc/testsuite/gfortran.dg/reassoc_3.f90
index 84a33972270..7331b0cd8e0 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_3.f90
+++ b/gcc/testsuite/gfortran.dg/reassoc_3.f90
@@ -16,5 +16,3 @@ end
 ! { dg-final { scan-tree-dump "b = 5" "original" } }
 ! { dg-final { scan-tree-dump "c_. = .a" "optimized" } }
 ! { dg-final { scan-tree-dump "return c_.;" "optimized" } }
-! { dg-final { cleanup-tree-dump "original" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_4.f b/gcc/testsuite/gfortran.dg/reassoc_4.f
index a6d5fa53f75..b155cba768c 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_4.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_4.f
@@ -41,4 +41,3 @@
 ! unrolled loops.
 
 ! { dg-final { scan-tree-dump-times "\[0-9\] \\\* " 22 "reassoc1" } }
-! { dg-final { cleanup-tree-dump "reassoc1" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_5.f90 b/gcc/testsuite/gfortran.dg/reassoc_5.f90
index 8d3086ab4e0..281b21bbe4e 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_5.f90
+++ b/gcc/testsuite/gfortran.dg/reassoc_5.f90
@@ -16,4 +16,3 @@ end
 ! We need an explicit +5 and -5, and an intermediate ((bla)) expression
 ! (the reassoc barrier).  Make use of "." matching lineends.
 ! { dg-final { scan-tree-dump-times "\\\+ 5.*\\\)\\\).* - 5" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_6.f b/gcc/testsuite/gfortran.dg/reassoc_6.f
index cbc36f5675b..724886f76aa 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_6.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_6.f
@@ -17,4 +17,3 @@
         end
 ! Verify that offset of the first element is simplified
 ! { dg-final { scan-tree-dump-not "~" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_7.f b/gcc/testsuite/gfortran.dg/reassoc_7.f
index 4f70ef6f9dd..04d2e678fa6 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_7.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_7.f
@@ -13,4 +13,3 @@
 ! There should be two multiplies following un-distribution.
 
 ! { dg-final { scan-tree-dump-times " \\\* " 2 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_8.f b/gcc/testsuite/gfortran.dg/reassoc_8.f
index 4a6ea72f220..a8aaa6008e8 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_8.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_8.f
@@ -14,4 +14,3 @@
 ! and power expansion.
 
 ! { dg-final { scan-tree-dump-times " \\\* " 3 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reassoc_9.f b/gcc/testsuite/gfortran.dg/reassoc_9.f
index 53950ee9bc9..5d9d15fa735 100644
--- a/gcc/testsuite/gfortran.dg/reassoc_9.f
+++ b/gcc/testsuite/gfortran.dg/reassoc_9.f
@@ -14,4 +14,3 @@
 ! and power expansion.
 
 ! { dg-final { scan-tree-dump-times " \\\* " 3 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/reshape_empty_1.f03 b/gcc/testsuite/gfortran.dg/reshape_empty_1.f03
index cac7e736085..df7a5d40653 100644
--- a/gcc/testsuite/gfortran.dg/reshape_empty_1.f03
+++ b/gcc/testsuite/gfortran.dg/reshape_empty_1.f03
@@ -17,4 +17,3 @@ if (K /= i) call abort
 end
 
 ! { dg-final { scan-tree-dump-times "\\\{1, 2, 2, 2, 1, 2, 2, 2, 1\\\}" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/scan_2.f90 b/gcc/testsuite/gfortran.dg/scan_2.f90
index 1e68130c3f5..c58a3a21a7f 100644
--- a/gcc/testsuite/gfortran.dg/scan_2.f90
+++ b/gcc/testsuite/gfortran.dg/scan_2.f90
@@ -32,4 +32,3 @@ end program p1
 
 ! { dg-final { scan-tree-dump-times "iscan = _gfortran_string_scan \\(2," 1 "original" } }
 ! { dg-final { scan-tree-dump-times "iverify = _gfortran_string_verify \\(2," 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/select_char_2.f90 b/gcc/testsuite/gfortran.dg/select_char_2.f90
index 22af1c76dfc..bcdc94a8861 100644
--- a/gcc/testsuite/gfortran.dg/select_char_2.f90
+++ b/gcc/testsuite/gfortran.dg/select_char_2.f90
@@ -42,4 +42,3 @@ contains
 end
 
 ! { dg-final { scan-tree-dump-not "_gfortran_select_string" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/shape_7.f90 b/gcc/testsuite/gfortran.dg/shape_7.f90
index 3c471f4d4a0..03f59511972 100644
--- a/gcc/testsuite/gfortran.dg/shape_7.f90
+++ b/gcc/testsuite/gfortran.dg/shape_7.f90
@@ -28,5 +28,4 @@ Program Main
 End Program Main
 
 ! { dg-final { scan-tree-dump-times "abort" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/single_char_string.f90 b/gcc/testsuite/gfortran.dg/single_char_string.f90
index 479456cfea8..cb56dc2afae 100644
--- a/gcc/testsuite/gfortran.dg/single_char_string.f90
+++ b/gcc/testsuite/gfortran.dg/single_char_string.f90
@@ -33,4 +33,3 @@ end
 ! { dg-final { scan-tree-dump-times "_gfortran_compare_string" 0 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_copy_string" 0 "original" } }
 
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/size_kind_2.f90 b/gcc/testsuite/gfortran.dg/size_kind_2.f90
index 002221c5b34..fe72ff55c05 100644
--- a/gcc/testsuite/gfortran.dg/size_kind_2.f90
+++ b/gcc/testsuite/gfortran.dg/size_kind_2.f90
@@ -14,4 +14,3 @@ end
 ! { dg-final { scan-tree-dump "static integer.kind=8. A..\\\[2\\\] = \\\{2147483650, 2\\\};" "original" } }
 ! { dg-final { scan-tree-dump "var2 = 4294967300;" "original" } }
 ! { dg-final { scan-tree-dump "var3 = 2147483650;" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/sizeof_3.f90 b/gcc/testsuite/gfortran.dg/sizeof_3.f90
index d6d1fc40954..ddf9997cb87 100644
--- a/gcc/testsuite/gfortran.dg/sizeof_3.f90
+++ b/gcc/testsuite/gfortran.dg/sizeof_3.f90
@@ -42,4 +42,3 @@ end
 ! { dg-final { scan-tree-dump-times "m2test = 1;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "iii = 100;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "jjj = 160;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/spread_size_limit.f90 b/gcc/testsuite/gfortran.dg/spread_size_limit.f90
index 62bc7a4a374..10a4e3e77ba 100644
--- a/gcc/testsuite/gfortran.dg/spread_size_limit.f90
+++ b/gcc/testsuite/gfortran.dg/spread_size_limit.f90
@@ -11,5 +11,4 @@ ZLON_MASK(:,:)= SPREAD( (/ (JLON , JLON=1,720) /) , DIM=2, NCOPIES=360 )
 print *, zlon_mask(100,100)
 END
 ! { dg-final { scan-tree-dump-times "_gfortran_spread" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/storage_size_4.f90 b/gcc/testsuite/gfortran.dg/storage_size_4.f90
index bcfd5c3e4f8..b66dcb9eec6 100644
--- a/gcc/testsuite/gfortran.dg/storage_size_4.f90
+++ b/gcc/testsuite/gfortran.dg/storage_size_4.f90
@@ -20,4 +20,3 @@ subroutine S ( A )
 end
 
 ! { dg-final { scan-tree-dump-not "abort" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/storage_size_5.f90 b/gcc/testsuite/gfortran.dg/storage_size_5.f90
index ae0f12661f0..66dd058a8af 100644
--- a/gcc/testsuite/gfortran.dg/storage_size_5.f90
+++ b/gcc/testsuite/gfortran.dg/storage_size_5.f90
@@ -41,4 +41,3 @@ end subroutine test2
 
 ! { dg-final { scan-tree-dump-times "k1 = \\(integer\\(kind=1\\)\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "k2 = \\(integer\\(kind=2\\)\\)" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/string_assign_1.f90 b/gcc/testsuite/gfortran.dg/string_assign_1.f90
index 8a520ff1dd9..09cbc916a4f 100644
--- a/gcc/testsuite/gfortran.dg/string_assign_1.f90
+++ b/gcc/testsuite/gfortran.dg/string_assign_1.f90
@@ -8,4 +8,3 @@ program main
   print *,c
 end program main
 ! { dg-final { scan-tree-dump-times "memcpy" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/string_compare_4.f90 b/gcc/testsuite/gfortran.dg/string_compare_4.f90
index 64cbf93bfd1..774257fa4e2 100644
--- a/gcc/testsuite/gfortran.dg/string_compare_4.f90
+++ b/gcc/testsuite/gfortran.dg/string_compare_4.f90
@@ -20,4 +20,3 @@ contains
   end subroutine foo
 end program main
 ! { dg-final { scan-tree-dump-times "_gfortran_string_len_trim" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/string_length_2.f90 b/gcc/testsuite/gfortran.dg/string_length_2.f90
index 8ea76bfe3bb..ff70eea687c 100644
--- a/gcc/testsuite/gfortran.dg/string_length_2.f90
+++ b/gcc/testsuite/gfortran.dg/string_length_2.f90
@@ -29,4 +29,3 @@ program main
   if (len(c(  (i-2)*(i-3)     :   (i-3)*(i-2)    )) /= 1)       call abort ! Case 18
 end program main
 ! { dg-final { scan-tree-dump-times "_abort" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/structure_constructor_11.f90 b/gcc/testsuite/gfortran.dg/structure_constructor_11.f90
index b1eb3cf5206..6ee6a162ff8 100644
--- a/gcc/testsuite/gfortran.dg/structure_constructor_11.f90
+++ b/gcc/testsuite/gfortran.dg/structure_constructor_11.f90
@@ -93,4 +93,3 @@ end program ala
 ! { dg-final { scan-tree-dump-times "this->_data->a.cleanup = \\*cleanup;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "ext_ptr.\[0-9\]+.init = this->_data->a.init;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "ext_ptr.\[0-9\]+.cleanup = this->_data->a.cleanup;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/transfer_intrinsic_1.f90 b/gcc/testsuite/gfortran.dg/transfer_intrinsic_1.f90
index b82b9b04026..5f46cd0bccf 100644
--- a/gcc/testsuite/gfortran.dg/transfer_intrinsic_1.f90
+++ b/gcc/testsuite/gfortran.dg/transfer_intrinsic_1.f90
@@ -15,4 +15,3 @@ subroutine BytesToString(bytes, string)
     string = transfer(bytes, string)
   end subroutine
 ! { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90 b/gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90
index e76bc49aeda..d07ac31c4cd 100644
--- a/gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90
+++ b/gcc/testsuite/gfortran.dg/transfer_intrinsic_6.f90
@@ -17,4 +17,3 @@
 end
 
 ! { dg-final { scan-tree-dump-times "__builtin_free" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/transfer_resolve_3.f90 b/gcc/testsuite/gfortran.dg/transfer_resolve_3.f90
index f3a58e27bee..59f41d734b7 100644
--- a/gcc/testsuite/gfortran.dg/transfer_resolve_3.f90
+++ b/gcc/testsuite/gfortran.dg/transfer_resolve_3.f90
@@ -16,5 +16,4 @@ intg = transfer (para%ptr, intg)
 end
 
 ! { dg-final { scan-tree-dump-times "intg = 0;" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/transpose_optimization_1.f90 b/gcc/testsuite/gfortran.dg/transpose_optimization_1.f90
index 885ff7c2034..82116e7f87f 100644
--- a/gcc/testsuite/gfortran.dg/transpose_optimization_1.f90
+++ b/gcc/testsuite/gfortran.dg/transpose_optimization_1.f90
@@ -103,4 +103,3 @@ contains
 end module foo
 
 ! { dg-final { scan-tree-dump-times "struct\[^\\n\]*atmp" 4 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/transpose_optimization_2.f90 b/gcc/testsuite/gfortran.dg/transpose_optimization_2.f90
index 54ef8417eb9..baa9ad5fff8 100644
--- a/gcc/testsuite/gfortran.dg/transpose_optimization_2.f90
+++ b/gcc/testsuite/gfortran.dg/transpose_optimization_2.f90
@@ -62,4 +62,3 @@ end
 !
 ! { dg-final { scan-tree-dump-times "parm" 66 "original" } }
 ! { dg-final { scan-tree-dump-times "atmp" 12 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_1.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_1.f90
index e208a50b0d7..6cf501e5c29 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_1.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_1.f90
@@ -13,4 +13,3 @@ end program main
 
 ! { dg-final { scan-tree-dump-times "memmove" 3 "original" } }
 ! { dg-final { scan-tree-dump-times "string_trim" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_2.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_2.f90
index 2ac36d11d7d..6fe9bd451c0 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_2.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_2.f90
@@ -34,4 +34,3 @@ end program main
 
 ! { dg-final { scan-tree-dump-times "memmove" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "string_trim" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_3.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_3.f90
index 33cf8b2b940..45c9cd8690c 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_3.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_3.f90
@@ -13,4 +13,3 @@ program main
   if (b4 /= 4_'bcdx') call abort
 end
 ! { dg-final { scan-tree-dump-times "string_len_trim" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_5.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_5.f90
index 40445e5147d..63f12584a07 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_5.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_5.f90
@@ -17,4 +17,3 @@ program main
   if (line /= 'abY       ') call abort
 end program main
 ! { dg-final { scan-tree-dump-times "string_len_trim" 2 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_7.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_7.f90
index 26663c04d27..a9349df58df 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_7.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_7.f90
@@ -16,4 +16,3 @@ program main
   if (d /= 'a b a c ') call abort
 end
 ! { dg-final { scan-tree-dump-times "string_len_trim" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/trim_optimize_8.f90 b/gcc/testsuite/gfortran.dg/trim_optimize_8.f90
index 60dfd193a48..48055ca19e1 100644
--- a/gcc/testsuite/gfortran.dg/trim_optimize_8.f90
+++ b/gcc/testsuite/gfortran.dg/trim_optimize_8.f90
@@ -11,4 +11,3 @@ program main
   if (trim (trim(a) // trim(b)) /= 'ab ') call abort
 end
 ! { dg-final { scan-tree-dump-times "string_len_trim" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/typebound_assignment_5.f03 b/gcc/testsuite/gfortran.dg/typebound_assignment_5.f03
index 3ee4848fc37..63df50f9127 100644
--- a/gcc/testsuite/gfortran.dg/typebound_assignment_5.f03
+++ b/gcc/testsuite/gfortran.dg/typebound_assignment_5.f03
@@ -41,4 +41,3 @@
 
 ! { dg-final { scan-tree-dump-not "_gfortran_internal_pack" "original" } }
 ! { dg-final { scan-tree-dump-not "_gfortran_internal_unpack" "original" } }
-! { dg-final { cleanup-tree-dump "original"} }
diff --git a/gcc/testsuite/gfortran.dg/typebound_assignment_6.f03 b/gcc/testsuite/gfortran.dg/typebound_assignment_6.f03
index c17de3e3d7c..43175068b7f 100644
--- a/gcc/testsuite/gfortran.dg/typebound_assignment_6.f03
+++ b/gcc/testsuite/gfortran.dg/typebound_assignment_6.f03
@@ -39,5 +39,4 @@
 
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_pack" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "_gfortran_internal_unpack" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/typebound_call_21.f03 b/gcc/testsuite/gfortran.dg/typebound_call_21.f03
index e31bd6de41d..47bbf348294 100644
--- a/gcc/testsuite/gfortran.dg/typebound_call_21.f03
+++ b/gcc/testsuite/gfortran.dg/typebound_call_21.f03
@@ -34,4 +34,3 @@ end module m
 end
 
 ! { dg-final { scan-tree-dump-times "_vptr->" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/typebound_call_22.f03 b/gcc/testsuite/gfortran.dg/typebound_call_22.f03
index 31e5894372c..b9f0b712573 100644
--- a/gcc/testsuite/gfortran.dg/typebound_call_22.f03
+++ b/gcc/testsuite/gfortran.dg/typebound_call_22.f03
@@ -27,4 +27,3 @@ program test
 end program
 
 ! { dg-final { scan-tree-dump-times "base \\(\\);" 1 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/typebound_operator_14.f90 b/gcc/testsuite/gfortran.dg/typebound_operator_14.f90
index 86c65d77f3e..eeda17fb5c0 100644
--- a/gcc/testsuite/gfortran.dg/typebound_operator_14.f90
+++ b/gcc/testsuite/gfortran.dg/typebound_operator_14.f90
@@ -39,4 +39,3 @@ contains
   end function gt_cmp_int
 end module
 
-! { dg-final { cleanup-tree-dump "m_sort test" } }
diff --git a/gcc/testsuite/gfortran.dg/typebound_proc_27.f03 b/gcc/testsuite/gfortran.dg/typebound_proc_27.f03
index ce845a03b06..29332c4169c 100644
--- a/gcc/testsuite/gfortran.dg/typebound_proc_27.f03
+++ b/gcc/testsuite/gfortran.dg/typebound_proc_27.f03
@@ -88,5 +88,4 @@ end program prog
 ! take the realloc path after the first assignment, so don't count as a malloc.
 ! { dg-final { scan-tree-dump-times "__builtin_free" 7 "original" } }
 !
-! { dg-final { cleanup-tree-dump "original" } }
 
diff --git a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_11.f90 b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_11.f90
index 5b73b3281d5..bbd3d067f3f 100644
--- a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_11.f90
+++ b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_11.f90
@@ -11,4 +11,3 @@
 end
 
 ! { dg-final { scan-tree-dump "\\(struct __vtype__STAR \\*\\) c._vptr = \\(struct __vtype__STAR \\*\\) a._vptr;" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_8.f90 b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_8.f90
index 3b40e131efb..46b9a9f6518 100644
--- a/gcc/testsuite/gfortran.dg/unlimited_polymorphic_8.f90
+++ b/gcc/testsuite/gfortran.dg/unlimited_polymorphic_8.f90
@@ -17,4 +17,3 @@ end
 
 ! { dg-final { scan-tree-dump-times "foo.0.x._data = 0B;" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "foo.0.x._vptr = .* &__vtab__STAR;" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/use_rename_6.f90 b/gcc/testsuite/gfortran.dg/use_rename_6.f90
index 02f25c36e97..35b225f8445 100644
--- a/gcc/testsuite/gfortran.dg/use_rename_6.f90
+++ b/gcc/testsuite/gfortran.dg/use_rename_6.f90
@@ -37,4 +37,3 @@ subroutine four()
 end subroutine four
 
 ! { dg-final { scan-tree-dump-times "shall_not_be_there" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/O3-pr36119.f90 b/gcc/testsuite/gfortran.dg/vect/O3-pr36119.f90
index 432e8485a5a..148adf5e6df 100644
--- a/gcc/testsuite/gfortran.dg/vect/O3-pr36119.f90
+++ b/gcc/testsuite/gfortran.dg/vect/O3-pr36119.f90
@@ -25,4 +25,3 @@ SUBROUTINE check_dnucint_ana (dcore)
   END IF
 END SUBROUTINE check_dnucint_ana
 
-! { dg-final { cleanup-tree-dump "vect" } } 
diff --git a/gcc/testsuite/gfortran.dg/vect/O3-pr39595.f b/gcc/testsuite/gfortran.dg/vect/O3-pr39595.f
index 021d35b90ea..50725fe4d4f 100644
--- a/gcc/testsuite/gfortran.dg/vect/O3-pr39595.f
+++ b/gcc/testsuite/gfortran.dg/vect/O3-pr39595.f
@@ -13,5 +13,4 @@
       end do
       end
 
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/O3-pr49957.f b/gcc/testsuite/gfortran.dg/vect/O3-pr49957.f
index 4e01e3a3d55..a9735677e73 100644
--- a/gcc/testsuite/gfortran.dg/vect/O3-pr49957.f
+++ b/gcc/testsuite/gfortran.dg/vect/O3-pr49957.f
@@ -14,4 +14,3 @@
       return
       end
 ! { dg-final { scan-tree-dump "vectorized 1 loops" "vect" { xfail vect_no_align } } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/Ofast-pr50414.f90 b/gcc/testsuite/gfortran.dg/vect/Ofast-pr50414.f90
index c4a36dbb222..9369c53c681 100644
--- a/gcc/testsuite/gfortran.dg/vect/Ofast-pr50414.f90
+++ b/gcc/testsuite/gfortran.dg/vect/Ofast-pr50414.f90
@@ -8,4 +8,3 @@
       CALL PROUND(YMA)
       END
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445.f b/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445.f
index 6e4a2624865..335328c5909 100644
--- a/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445.f
+++ b/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445.f
@@ -6,4 +6,3 @@ c { dg-do compile }
         Alpha = 1.2
       End Do
       End
-c { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445a.f b/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445a.f
index aca68bb2039..a39156c9567 100644
--- a/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445a.f
+++ b/gcc/testsuite/gfortran.dg/vect/cost-model-pr34445a.f
@@ -26,4 +26,3 @@ c
   130 continue
       return
       end
-c { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f b/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
index ad4c91aa45b..09fc24c93b6 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-mgrid-resid.f
@@ -43,5 +43,3 @@ C
 ! { dg-final { scan-tree-dump-times "Executing predictive commoning without unrolling" 1 "pcom" { target lp64 } } }
 ! { dg-final { scan-tree-dump-times "Executing predictive commoning without unrolling" 2 "pcom" { target ia32 } } }
 ! { dg-final { scan-tree-dump-times "Predictive commoning failed: no suitable chains" 0 "pcom" } }
-! { dg-final { cleanup-tree-dump "vect" } }
-! { dg-final { cleanup-tree-dump "pcom" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-pr33299.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-pr33299.f90
index 1de184dba40..8aca77d3bef 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-pr33299.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-pr33299.f90
@@ -14,4 +14,3 @@ FUNCTION f( x, dist ) RESULT(s)
   IF( x < 0 ) s = -s
 END FUNCTION f
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-pr37021.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-pr37021.f90
index d5f5d40765f..e680f80aac3 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-pr37021.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-pr37021.f90
@@ -15,4 +15,3 @@ subroutine to_product_of(self,a,b,a1,a2)
 end subroutine
 
 ! { dg-final { scan-tree-dump "vectorized 2 loops" "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-pr38968.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-pr38968.f90
index c0eb97e7ecd..c34a077e430 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-pr38968.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-pr38968.f90
@@ -25,4 +25,3 @@ program mymatmul
 end program mymatmul
 
 ! { dg-final { scan-tree-dump "vectorized 1 loops" "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-real8-pr40801.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-real8-pr40801.f90
index eb6330def63..372a99a2055 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-real8-pr40801.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-real8-pr40801.f90
@@ -34,4 +34,3 @@ IF (ITOP < KLEV+1) THEN
 ENDIF
 END SUBROUTINE ACCONV
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-rnflow-trs2a2.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-rnflow-trs2a2.f90
index 625be8390dc..b0c9ac04f4c 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-rnflow-trs2a2.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-rnflow-trs2a2.f90
@@ -30,4 +30,3 @@
       end function trs2a2
 
 ! { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"  } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/fast-math-vect-8.f90 b/gcc/testsuite/gfortran.dg/vect/fast-math-vect-8.f90
index 26d850de961..a2dbbe18b17 100644
--- a/gcc/testsuite/gfortran.dg/vect/fast-math-vect-8.f90
+++ b/gcc/testsuite/gfortran.dg/vect/fast-math-vect-8.f90
@@ -91,4 +91,3 @@ end module solv_cap
 
 
 ! { 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/gfortran.dg/vect/no-fre-no-copy-prop-O3-pr51704.f90 b/gcc/testsuite/gfortran.dg/vect/no-fre-no-copy-prop-O3-pr51704.f90
index acfe1b7df42..bbd80af92d6 100644
--- a/gcc/testsuite/gfortran.dg/vect/no-fre-no-copy-prop-O3-pr51704.f90
+++ b/gcc/testsuite/gfortran.dg/vect/no-fre-no-copy-prop-O3-pr51704.f90
@@ -53,5 +53,4 @@ contains
   end subroutine tes
 end
 
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32377.f90 b/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32377.f90
index ce4a47afda7..bf76adcfbee 100644
--- a/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32377.f90
+++ b/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32377.f90
@@ -12,5 +12,4 @@ real t1,t2,chksum,ctime,dtime,cs1d
 end
 
 ! { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect"   } }
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32457.f90 b/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32457.f90
index 07a2b6056fb..1f3a286de7d 100644
--- a/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32457.f90
+++ b/gcc/testsuite/gfortran.dg/vect/no-vfa-pr32457.f90
@@ -12,4 +12,3 @@ SUBROUTINE KEEL(RBOUND)
 END SUBROUTINE KEEL
 
 ! { dg-final { scan-tree-dump-times "vectorized 0 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr19049.f90 b/gcc/testsuite/gfortran.dg/vect/pr19049.f90
index 5552af6da84..5f4b9b15c3d 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr19049.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr19049.f90
@@ -21,5 +21,4 @@ subroutine s111 (ntimes,ld,n,ctime,dtime,a,b,c,d,e,aa,bb,cc)
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 0 "vect" } }
 ! { dg-final { scan-tree-dump-times "complicated access pattern" 1 "vect" { xfail vect_multiple_sizes } } }
 ! { dg-final { scan-tree-dump-times "complicated access pattern" 2 "vect" { target vect_multiple_sizes } } }
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/pr32377.f90 b/gcc/testsuite/gfortran.dg/vect/pr32377.f90
index 624a9ae7e3b..a34bdae01fb 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr32377.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr32377.f90
@@ -12,4 +12,3 @@ subroutine s243(ntimes,ld,n,ctime,dtime,a,b,c,d,e,aa,bb,cc)
 end subroutine s243
 
 ! { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr32380.f b/gcc/testsuite/gfortran.dg/vect/pr32380.f
index eba76d98e83..7639cccc328 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr32380.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr32380.f
@@ -262,4 +262,3 @@ c
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { ! vect_element_align } } } }
 ! { dg-final { scan-tree-dump-times "vectorized 5 loops" 1 "vect" { target { vect_element_align && { ! vect_call_sqrtf } } } } }
 ! { dg-final { scan-tree-dump-times "vectorized 6 loops" 1 "vect" { target { vect_element_align && vect_call_sqrtf } } } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr33301.f b/gcc/testsuite/gfortran.dg/vect/pr33301.f
index 0713f3e7583..2bf5114c37b 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr33301.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr33301.f
@@ -11,4 +11,3 @@ c     It is present in original lapack source
    20       CONTINUE
       END
 
-c { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr39318.f90 b/gcc/testsuite/gfortran.dg/vect/pr39318.f90
index c22e558e241..245306c2a74 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr39318.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr39318.f90
@@ -17,5 +17,4 @@
       return
       end
 
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
index 4800b41296c..58ec2291956 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr45714-a.f
@@ -24,4 +24,3 @@
       enddo
       end
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
index a536e1f598f..b042707b2dd 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr45714-b.f
@@ -24,4 +24,3 @@
       enddo
       end
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr46213.f90 b/gcc/testsuite/gfortran.dg/vect/pr46213.f90
index 504d1a3cf84..73f0a7870bf 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr46213.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr46213.f90
@@ -22,4 +22,3 @@ contains
   end function get_d
 end program test
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr48329.f90 b/gcc/testsuite/gfortran.dg/vect/pr48329.f90
index 6ad03d4bd33..84b902b5b69 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr48329.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr48329.f90
@@ -26,4 +26,3 @@ program calcpi
 end program calcpi
 
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr50178.f90 b/gcc/testsuite/gfortran.dg/vect/pr50178.f90
index e24ce5b15f6..1b149129714 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr50178.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr50178.f90
@@ -26,4 +26,3 @@ subroutine suedyn
 
 end subroutine suedyn
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr50412.f90 b/gcc/testsuite/gfortran.dg/vect/pr50412.f90
index 4f95741f735..548ee6cd9c3 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr50412.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr50412.f90
@@ -9,4 +9,3 @@
    20 CONTINUE
       END
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr51058-2.f90 b/gcc/testsuite/gfortran.dg/vect/pr51058-2.f90
index f647e6cdb4f..f3ae55fc802 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr51058-2.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr51058-2.f90
@@ -17,4 +17,3 @@ subroutine pr51058(n, u, v, w, z)
   end do
 end subroutine
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr51058.f90 b/gcc/testsuite/gfortran.dg/vect/pr51058.f90
index abee4c8af99..9ce0de8fed0 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr51058.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr51058.f90
@@ -15,5 +15,4 @@
          ENDDO
       END
 
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/pr51285.f90 b/gcc/testsuite/gfortran.dg/vect/pr51285.f90
index 92907f38801..c80ea6f122d 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr51285.f90
+++ b/gcc/testsuite/gfortran.dg/vect/pr51285.f90
@@ -33,4 +33,3 @@
     ENDDO
  END SUBROUTINE
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr52580.f b/gcc/testsuite/gfortran.dg/vect/pr52580.f
index eab9fa54bf5..82520764a6f 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr52580.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr52580.f
@@ -30,4 +30,3 @@
       RETURN
       END
 ! { dg-final { scan-tree-dump-times "LOOP VECTORIZED" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr62283-2.f b/gcc/testsuite/gfortran.dg/vect/pr62283-2.f
index b71ac3eecef..8f5b6d62a2b 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr62283-2.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr62283-2.f
@@ -9,5 +9,3 @@
       y(4)=y(4)+alpha*x(4)
       end
 ! { dg-final { scan-tree-dump "basic block vectorized" "slp2" } }
-! { dg-final { cleanup-tree-dump "slp2" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/pr62283.f b/gcc/testsuite/gfortran.dg/vect/pr62283.f
index 038a998769d..7df3d997664 100644
--- a/gcc/testsuite/gfortran.dg/vect/pr62283.f
+++ b/gcc/testsuite/gfortran.dg/vect/pr62283.f
@@ -14,4 +14,3 @@ C { dg-additional-options "-fvect-cost-model=dynamic" }
       y=y+beta*x
       end
 C { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect" { target { vect_hw_misalign } } } }
-C { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-1.f90 b/gcc/testsuite/gfortran.dg/vect/vect-1.f90
index cafcec7d054..90b37e4688f 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-1.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-1.f90
@@ -8,4 +8,3 @@ PRINT*, C(500000)
 END
 
 ! { dg-final { scan-tree-dump-times "vectorized 3 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-2.f90 b/gcc/testsuite/gfortran.dg/vect/vect-2.f90
index b4358c81430..24c7debcd65 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-2.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-2.f90
@@ -19,4 +19,3 @@ END
 ! { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { target { { vect_no_align && { ! vect_hw_misalign } } && { ! vector_alignment_reachable } } } } }
 ! { 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 versioning." 3 "vect" {target { { vect_no_align && { ! vect_hw_misalign } } || { { ! vector_alignment_reachable  } && { ! vect_hw_misalign } } } } } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-3.f90 b/gcc/testsuite/gfortran.dg/vect/vect-3.f90
index d70c6b4d1c1..abbdc9018c3 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-3.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-3.f90
@@ -12,4 +12,3 @@ END
 ! { 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 "Vectorizing an unaligned access" 1 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || { ! vector_alignment_reachable} } } } }
 
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-4.f90 b/gcc/testsuite/gfortran.dg/vect/vect-4.f90
index 0d29852704f..7602100b345 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-4.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-4.f90
@@ -14,4 +14,3 @@ END
 ! { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail { { vect_no_align && { ! vect_hw_misalign } } || {! vector_alignment_reachable} } } } }
 ! { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 2 "vect" { target { {! vector_alignment_reachable} && {! vect_hw_misalign} } } } }
 ! { dg-final { scan-tree-dump-times "accesses have the same alignment." 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-5.f90 b/gcc/testsuite/gfortran.dg/vect/vect-5.f90
index 77ef77b09b6..4c6324eaafe 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-5.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-5.f90
@@ -40,4 +40,3 @@
 ! { 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 versioning." 2 "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_hw_misalign} } } } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-6.f b/gcc/testsuite/gfortran.dg/vect/vect-6.f
index f232dcb82d8..5307a90c577 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-6.f
+++ b/gcc/testsuite/gfortran.dg/vect/vect-6.f
@@ -21,5 +21,4 @@
   150    CONTINUE
       END
 
-! { dg-final { cleanup-tree-dump "vect" } }
 
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-7.f90 b/gcc/testsuite/gfortran.dg/vect/vect-7.f90
index b82bb95e89b..308e0cc96b5 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-7.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-7.f90
@@ -12,5 +12,4 @@ subroutine foo (x,nnd)
 end subroutine foo 
 
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_unpack  && vect_intfloat_cvt } } } } 
-! { dg-final { cleanup-tree-dump "vect" } } 
 
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-8.f90 b/gcc/testsuite/gfortran.dg/vect/vect-8.f90
index c12cde19fa6..324ab78d160 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-8.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-8.f90
@@ -704,4 +704,3 @@ RETURN
 END SUBROUTINE kernel
 
 ! { dg-final { scan-tree-dump-times "vectorized 19 loops" 1 "vect" } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vect/vect-do-concurrent-1.f90 b/gcc/testsuite/gfortran.dg/vect/vect-do-concurrent-1.f90
index e62a9eb23a4..3e6ad21764f 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-do-concurrent-1.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-do-concurrent-1.f90
@@ -13,4 +13,3 @@ end subroutine test
 
 ! { 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/gfortran.dg/vect/vect-gems.f90 b/gcc/testsuite/gfortran.dg/vect/vect-gems.f90
index 2f75355cb1f..b63c8f68765 100644
--- a/gcc/testsuite/gfortran.dg/vect/vect-gems.f90
+++ b/gcc/testsuite/gfortran.dg/vect/vect-gems.f90
@@ -54,4 +54,3 @@ END SUBROUTINE UPMLupdateE
 END MODULE UPML_mod
 
 ! { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  } }
-! { dg-final { cleanup-tree-dump "vect" } }
diff --git a/gcc/testsuite/gfortran.dg/vector_subscript_4.f90 b/gcc/testsuite/gfortran.dg/vector_subscript_4.f90
index 5c341dab4a5..d726d424ab7 100644
--- a/gcc/testsuite/gfortran.dg/vector_subscript_4.f90
+++ b/gcc/testsuite/gfortran.dg/vector_subscript_4.f90
@@ -10,4 +10,3 @@
       k = j((/1,1,1/)+i)
       end
 ! { dg-final { scan-tree-dump-times "A\.2\\\[3\\\]" 1 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/vector_subscript_6.f90 b/gcc/testsuite/gfortran.dg/vector_subscript_6.f90
index 51613d11368..cd71be11dae 100644
--- a/gcc/testsuite/gfortran.dg/vector_subscript_6.f90
+++ b/gcc/testsuite/gfortran.dg/vector_subscript_6.f90
@@ -30,4 +30,3 @@ subroutine test3(esss,Ix,Iyz, e_x, ii_ivec)
 end subroutine
 
 ! { dg-final { scan-tree-dump-not "malloc" "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
diff --git a/gcc/testsuite/gfortran.dg/volatile10.f90 b/gcc/testsuite/gfortran.dg/volatile10.f90
index 47356d9ba48..6db88694cf8 100644
--- a/gcc/testsuite/gfortran.dg/volatile10.f90
+++ b/gcc/testsuite/gfortran.dg/volatile10.f90
@@ -145,4 +145,3 @@ end program main
 ! { dg-final { scan-tree-dump      "main_test2_2" "optimized" } }
 ! TODO: dg-final { scan-tree-dump-not  "main_test2_3" "optimized" } 
 ! { dg-final { scan-tree-dump      "main_test2_4" "optimized" } }
-! { dg-final { cleanup-tree-dump  "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/volatile11.f90 b/gcc/testsuite/gfortran.dg/volatile11.f90
index 5742915abb9..079e9163c26 100644
--- a/gcc/testsuite/gfortran.dg/volatile11.f90
+++ b/gcc/testsuite/gfortran.dg/volatile11.f90
@@ -37,4 +37,3 @@ end subroutine
 ! { dg-final { scan-tree-dump "NotOptimizedAway1" "optimized" } } */
 ! { dg-final { scan-tree-dump "NotOptimizedAway2" "optimized" } } */
 ! { dg-final { scan-tree-dump-not "IsOptimizedAway" "optimized" } } */
-! { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gfortran.dg/volatile12.f90 b/gcc/testsuite/gfortran.dg/volatile12.f90
index 1e85a2b8edf..3a1900fcb02 100644
--- a/gcc/testsuite/gfortran.dg/volatile12.f90
+++ b/gcc/testsuite/gfortran.dg/volatile12.f90
@@ -12,5 +12,4 @@ end
 ! { dg-final { scan-tree-dump "integer.kind=.. . volatile arg" "optimized" } }
 ! { dg-final { scan-tree-dump-times " =.v. arg;" 2 "optimized" } }
 ! { dg-final { scan-tree-dump "i_dont_exist" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
 
diff --git a/gcc/testsuite/gfortran.dg/volatile4.f90 b/gcc/testsuite/gfortran.dg/volatile4.f90
index f58a873dfb4..a79bd87c309 100644
--- a/gcc/testsuite/gfortran.dg/volatile4.f90
+++ b/gcc/testsuite/gfortran.dg/volatile4.f90
@@ -15,4 +15,3 @@ end do
 end
 ! { dg-final { scan-tree-dump "VolatileNotOptimizedAway" "optimized" } } */
 ! { dg-final { scan-tree-dump-not "NonVolatileNotOptimizedAway" "optimized" } } */
-! { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gfortran.dg/volatile5.f90 b/gcc/testsuite/gfortran.dg/volatile5.f90
index 57a4c898eba..180f513c5c5 100644
--- a/gcc/testsuite/gfortran.dg/volatile5.f90
+++ b/gcc/testsuite/gfortran.dg/volatile5.f90
@@ -39,4 +39,3 @@ end program main
 ! { dg-final { scan-tree-dump "bStillPresent" "optimized" } }
 ! { dg-final { scan-tree-dump-not "cPresent" "optimized" } }
 ! { dg-final { scan-tree-dump-not "cStillPresent" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/volatile6.f90 b/gcc/testsuite/gfortran.dg/volatile6.f90
index e42e3de3acb..421a806acc3 100644
--- a/gcc/testsuite/gfortran.dg/volatile6.f90
+++ b/gcc/testsuite/gfortran.dg/volatile6.f90
@@ -23,4 +23,3 @@ end
 ! { dg-final { scan-tree-dump "VolatileNotOptimizedAway2" "optimized" } }
 ! { dg-final { scan-tree-dump-not "NonVolatileNotOptimizedAway1" "optimized" } }
 ! { dg-final { scan-tree-dump-not "NonVolatileNotOptimizedAway2" "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/volatile7.f90 b/gcc/testsuite/gfortran.dg/volatile7.f90
index 237a08c07a1..d032a6598b1 100644
--- a/gcc/testsuite/gfortran.dg/volatile7.f90
+++ b/gcc/testsuite/gfortran.dg/volatile7.f90
@@ -13,4 +13,3 @@ if(associated(t2)) print *, 'NonVolatileNotOptimizedAway'
 end
 ! { dg-final { scan-tree-dump "VolatileNotOptimizedAway" "optimized" } }
 ! { dg-final { scan-tree-dump-not "NonVolatileNotOptimizedAway" "optimized" } } 
-! { dg-final { cleanup-tree-dump "optimized" } } 
diff --git a/gcc/testsuite/gfortran.dg/whole_file_5.f90 b/gcc/testsuite/gfortran.dg/whole_file_5.f90
index 34240c9f321..fa4f06dd0ff 100644
--- a/gcc/testsuite/gfortran.dg/whole_file_5.f90
+++ b/gcc/testsuite/gfortran.dg/whole_file_5.f90
@@ -17,4 +17,3 @@ PROGRAM main
 END PROGRAM
 
 ! { dg-final { scan-tree-dump-times "= f \\(\\)" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/whole_file_6.f90 b/gcc/testsuite/gfortran.dg/whole_file_6.f90
index 1d92bc36009..771215db28d 100644
--- a/gcc/testsuite/gfortran.dg/whole_file_6.f90
+++ b/gcc/testsuite/gfortran.dg/whole_file_6.f90
@@ -17,4 +17,3 @@ INTEGER FUNCTION f()
 END FUNCTION
 
 ! { dg-final { scan-tree-dump-times "= f \\(\\)" 0 "optimized" } }
-! { dg-final { cleanup-tree-dump "optimized" } }
diff --git a/gcc/testsuite/gfortran.dg/widechar_7.f90 b/gcc/testsuite/gfortran.dg/widechar_7.f90
index 4368321170b..5e42423172b 100644
--- a/gcc/testsuite/gfortran.dg/widechar_7.f90
+++ b/gcc/testsuite/gfortran.dg/widechar_7.f90
@@ -16,4 +16,3 @@ program test
 end program test
 
 ! { dg-final { scan-tree-dump-times "memmove" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }
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/gfortran.dg
parent	90bb09c4f70b65c0cf4725f4eb1920a35f70d654 (diff)
download	gcc-c469078de7c017978bda033baff3e991987b5509.tar.gz