Hello! 2013-11-26 Uros Bizjak <ubiz...@gmail.com>
* gcc.dg/gomp/openmp-simd-1.c: Cleanup original tree dump. * gcc.dg/gomp/openmp-simd-2.c: Ditto. * g++.dg/gomp/openmp-simd-1.C: Ditto. * g++.dg/gomp/openmp-simd-2.C: Ditto. * gfortran.dg/c_loc_test_22.f90: Ditto. * gcc.dg/tree-ssa/attr-alias-2.c: Cleanup optimized tree dump. * gcc.dg/tree-ssa/isolate-5.c: Ditto. * gcc.dg/tree-ssa/pr57361.c: Cleanup dse1 tree dump. * gcc.dg/vect/vect-124.c: Cleanup vect tree dump. * gcc.dg/pr57518.c: Cleanup ira rtl dump. * gcc.dg/tree-prof/cold_partition_label.c: Cleanup saved temps. Tested on x86_64-pc-linux-gnu, committed to mainline SVN. Uros.
Index: g++.dg/gomp/openmp-simd-1.C =================================================================== --- g++.dg/gomp/openmp-simd-1.C (revision 205396) +++ g++.dg/gomp/openmp-simd-1.C (working copy) @@ -44,3 +44,4 @@ /* { dg-final { scan-tree-dump-not "omp teams" "original" } } */ /* { dg-final { scan-tree-dump-not "omp target" "original" } } */ /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */ Index: g++.dg/gomp/openmp-simd-2.C =================================================================== --- g++.dg/gomp/openmp-simd-2.C (revision 205396) +++ g++.dg/gomp/openmp-simd-2.C (working copy) @@ -42,3 +42,4 @@ /* { dg-final { scan-tree-dump-times "pragma omp simd safelen\\(64\\)" 1 "original" } } */ /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */ /* { dg-final { scan-tree-dump-not "omp for" "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */ Index: gcc.dg/gomp/openmp-simd-1.c =================================================================== --- gcc.dg/gomp/openmp-simd-1.c (revision 205396) +++ gcc.dg/gomp/openmp-simd-1.c (working copy) @@ -44,3 +44,4 @@ /* { dg-final { scan-tree-dump-not "omp teams" "original" } } */ /* { dg-final { scan-tree-dump-not "omp target" "original" } } */ /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */ Index: gcc.dg/gomp/openmp-simd-2.c =================================================================== --- gcc.dg/gomp/openmp-simd-2.c (revision 205396) +++ gcc.dg/gomp/openmp-simd-2.c (working copy) @@ -40,3 +40,4 @@ /* { dg-final { scan-tree-dump-times "pragma omp simd safelen\\(64\\)" 1 "original" } } */ /* { dg-final { scan-tree-dump-not "omp parallel" "original" } } */ /* { dg-final { scan-tree-dump-not "omp for" "original" } } */ +/* { dg-final { cleanup-tree-dump "original" } } */ Index: gcc.dg/pr57518.c =================================================================== --- gcc.dg/pr57518.c (revision 205396) +++ gcc.dg/pr57518.c (working copy) @@ -2,7 +2,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -fdump-rtl-ira" } */ -/* { dg-final { scan-rtl-dump-not "REG_EQUIV\[^\n\]*mem\[^\n\]*\"ip\".*subreg" "ira" } } */ char ip[10]; int total; @@ -13,3 +12,6 @@ t = ip[2]; total = t & 0x3; } + +/* { dg-final { scan-rtl-dump-not "REG_EQUIV\[^\n\]*mem\[^\n\]*\"ip\".*subreg" "ira" } } */ +/* { dg-final { cleanup-rtl-dump "ira" } } */ Index: gcc.dg/tree-prof/cold_partition_label.c =================================================================== --- gcc.dg/tree-prof/cold_partition_label.c (revision 205396) +++ gcc.dg/tree-prof/cold_partition_label.c (working copy) @@ -1,7 +1,7 @@ /* Test case to check if function foo gets split and the cold function gets a label. */ /* { dg-require-effective-target freorder } */ -/* { dg-options "-O2 -freorder-blocks-and-partition --save-temps" } */ +/* { dg-options "-O2 -freorder-blocks-and-partition -save-temps" } */ #define SIZE 10000 @@ -34,3 +34,5 @@ foo (argc); return 0; } + +/* { dg-final-use { cleanup-saved-temps } } */ Index: gcc.dg/tree-ssa/attr-alias-2.c =================================================================== --- gcc.dg/tree-ssa/attr-alias-2.c (revision 205396) +++ gcc.dg/tree-ssa/attr-alias-2.c (working copy) @@ -8,3 +8,4 @@ return b+a; } /* { dg-final { scan-tree-dump "return 8" "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ Index: gcc.dg/tree-ssa/isolate-5.c =================================================================== --- gcc.dg/tree-ssa/isolate-5.c (revision 205396) +++ gcc.dg/tree-ssa/isolate-5.c (working copy) @@ -1,8 +1,6 @@ - /* { dg-do compile } */ /* { dg-options "-O2 -fdump-tree-isolate-paths -fdump-tree-optimized" } */ - struct demangle_component { @@ -11,7 +9,6 @@ }; - struct d_info { struct demangle_component *comps; @@ -19,7 +16,6 @@ int num_comps; }; - static struct demangle_component * d_make_empty (struct d_info *di) { @@ -31,8 +27,6 @@ return p; } - - struct demangle_component * d_type (struct d_info *di) { @@ -55,7 +49,7 @@ /* { dg-final { scan-tree-dump-times "\\.type" 1 "optimized"} } */ /* { dg-final { scan-tree-dump-times "->zzz" 1 "isolate-paths"} } */ /* { dg-final { cleanup-tree-dump "isolate-paths" } } */ -/* { dg-final { cleanup-tree-dump "optimized-paths" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ Index: gcc.dg/tree-ssa/pr57361.c =================================================================== --- gcc.dg/tree-ssa/pr57361.c (revision 205396) +++ gcc.dg/tree-ssa/pr57361.c (working copy) @@ -7,3 +7,4 @@ } /* { dg-final { scan-tree-dump "Deleted dead store" "dse1"} } */ +/* { dg-final { cleanup-tree-dump "dse1" } } */ Index: gcc.dg/vect/vect-124.c =================================================================== --- gcc.dg/vect/vect-124.c (revision 205396) +++ gcc.dg/vect/vect-124.c (working copy) @@ -26,3 +26,5 @@ abort (); return 0; } + +/* { dg-final { cleanup-tree-dump "vect" } } */ Index: gfortran.dg/c_loc_test_22.f90 =================================================================== --- gfortran.dg/c_loc_test_22.f90 (revision 205396) +++ gfortran.dg/c_loc_test_22.f90 (working copy) @@ -21,4 +21,4 @@ ! { 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 "optimized" } } +! { dg-final { cleanup-tree-dump "original" } }