[PATCH, testsuite ]: Cleanup dumps

[PATCH, testsuite ]: Cleanup dumps

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

Hello!

2013-12-08  Uros Bizjak  <ubizjak@gmail.com>

    * gcc.dg/macro-fusion-1.c: Cleanup sched2 rtl dump.
    * gcc.dg/macro-fusion-2.c: Ditto.
    * gcc.dg/vect/vect-simd-clone-10a.c: Cleanup vect tree dump.
    * gcc.dg/vect/vect-simd-clone-12a.c: Ditto.

Tested on x86_64-pc-linux-gnu, committed to mainline SVN.

Uros.

[-- Attachment #2: t.diff.txt --]
[-- Type: text/plain, Size: 1882 bytes --]

Index: gcc.dg/macro-fusion-1.c
===================================================================
--- gcc.dg/macro-fusion-1.c	(revision 205790)
+++ gcc.dg/macro-fusion-1.c	(working copy)
@@ -1,6 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -mtune=corei7 -fdump-rtl-sched2" } */
-/* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
 
 int a[100];
 
@@ -11,3 +10,6 @@
    sum += (0.5 + (a[i%100] - 128));
   return sum;
 }
+
+/* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
+/* { dg-final { cleanup-rtl-dump "sched2" } } */
Index: gcc.dg/macro-fusion-2.c
===================================================================
--- gcc.dg/macro-fusion-2.c	(revision 205790)
+++ gcc.dg/macro-fusion-2.c	(working copy)
@@ -1,6 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -mtune=corei7-avx -fdump-rtl-sched2" } */
-/* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
 
 int a[100];
 
@@ -14,3 +13,6 @@
     }
   return sum;
 }
+
+/* { dg-final { scan-rtl-dump-not "compare.*insn.*jump_insn.*jump_insn" "sched2" } } */
+/* { dg-final { cleanup-rtl-dump "sched2" } } */
Index: gcc.dg/vect/vect-simd-clone-10a.c
===================================================================
--- gcc.dg/vect/vect-simd-clone-10a.c	(revision 205790)
+++ gcc.dg/vect/vect-simd-clone-10a.c	(working copy)
@@ -15,3 +15,5 @@
 {
   return a + b + c;
 }
+
+/* { dg-final { cleanup-tree-dump "vect" } } */
Index: gcc.dg/vect/vect-simd-clone-12a.c
===================================================================
--- gcc.dg/vect/vect-simd-clone-12a.c	(revision 205790)
+++ gcc.dg/vect/vect-simd-clone-12a.c	(working copy)
@@ -15,3 +15,5 @@
 {
   return a + b + c;
 }
+
+/* { dg-final { cleanup-tree-dump "vect" } } */

Re: [PATCH, testsuite]: Cleanup dumps

[Bernhard Reutner-Fischer]

On Fri, 29 May 2015 10:44:02 +0200
Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:

> On 29 May 2015 at 10:21, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> > On 31 January 2015 at 22:10, Bernhard Reutner-Fischer
> > <rep.dot.nop@gmail.com> wrote:  
> >> On January 31, 2015 9:17:57 PM GMT+01:00, Mike Stump <mikestump@comcast.net> wrote:  
> 
> >>>If you want to wait until stage 1, that’s fine too.  
> >>
> >> I'd only want that to go in in stage 1.  
> >
> > I have applied this now as r223858.
> > Please CC me on fallout.  
> 
> 
> To recap:
> 
> The idea is to automatically delete dump-files in the testsuite
> instead of annotating alot of testcases in their dg-final.
> 
> To quote sourcebuild.texi, "Clean up generated test files":
> --- 8< ---
> Usually the test-framework removes files that were generated during
> testing. If a testcase, for example, uses any dumping mechanism to
> inspect a passes dump file, the testsuite recognized the dumping option
> passed to the tool and schedules a final cleanup to remove these files.
> --- 8< ---
> 
> The following TCL procs were deleted from the test framework and
> CANNOT be used anymore in dg-final:
> - cleanup-ipa-dump
> - cleanup-rtl-dump
> - cleanup-tree-dump
> - cleanup-saved-temps
> 
> These dump-files are now automatically deleted in the testsuite, via a
> schedule-cleanups in some basic .exp helpers.
> 
> Just delete any // dg-final { cleanup-see-above-list }
> from your new testcases.
> 
> 
> The .plan is to gradually do the same for the remaining dumps like
> stack etc. See remaining parts in sourcebuild.texi and this comment in
> schedule-cleanups:
> +    # TODO
> +    # -fprofile-generate -> cleanup-coverage-files()
> +    # -fstack-usage -> cleanup-stack-usage()
> 
> Mike, just so i do not forget:
> 
> I have retained the cleanup-saved-temps proc for now since it's used in lto.exp.
> I want to rename it later on to prevent people from using it in their
> dg-final since this is now done automatically.
> 
> cheers,

Hi!
Some time later now. We're in gcc-12 stage 4.
The automatic cleanup handling was quite successful i think. I.e. folks
did not have to waste any noteworthy time on manual cleanup hunting ever
since then AFAIK.

So..
Iff you find leftovers in the testsuite in gcc-12 or 11 onwards from
running tests, then please let us know.

And if you are willing to delve into removing the tcl leftovers from
way back, or if you have time to apply some more TLC to the cleanup
handling itself or if you see opportunity to cleanup the cleanup
handling itself, then please do so. IIRC there are a few bits left that
one could handle automatically, if deemed generally useful and if you
have spare time.

PS:
$ git grep dg-final gcc/testsuite/ | egrep -v "(ChangeLog| scan-)" | sed -e 's/.*dg-final //' -e 's/\s*{\s*//' -e 's/}/ /g' | awk '{print $1}' | sort | uniq -c | sort -nr -k1
   2697 check-function-bodies
    486 gdb-test
     62 run-gcov
     34 scan-assembler-times
     25 cleanup-ada-spec
     23 simulate-thread
     22 object-size
...
PS:
gcc/testsuite/lib/scanasm.exp: object-size is under-used.
We should have way more size tests.
And we should have size tests that aim to regain the regressions that
came with the SSA merge ;)

