| Message ID | 1453472443-32167-1-git-send-email-alan.lawrence@arm.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 22, 2016 at 3:20 PM, Alan Lawrence <alan.lawrence@arm.com> wrote: > Since r230292, these tests in gcc.dg/vect have been failing on ARM, AArch64, and x86_64 with -march=haswell (among others - when prefer_avx128 is true): > > vect-outer-1-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-1.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-1a-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-1a.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-1b-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-1b.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-2b.c scan-tree-dump-times vect "grouped access in outer loop" 2 > vect-outer-3b.c scan-tree-dump-times vect "grouped access in outer loop" 4 > vect-reduc-dot-s8b.c scan-tree-dump-times vect "vect_recog_widen_mult_pattern: detected" 2 > (plus all the -flto -ffat-lto-objects equivalents). > > This is because that commit changed vect_analyze_loop{,_2} to bail out early > and avoid retrying with a different vector size on finding a fatal error; > all the above tests are conditioned on { target vect_multiple_sizes }. > > Hence, drop the vect_multiple_sizes version of the scan-tree-dump, as we now > expect those messages to show up once everywhere. > > The optional extra would be to add a message that vect_analyze_loop was failing > with *fatal* error, and scan for that, but that doesn't really seem warranted. > > Tested vect.exp on aarch64-none-elf, arm-none-eabi, and x86_64 linux with -march=haswell. > > OK for trunk? Ok. Thanks, Richard. > Cheers, Alan > > gcc/testsuite/ChangeLog: > > * gcc.dg/vect/vect-outer-1-big-array.c: Drop vect_multiple_sizes; > use same scan-tree-dump-times on all platforms. > * gcc.dg/vect/vect-outer-1.c: Likewise. > * gcc.dg/vect/vect-outer-1a-big-array.c: Likewise. > * gcc.dg/vect/vect-outer-1a.c: Likewise. > * gcc.dg/vect/vect-outer-1b-big-array.c: Likewise. > * gcc.dg/vect/vect-outer-1b.c: Likewise. > * gcc.dg/vect/vect-outer-2b.c: Likewise. > * gcc.dg/vect/vect-outer-3b.c: Likewise. > * gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise. > --- > gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-1.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-1a.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-1b.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-2b.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-outer-3b.c | 3 +-- > gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c | 3 +-- > 9 files changed, 9 insertions(+), 18 deletions(-) > > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c > index 6c61b09..63918ad 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c > @@ -22,5 +22,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c > index 5fdaa83..b1bcbc2 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c > @@ -22,5 +22,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c > index 68b25f9..98dfcfb 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c > @@ -20,5 +20,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c > index 85649af..0200fb4 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c > @@ -20,5 +20,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c > index 133347d..fda70f7 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c > @@ -22,5 +22,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c > index 15b0a0b..e157f73 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c > @@ -22,5 +22,4 @@ foo (){ > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c > index 1ddf176..bb4e74b 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c > @@ -37,5 +37,4 @@ int main (void) > return 0; > } > > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c > index 2a9a2ce..b915c4e 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c > @@ -49,5 +49,4 @@ int main (void) > } > > /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 4 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" } } */ > diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c > index b178662..b036ad5 100644 > --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c > +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c > @@ -58,8 +58,7 @@ int main (void) > } > > /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */ > -/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target { ! vect_multiple_sizes } } } } */ > -/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_multiple_sizes } } } */ > +/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */ > > /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */ > > -- > 1.9.1 >
diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c index 6c61b09..63918ad 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c @@ -22,5 +22,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c index 5fdaa83..b1bcbc2 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1.c @@ -22,5 +22,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c index 68b25f9..98dfcfb 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c @@ -20,5 +20,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c index 85649af..0200fb4 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1a.c @@ -20,5 +20,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c index 133347d..fda70f7 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c @@ -22,5 +22,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c index 15b0a0b..e157f73 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-1b.c @@ -22,5 +22,4 @@ foo (){ } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c index 1ddf176..bb4e74b 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-2b.c @@ -37,5 +37,4 @@ int main (void) return 0; } -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c index 2a9a2ce..b915c4e 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c +++ b/gcc/testsuite/gcc.dg/vect/vect-outer-3b.c @@ -49,5 +49,4 @@ int main (void) } /* { dg-final { scan-tree-dump-times "OUTER LOOP VECTORIZED" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 4 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "grouped access in outer loop" 2 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c index b178662..b036ad5 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c +++ b/gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c @@ -58,8 +58,7 @@ int main (void) } /* { dg-final { scan-tree-dump-times "vect_recog_dot_prod_pattern: detected" 1 "vect" { xfail *-*-* } } } */ -/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" { target { ! vect_multiple_sizes } } } } */ -/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 2 "vect" { target vect_multiple_sizes } } } */ +/* { dg-final { scan-tree-dump-times "vect_recog_widen_mult_pattern: detected" 1 "vect" } } */ /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail *-*-* } } } */
Since r230292, these tests in gcc.dg/vect have been failing on ARM, AArch64, and x86_64 with -march=haswell (among others - when prefer_avx128 is true): vect-outer-1-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-1.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-1a-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-1a.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-1b-big-array.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-1b.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-2b.c scan-tree-dump-times vect "grouped access in outer loop" 2 vect-outer-3b.c scan-tree-dump-times vect "grouped access in outer loop" 4 vect-reduc-dot-s8b.c scan-tree-dump-times vect "vect_recog_widen_mult_pattern: detected" 2 (plus all the -flto -ffat-lto-objects equivalents). This is because that commit changed vect_analyze_loop{,_2} to bail out early and avoid retrying with a different vector size on finding a fatal error; all the above tests are conditioned on { target vect_multiple_sizes }. Hence, drop the vect_multiple_sizes version of the scan-tree-dump, as we now expect those messages to show up once everywhere. The optional extra would be to add a message that vect_analyze_loop was failing with *fatal* error, and scan for that, but that doesn't really seem warranted. Tested vect.exp on aarch64-none-elf, arm-none-eabi, and x86_64 linux with -march=haswell. OK for trunk? Cheers, Alan gcc/testsuite/ChangeLog: * gcc.dg/vect/vect-outer-1-big-array.c: Drop vect_multiple_sizes; use same scan-tree-dump-times on all platforms. * gcc.dg/vect/vect-outer-1.c: Likewise. * gcc.dg/vect/vect-outer-1a-big-array.c: Likewise. * gcc.dg/vect/vect-outer-1a.c: Likewise. * gcc.dg/vect/vect-outer-1b-big-array.c: Likewise. * gcc.dg/vect/vect-outer-1b.c: Likewise. * gcc.dg/vect/vect-outer-2b.c: Likewise. * gcc.dg/vect/vect-outer-3b.c: Likewise. * gcc.dg/vect/vect-reduc-dot-s8b.c: Likewise. --- gcc/testsuite/gcc.dg/vect/vect-outer-1-big-array.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-1.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-1a-big-array.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-1a.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-1b-big-array.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-1b.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-2b.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-outer-3b.c | 3 +-- gcc/testsuite/gcc.dg/vect/vect-reduc-dot-s8b.c | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-)