thanks,

Re: [PATCH, testsuite]: Cleanup dumps

[Christophe Lyon]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

On 29 May 2015 at 15:35, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> On 29 May 2015 at 15:21, Kyrill Tkachov <kyrylo.tkachov@arm.com> wrote:
>
>> Hi Bernhard,
>>
>> You asked to be CC'ed ;)
>> Applied this as obvious with r223864 to.
>

Hi,
Same problem with gcc/testsuite/gcc.target/arm/simd/vextp64_1.c
fixed as obvious as r223876.



> oops, thanks for fixing! This obviously escaped my grep-foo.
>
> As said, i'd vote for -Wcomment -fno-ident to be added per default
> where testcases should opt-out if they want to test these explicitly.
> It's stressful to be on a tailcall-fixups branch thinking that you
> might have broken something when you see scan-assembler-not "call"
> fail due to the .ident :P
>
> Anyway. Thanks, again!

[-- Attachment #2: arm-vextp64_1.diff --]
[-- Type: text/plain, Size: 859 bytes --]

Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(revision 223875)
+++ gcc/testsuite/ChangeLog	(revision 223876)
@@ -1,3 +1,7 @@
+2015-05-29  Christophe Lyon  <christophe.lyon@linaro.org>
+
+	* gcc.target/arm/simd/vextp64_1.c: Close comment on final line.
+
 2015-05-29  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
 	PR target/66215
Index: gcc/testsuite/gcc.target/arm/simd/vextp64_1.c
===================================================================
--- gcc/testsuite/gcc.target/arm/simd/vextp64_1.c	(revision 223875)
+++ gcc/testsuite/gcc.target/arm/simd/vextp64_1.c	(revision 223876)
@@ -21,4 +21,4 @@
   return 0;
 }
 
-/* Don't scan assembler for vext - it can be optimized into a move from r0.
+/* Don't scan assembler for vext - it can be optimized into a move from r0. */

Re: [PATCH, testsuite]: Cleanup dumps

[Bernhard Reutner-Fischer]

On 29 May 2015 at 15:21, Kyrill Tkachov <kyrylo.tkachov@arm.com> wrote:

> Hi Bernhard,
>
> You asked to be CC'ed ;)
> Applied this as obvious with r223864 to.

oops, thanks for fixing! This obviously escaped my grep-foo.

As said, i'd vote for -Wcomment -fno-ident to be added per default
where testcases should opt-out if they want to test these explicitly.
It's stressful to be on a tailcall-fixups branch thinking that you
might have broken something when you see scan-assembler-not "call"
fail due to the .ident :P

Anyway. Thanks, again!

Re: [PATCH, testsuite]: Cleanup dumps

[Kyrill Tkachov]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]


On 29/05/15 09:21, Bernhard Reutner-Fischer wrote:
> On 31 January 2015 at 22:10, Bernhard Reutner-Fischer
> <rep.dot.nop@gmail.com> wrote:
>> On January 31, 2015 9:17:57 PM GMT+01:00, Mike Stump <mikestump@comcast.net> wrote:
>>> On Jan 31, 2015, at 11:50 AM, Bernhard Reutner-Fischer
>>> <rep.dot.nop@gmail.com> wrote:
>>>> On January 31, 2015 10:53:39 AM GMT+01:00, Uros Bizjak
>>> <ubizjak@gmail.com> wrote:
>>>>> Hello!
>>>> Reminds me of just auto-wiping dump files:
>>>> https://gcc.gnu.org/ml/gcc-patches/2013-10/msg02506.html
>>>> Mike, WDYT?
>>> Ok.
>>>
>>> My only concern of speed isn’t founded, as you stated it was faster to
>>> scan the flags.
>>>
>>> I think I’m fine with it going in now, but, if you do, you have to
>>> watch for and resolve any fallout.  Watch for RM comments, I’d defer to
>>> them on timing.
>>>
>>> If you want to wait until stage 1, that’s fine too.
>> I'd only want that to go in in stage 1.
> I have applied this now as r223858.
> Please CC me on fallout.
Hi Bernhard,

You asked to be CC'ed ;)
Applied this as obvious with r223864 to.

Kyrill


2015-05-29  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>

     * gcc.target/aarch64/vdup_lane_2.c: Close comment on final line.

>
> Thanks,
>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: aarch64-vdup_lane_2-close-comment.patch --]
[-- Type: text/x-patch; name=aarch64-vdup_lane_2-close-comment.patch, Size: 595 bytes --]

diff --git a/gcc/testsuite/gcc.target/aarch64/vdup_lane_2.c b/gcc/testsuite/gcc.target/aarch64/vdup_lane_2.c
index e87d780..a49db3e 100644
--- a/gcc/testsuite/gcc.target/aarch64/vdup_lane_2.c
+++ b/gcc/testsuite/gcc.target/aarch64/vdup_lane_2.c
@@ -338,5 +338,5 @@ main ()
 
 /* Asm check for vdupd_lane_f64, vdupd_lane_s64, vdupd_lane_u64.  */
 /* Attempts to make the compiler generate vdupd are not practical.  */
-/* { dg-final { scan-assembler-not "dup\\td\[0-9\]+, v\[0-9\]+\.d\\\[0\\\]" } }
+/* { dg-final { scan-assembler-not "dup\\td\[0-9\]+, v\[0-9\]+\.d\\\[0\\\]" } } */
 

Re: [PATCH, testsuite]: Cleanup dumps

[Bernhard Reutner-Fischer]

On 29 May 2015 at 10:21, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> On 31 January 2015 at 22:10, Bernhard Reutner-Fischer
> <rep.dot.nop@gmail.com> wrote:
>> On January 31, 2015 9:17:57 PM GMT+01:00, Mike Stump <mikestump@comcast.net> wrote:

>>>If you want to wait until stage 1, that’s fine too.
>>
>> I'd only want that to go in in stage 1.
>
> I have applied this now as r223858.
> Please CC me on fallout.


To recap:

The idea is to automatically delete dump-files in the testsuite
instead of annotating alot of testcases in their dg-final.

To quote sourcebuild.texi, "Clean up generated test files":
--- 8< ---
Usually the test-framework removes files that were generated during
testing. If a testcase, for example, uses any dumping mechanism to
inspect a passes dump file, the testsuite recognized the dumping option
passed to the tool and schedules a final cleanup to remove these files.
--- 8< ---

The following TCL procs were deleted from the test framework and
CANNOT be used anymore in dg-final:
- cleanup-ipa-dump
- cleanup-rtl-dump
- cleanup-tree-dump
- cleanup-saved-temps

These dump-files are now automatically deleted in the testsuite, via a
schedule-cleanups in some basic .exp helpers.

Just delete any // dg-final { cleanup-see-above-list }
from your new testcases.


The .plan is to gradually do the same for the remaining dumps like
stack etc. See remaining parts in sourcebuild.texi and this comment in
schedule-cleanups:
+    # TODO
+    # -fprofile-generate -> cleanup-coverage-files()
+    # -fstack-usage -> cleanup-stack-usage()

Mike, just so i do not forget:

I have retained the cleanup-saved-temps proc for now since it's used in lto.exp.
I want to rename it later on to prevent people from using it in their
dg-final since this is now done automatically.

cheers,

Re: [PATCH, testsuite]: Cleanup dumps

[Bernhard Reutner-Fischer]

On 31 January 2015 at 22:10, Bernhard Reutner-Fischer
<rep.dot.nop@gmail.com> wrote:
> On January 31, 2015 9:17:57 PM GMT+01:00, Mike Stump <mikestump@comcast.net> wrote:
>>On Jan 31, 2015, at 11:50 AM, Bernhard Reutner-Fischer
>><rep.dot.nop@gmail.com> wrote:
>>> On January 31, 2015 10:53:39 AM GMT+01:00, Uros Bizjak
>><ubizjak@gmail.com> wrote:
>>>> Hello!
>>>
>>> Reminds me of just auto-wiping dump files:
>>> https://gcc.gnu.org/ml/gcc-patches/2013-10/msg02506.html
>>
>>> Mike, WDYT?
>>
>>Ok.
>>
>>My only concern of speed isn’t founded, as you stated it was faster to
>>scan the flags.
>>
>>I think I’m fine with it going in now, but, if you do, you have to
>>watch for and resolve any fallout.  Watch for RM comments, I’d defer to
>>them on timing.
>>
>>If you want to wait until stage 1, that’s fine too.
>
> I'd only want that to go in in stage 1.

I have applied this now as r223858.
Please CC me on fallout.

Thanks,

Re: [PATCH, testsuite]: Cleanup dumps

[Bernhard Reutner-Fischer]

On 1 February 2015 at 18:49, Mike Stump <mikestump@comcast.net> wrote:
> On Jan 31, 2015, at 1:55 PM, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
>>
>> What about the -Wcomment question?
>
> I don’t consider it linked in anyway to the patch at hand.  I’m not a big fan of the default flags being much different than the flags the user normally sees.  That said, would be nice to avoid this issue.  The best way forward I can think of would be a wholesale change to // style comments in the test suite for all test cases that accept that language.  // is standard C and C++, and by convention, I think they are fine in Objective-C and Obective-C++.

I won't do a wholesale change to C++-style comments in the testsuite
(where applicable),
that's too time-consuming.

Since you OKed the patch cited below, i suggest i apply those hunks of
the manual patch that are still relevant since i think they make sense
regardless of the auto-wipe dumpfiles stuff going in or not.

>
>> And can you help with the two ??? maybe?
>
> Which type of help?

In the last posted patch
https://gcc.gnu.org/ml/gcc-patches/2013-12/msg01749.html
there is only one question left:
+    foreach src $testcases {
+ set basename [file tail $src]
+ if { $ltrans != "" } {
+    # ??? should we use upvar 1 output_file instead of this (dup ?)
+    set stem [file rootname $basename]
+    set basename_ext [file extension $basename]
+    if {$basename_ext != ""} {
+ regsub -- {^.*\.} $basename_ext {} basename_ext
+    }
+    lappend tfiles "$stem.{$basename_ext,exe}"
+    unset basename_ext
+ } else {
+    lappend tfiles $basename
+ }
+    }

I wasn't sure if upvar 1 output_file would globally work? WDYT?

PS: IIRC someone from codesourcery meanwhile fixed the pch test
objects leftovers
so the
* lib/dg-pch.exp(pch-init): Remove pch-check objects.
is obsolete by now.

Re: [PATCH, testsuite]: Cleanup dumps

[Mike Stump]

On Jan 31, 2015, at 1:55 PM, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> 
> What about the -Wcomment question?

I don’t consider it linked in anyway to the patch at hand.  I’m not a big fan of the default flags being much different than the flags the user normally sees.  That said, would be nice to avoid this issue.  The best way forward I can think of would be a wholesale change to // style comments in the test suite for all test cases that accept that language.  // is standard C and C++, and by convention, I think they are fine in Objective-C and Obective-C++.

> And can you help with the two ??? maybe?

Which type of help?

[PATCH, testsuite]: Cleanup dumps

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

Hello!

2015-01-31  Uros Bizjak  <ubizjak@gmail.com>

    * g++.dg/ipa/pr64146.C (dg-final): Cleanup icf ipa dump.
    * gcc.target/i386/chkp-builtins-1.c (dg-final): Cleanup chkp tree dump.
    * gcc.target/i386/chkp-builtins-2.c (dg-final): Ditto.
    * gcc.target/i386/chkp-builtins-3.c (dg-final): Ditto.
    * gcc.target/i386/chkp-builtins-4.c (dg-final): Ditto.
    * gcc.target/i386/chkp-const-check-1.c (dg-final): Cleanup chkopt
    tree dump.
    * gcc.target/i386/chkp-lifetime-1.c (dg-final): Ditto.
    * gcc.target/i386/chkp-remove-bndint-1.c (dg-final): Cleanup optimized
    tree dump.
    * gcc.target/i386/chkp-remove-bndint-2.c (dg-final): Ditto.
    * gfortran.dg/goacc/private-1.f95 (dg-final): Cleanup omplower
    tree dump.

Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN.

Uros.

[-- Attachment #2: t.diff.txt --]
[-- Type: text/plain, Size: 5064 bytes --]

Index: g++.dg/ipa/pr64146.C
===================================================================
--- g++.dg/ipa/pr64146.C	(revision 220302)
+++ g++.dg/ipa/pr64146.C	(working copy)
@@ -36,3 +36,4 @@
 
 /* { dg-final { scan-ipa-dump-times "Declaration does not bind to currect definition." 2 "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 2" "icf"  } } */
+/* { dg-final { cleanup-ipa-dump "icf" } } */
Index: gcc.target/i386/chkp-builtins-1.c
===================================================================
--- gcc.target/i386/chkp-builtins-1.c	(revision 220302)
+++ gcc.target/i386/chkp-builtins-1.c	(working copy)
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_init_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
Index: gcc.target/i386/chkp-builtins-2.c
===================================================================
--- gcc.target/i386/chkp-builtins-2.c	(revision 220302)
+++ gcc.target/i386/chkp-builtins-2.c	(working copy)
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_copy_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p, void *q)
Index: gcc.target/i386/chkp-builtins-3.c
===================================================================
--- gcc.target/i386/chkp-builtins-3.c	(revision 220302)
+++ gcc.target/i386/chkp-builtins-3.c	(working copy)
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_set_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
Index: gcc.target/i386/chkp-builtins-4.c
===================================================================
--- gcc.target/i386/chkp-builtins-4.c	(revision 220302)
+++ gcc.target/i386/chkp-builtins-4.c	(working copy)
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -fdump-tree-chkp" } */
 /* { dg-final { scan-tree-dump-not "bnd_null_ptr_bounds" "chkp" } } */
+/* { dg-final { cleanup-tree-dump "chkp" } } */
 
 void *
 chkp_test (void *p)
Index: gcc.target/i386/chkp-const-check-1.c
===================================================================
--- gcc.target/i386/chkp-const-check-1.c	(revision 220302)
+++ gcc.target/i386/chkp-const-check-1.c	(working copy)
@@ -3,8 +3,8 @@
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-chkpopt" } */
 /* { dg-final { scan-tree-dump-not "bndcl" "chkpopt" } } */
 /* { dg-final { scan-tree-dump-not "bndcu" "chkpopt" } } */
+/* { dg-final { cleanup-tree-dump "chkpopt" } } */
 
-
 int test (int *p)
 {
   p = (int *)__builtin___bnd_set_ptr_bounds (p, sizeof (int));
Index: gcc.target/i386/chkp-lifetime-1.c
===================================================================
--- gcc.target/i386/chkp-lifetime-1.c	(revision 220302)
+++ gcc.target/i386/chkp-lifetime-1.c	(working copy)
@@ -2,6 +2,7 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-chkpopt-details" } */
 /* { dg-final { scan-tree-dump "Moving creation of \[^ \]+ down to its use" "chkpopt" } } */
+/* { dg-final { cleanup-tree-dump "chkpopt" } } */
 
 extern int arr[];
 
Index: gcc.target/i386/chkp-remove-bndint-1.c
===================================================================
--- gcc.target/i386/chkp-remove-bndint-1.c	(revision 220302)
+++ gcc.target/i386/chkp-remove-bndint-1.c	(working copy)
@@ -2,8 +2,8 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-optimized" } */
 /* { dg-final { scan-tree-dump-not "bndint" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
 
-
 struct S
 {
   int a;
Index: gcc.target/i386/chkp-remove-bndint-2.c
===================================================================
--- gcc.target/i386/chkp-remove-bndint-2.c	(revision 220302)
+++ gcc.target/i386/chkp-remove-bndint-2.c	(working copy)
@@ -2,8 +2,8 @@
 /* { dg-require-effective-target mpx } */
 /* { dg-options "-fcheck-pointer-bounds -mmpx -O2 -fdump-tree-optimized -Wchkp" } */
 /* { dg-final { scan-tree-dump-not "bndint" "optimized" } } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */
 
-
 struct S
 {
   int a;
Index: gfortran.dg/goacc/private-1.f95
===================================================================
--- gfortran.dg/goacc/private-1.f95	(revision 220302)
+++ gfortran.dg/goacc/private-1.f95	(working copy)
@@ -35,3 +35,4 @@
 ! { 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" } }

[PATCH, testsuite]: Cleanup dumps

[Uros Bizjak]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

Hello!

2014-11-04  Uros Bizjak  <ubizjak@gmail.com>

    * g++.dg/ipa/devirt-44.C (dg-options): Remove -fdump-tree-optimized.
    * g++.dg/ipa/devirt-45.C (dg-options): Ditto.
    * g++.dg/tree-prof/morefunc.C (dg-final-use): Cleanup profile ipa dump.
    * g++.dg/tree-prof/reorder.C (dg-final-use): Ditto.
    * g++.dg/tree-prof/pr35545.C (dg-fina-use): Cleanup profile_estimate
    ipa dump.
    * gcc.dg/fold-reassoc-3.c (dg-final): Fix scan string.
    Cleanup original tree dump.
    * gcc.dg/tree-prof/20050826-2.c (dg-final-use): Cleanup dom1 tree dump.
    * gcc.dg/tree-prof/cmpsf-1.c (dg-final-use): Ditto.
    * gcc.dg/tree-ssa/pr61144.c (dg-final): Cleanup optimized tree dump.

Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN.

Uros.

[-- Attachment #2: t.diff.txt --]
[-- Type: text/plain, Size: 3916 bytes --]

Index: g++.dg/ipa/devirt-44.C
===================================================================
--- g++.dg/ipa/devirt-44.C	(revision 217089)
+++ g++.dg/ipa/devirt-44.C	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining -fdump-tree-optimized" } */
+/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining" } */
 struct A {
   virtual int foo () {return 1;}
   int wrapfoo () {foo();}
Index: g++.dg/ipa/devirt-45.C
===================================================================
--- g++.dg/ipa/devirt-45.C	(revision 217089)
+++ g++.dg/ipa/devirt-45.C	(working copy)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining -fdump-tree-optimized" } */
+/* { dg-options "-O3 -fno-ipa-cp -fdump-ipa-inline-details -fno-early-inlining" } */
 struct A {
   virtual int foo () {return 1;}
   int wrapfoo () {foo();}
Index: g++.dg/tree-prof/morefunc.C
===================================================================
--- g++.dg/tree-prof/morefunc.C	(revision 217089)
+++ g++.dg/tree-prof/morefunc.C	(working copy)
@@ -52,4 +52,4 @@
 }
 
 /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */
-
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: g++.dg/tree-prof/pr35545.C
===================================================================
--- g++.dg/tree-prof/pr35545.C	(revision 217089)
+++ g++.dg/tree-prof/pr35545.C	(working copy)
@@ -47,6 +47,6 @@
 
 }
 /* { dg-final-use { scan-ipa-dump "Indirect call -> direct call" "profile_estimate" } } */
-/* { dg-final-use { cleanup-ipa-dump "profile" } } */
+/* { dg-final-use { cleanup-ipa-dump "profile_estimate" } } */
 /* { dg-final-use { scan-tree-dump-not "OBJ_TYPE_REF" "optimized" } } */
 /* { dg-final-use { cleanup-tree-dump "optimized" } } */
Index: g++.dg/tree-prof/reorder.C
===================================================================
--- g++.dg/tree-prof/reorder.C	(revision 217089)
+++ g++.dg/tree-prof/reorder.C	(working copy)
@@ -45,4 +45,4 @@
 }
 
 /* { dg-final-use { scan-ipa-dump-times "Indirect call -> direct call" 2 "profile" } } */
-
+/* { dg-final-use { cleanup-ipa-dump "profile" } } */
Index: gcc.dg/fold-reassoc-3.c
===================================================================
--- gcc.dg/fold-reassoc-3.c	(revision 217089)
+++ gcc.dg/fold-reassoc-3.c	(working copy)
@@ -13,5 +13,5 @@
 }
 
 /* { dg-final { scan-tree-dump-not " - " "original" } } */
-/* { dg-final { scan-tree-dump-not " \\\+ " "original" } } */
-/* { dg-final { cleanup-tree-dump "orginal" } } */
+/* { dg-final { scan-tree-dump-not " \\+ " "original" } } */
+/* { dg-final { cleanup-tree-dump "original" } } */
Index: gcc.dg/tree-prof/20050826-2.c
===================================================================
--- gcc.dg/tree-prof/20050826-2.c	(revision 217089)
+++ gcc.dg/tree-prof/20050826-2.c	(working copy)
@@ -73,3 +73,4 @@
 }
 
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */
+/* { dg-final-use { cleanup-tree-dump "dom1" } } */
Index: gcc.dg/tree-prof/cmpsf-1.c
===================================================================
--- gcc.dg/tree-prof/cmpsf-1.c	(revision 217089)
+++ gcc.dg/tree-prof/cmpsf-1.c	(working copy)
@@ -182,3 +182,4 @@
 }
 
 /* { dg-final-use { scan-tree-dump-not "Invalid sum" "dom1"} } */
+/* { dg-final-use { cleanup-tree-dump "dom1" } } */
Index: gcc.dg/tree-ssa/pr61144.c
===================================================================
--- gcc.dg/tree-ssa/pr61144.c	(revision 217089)
+++ gcc.dg/tree-ssa/pr61144.c	(working copy)
@@ -5,3 +5,4 @@
 extern int foo __attribute__((__weak__, __alias__("dummy")));
 int bar() { if (foo) return 1; return 0; }
 /* { dg-final { scan-tree-dump-not "return 0" "optimized"} } */
+/* { dg-final { cleanup-tree-dump "optimized" } } */