From c98446bc37da231419f6524d788dc6a4712458c8 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Thu, 5 Jul 2018 09:10:55 +0000 Subject: [PATCH] [testsuite] Remove 'note:' from scan-tree-dump directives 2018-07-05 Christophe Lyon * c-c++-common/unroll-1.c: Remove 'note:' in matching string. * c-c++-common/unroll-2.c: Likewise. * g++.dg/cdce3.C: Likewise. * g++.dg/ext/unroll-1.C: Likewise. * g++.dg/ext/unroll-2.C: Likewise. * g++.dg/ext/unroll-3.C: Likewise. * gcc.dg/cdce1.c: Likewise. * gcc.dg/cdce2.c: Likewise. * gcc.dg/gomp/pr68128-1.c: Likewise. * gcc.dg/vect/pr46032.c: Likewise. * gcc.dg/vect/vect-cond-10.c: Likewise. * gcc.dg/vect/vect-cond-8.c: Likewise. * gcc.dg/vect/vect-cond-9.c: Likewise. * gcc.dg/vect/vect-mask-load-1.c: Likewise. * gcc.dg/vect/vect-mask-loadstore-1.c: Likewise. * gcc.target/i386/avx-cvt-2.c: Likewise. * gcc.target/i386/avx-cvt-3.c: Likewise. * gcc.target/i386/avx2-cvt-2.c: Likewise. * gcc.target/i386/avx2-gather-2.c: Likewise. * gcc.target/i386/avx2-gather-6.c: Likewise. * gcc.target/i386/avx512f-gather-2.c: Likewise. * gcc.target/i386/sse2-cvt-2.c: Likewise. * gfortran.dg/directive_unroll_1.f90: Likewise. * gfortran.dg/directive_unroll_2.f90: Likewise. * gnat.dg/unroll2.adb: Likewise. * gnat.dg/unroll3.adb: Likewise. From-SVN: r262432 --- gcc/testsuite/ChangeLog | 29 +++++++++++++++++ gcc/testsuite/c-c++-common/unroll-1.c | 4 +-- gcc/testsuite/c-c++-common/unroll-2.c | 4 +-- gcc/testsuite/g++.dg/cdce3.C | 32 +++++++++---------- gcc/testsuite/g++.dg/ext/unroll-1.C | 2 +- gcc/testsuite/g++.dg/ext/unroll-2.C | 2 +- gcc/testsuite/g++.dg/ext/unroll-3.C | 2 +- gcc/testsuite/gcc.dg/cdce1.c | 2 +- gcc/testsuite/gcc.dg/cdce2.c | 2 +- gcc/testsuite/gcc.dg/gomp/pr68128-1.c | 2 +- gcc/testsuite/gcc.dg/vect/pr46032.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-cond-10.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-cond-8.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-cond-9.c | 2 +- gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c | 2 +- .../gcc.dg/vect/vect-mask-loadstore-1.c | 2 +- gcc/testsuite/gcc.target/i386/avx-cvt-2.c | 2 +- gcc/testsuite/gcc.target/i386/avx-cvt-3.c | 2 +- gcc/testsuite/gcc.target/i386/avx2-cvt-2.c | 2 +- gcc/testsuite/gcc.target/i386/avx2-gather-2.c | 2 +- gcc/testsuite/gcc.target/i386/avx2-gather-6.c | 2 +- .../gcc.target/i386/avx512f-gather-2.c | 2 +- gcc/testsuite/gcc.target/i386/sse2-cvt-2.c | 2 +- .../gfortran.dg/directive_unroll_1.f90 | 2 +- .../gfortran.dg/directive_unroll_2.f90 | 2 +- gcc/testsuite/gnat.dg/unroll2.adb | 2 +- gcc/testsuite/gnat.dg/unroll3.adb | 2 +- 27 files changed, 72 insertions(+), 43 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d685d81867b..db1197e8eba 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,32 @@ +2018-07-05 Christophe Lyon + + * c-c++-common/unroll-1.c: Remove 'note:' in matching string. + * c-c++-common/unroll-2.c: Likewise. + * g++.dg/cdce3.C: Likewise. + * g++.dg/ext/unroll-1.C: Likewise. + * g++.dg/ext/unroll-2.C: Likewise. + * g++.dg/ext/unroll-3.C: Likewise. + * gcc.dg/cdce1.c: Likewise. + * gcc.dg/cdce2.c: Likewise. + * gcc.dg/gomp/pr68128-1.c: Likewise. + * gcc.dg/vect/pr46032.c: Likewise. + * gcc.dg/vect/vect-cond-10.c: Likewise. + * gcc.dg/vect/vect-cond-8.c: Likewise. + * gcc.dg/vect/vect-cond-9.c: Likewise. + * gcc.dg/vect/vect-mask-load-1.c: Likewise. + * gcc.dg/vect/vect-mask-loadstore-1.c: Likewise. + * gcc.target/i386/avx-cvt-2.c: Likewise. + * gcc.target/i386/avx-cvt-3.c: Likewise. + * gcc.target/i386/avx2-cvt-2.c: Likewise. + * gcc.target/i386/avx2-gather-2.c: Likewise. + * gcc.target/i386/avx2-gather-6.c: Likewise. + * gcc.target/i386/avx512f-gather-2.c: Likewise. + * gcc.target/i386/sse2-cvt-2.c: Likewise. + * gfortran.dg/directive_unroll_1.f90: Likewise. + * gfortran.dg/directive_unroll_2.f90: Likewise. + * gnat.dg/unroll2.adb: Likewise. + * gnat.dg/unroll3.adb: Likewise. + 2018-07-05 Tom de Vries * lib/gcc-dg.exp (dg-final): Simplify tcl code. diff --git a/gcc/testsuite/c-c++-common/unroll-1.c b/gcc/testsuite/c-c++-common/unroll-1.c index ccae250af53..105a82c6200 100644 --- a/gcc/testsuite/c-c++-common/unroll-1.c +++ b/gcc/testsuite/c-c++-common/unroll-1.c @@ -10,12 +10,12 @@ void test (void) #pragma GCC unroll 8 for (unsigned long i = 1; i <= 8; ++i) bar(i); - /* { dg-final { scan-tree-dump "11:.*: note: loop with 8 iterations completely unrolled" "cunrolli" } } */ + /* { dg-final { scan-tree-dump "11:.*: loop with 8 iterations completely unrolled" "cunrolli" } } */ #pragma GCC unroll 8 for (unsigned long i = 1; i <= 7; ++i) bar(i); - /* { dg-final { scan-tree-dump "16:.*: note: loop with 7 iterations completely unrolled" "cunrolli" } } */ + /* { dg-final { scan-tree-dump "16:.*: loop with 7 iterations completely unrolled" "cunrolli" } } */ #pragma GCC unroll 8 for (unsigned long i = 1; i <= 15; ++i) diff --git a/gcc/testsuite/c-c++-common/unroll-2.c b/gcc/testsuite/c-c++-common/unroll-2.c index 635b6c25349..a67a1d75bc8 100644 --- a/gcc/testsuite/c-c++-common/unroll-2.c +++ b/gcc/testsuite/c-c++-common/unroll-2.c @@ -10,12 +10,12 @@ void test (void) #pragma GCC unroll 8 for (unsigned long i = 1; i <= 8; ++i) bar(i); - /* { dg-final { scan-tree-dump "11:.*: note: loop with 7 iterations completely unrolled" "cunroll" } } */ + /* { dg-final { scan-tree-dump "11:.*: loop with 7 iterations completely unrolled" "cunroll" } } */ #pragma GCC unroll 8 for (unsigned long i = 1; i <= 7; ++i) bar(i); - /* { dg-final { scan-tree-dump "16:.*: note: loop with 6 iterations completely unrolled" "cunroll" } } */ + /* { dg-final { scan-tree-dump "16:.*: loop with 6 iterations completely unrolled" "cunroll" } } */ #pragma GCC unroll 8 for (unsigned long i = 1; i <= 15; ++i) diff --git a/gcc/testsuite/g++.dg/cdce3.C b/gcc/testsuite/g++.dg/cdce3.C index 39379534872..4b547b5d994 100644 --- a/gcc/testsuite/g++.dg/cdce3.C +++ b/gcc/testsuite/g++.dg/cdce3.C @@ -4,22 +4,22 @@ /* { dg-additional-options "-DLARGE_LONG_DOUBLE" { target large_long_double } } */ /* { dg-additional-options "-DGNU_EXTENSION" { target pow10 } } */ /* { dg-add-options ieee } */ -/* { dg-final { scan-tree-dump "cdce3.C:91: note: function call is shrink-wrapped into error conditions\." "cdce" { target pow10 } } } */ -/* { dg-final { scan-tree-dump "cdce3.C:92: note: function call is shrink-wrapped into error conditions\." "cdce" { target pow10 } } } */ -/* { dg-final { scan-tree-dump "cdce3.C:94: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:95: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:96: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:97: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:98: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:99: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:100: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:101: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:102: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:103: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:104: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:105: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:106: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ -/* { dg-final { scan-tree-dump "cdce3.C:107: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:91: .* function call is shrink-wrapped into error conditions\." "cdce" { target pow10 } } } */ +/* { dg-final { scan-tree-dump "cdce3.C:92: .* function call is shrink-wrapped into error conditions\." "cdce" { target pow10 } } } */ +/* { dg-final { scan-tree-dump "cdce3.C:94: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:95: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:96: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:97: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:98: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:99: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:100: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:101: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:102: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:103: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:104: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:105: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:106: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce3.C:107: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ #include #include diff --git a/gcc/testsuite/g++.dg/ext/unroll-1.C b/gcc/testsuite/g++.dg/ext/unroll-1.C index 2d58a6a7b0e..aa11b2e6ef7 100644 --- a/gcc/testsuite/g++.dg/ext/unroll-1.C +++ b/gcc/testsuite/g++.dg/ext/unroll-1.C @@ -16,4 +16,4 @@ bar (int *a, int *b, int *c) foo (a, b, c); } -// { dg-final { scan-tree-dump "note: loop with 8 iterations completely unrolled" "cunrolli" } } +// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } } diff --git a/gcc/testsuite/g++.dg/ext/unroll-2.C b/gcc/testsuite/g++.dg/ext/unroll-2.C index e68cc317675..f9ec892dbdd 100644 --- a/gcc/testsuite/g++.dg/ext/unroll-2.C +++ b/gcc/testsuite/g++.dg/ext/unroll-2.C @@ -10,4 +10,4 @@ foo (int (&a)[8], int *b, int *c) a[i] = b[i] * c[i]; } -// { dg-final { scan-tree-dump "note: loop with 8 iterations completely unrolled" "cunrolli" } } +// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } } diff --git a/gcc/testsuite/g++.dg/ext/unroll-3.C b/gcc/testsuite/g++.dg/ext/unroll-3.C index 6516ee97c96..dda94c56af2 100644 --- a/gcc/testsuite/g++.dg/ext/unroll-3.C +++ b/gcc/testsuite/g++.dg/ext/unroll-3.C @@ -17,4 +17,4 @@ bar (int (&a)[8], int *b, int *c) foo (a, b, c); } -// { dg-final { scan-tree-dump "note: loop with 8 iterations completely unrolled" "cunrolli" } } +// { dg-final { scan-tree-dump "loop with 8 iterations completely unrolled" "cunrolli" } } diff --git a/gcc/testsuite/gcc.dg/cdce1.c b/gcc/testsuite/gcc.dg/cdce1.c index 02b47c0f9bf..b23ad637112 100644 --- a/gcc/testsuite/gcc.dg/cdce1.c +++ b/gcc/testsuite/gcc.dg/cdce1.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details -lm" } */ /* { dg-require-effective-target int32plus } */ -/* { dg-final { scan-tree-dump "cdce1.c:16: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce1.c:16: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ /* { dg-require-effective-target large_double } */ #include diff --git a/gcc/testsuite/gcc.dg/cdce2.c b/gcc/testsuite/gcc.dg/cdce2.c index 9e6f3446769..30e7cb1fa0a 100644 --- a/gcc/testsuite/gcc.dg/cdce2.c +++ b/gcc/testsuite/gcc.dg/cdce2.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-skip-if "doubles are floats" { "avr-*-*" } } */ /* { dg-options "-O2 -fmath-errno -fdump-tree-cdce-details -lm" } */ -/* { dg-final { scan-tree-dump "cdce2.c:15: note: function call is shrink-wrapped into error conditions\." "cdce" } } */ +/* { dg-final { scan-tree-dump "cdce2.c:15: .* function call is shrink-wrapped into error conditions\." "cdce" } } */ #include #include diff --git a/gcc/testsuite/gcc.dg/gomp/pr68128-1.c b/gcc/testsuite/gcc.dg/gomp/pr68128-1.c index 36823c2af0a..01cc605ae0e 100644 --- a/gcc/testsuite/gcc.dg/gomp/pr68128-1.c +++ b/gcc/testsuite/gcc.dg/gomp/pr68128-1.c @@ -29,4 +29,4 @@ foo (float *u, float v, float w, float x, float y, float z, float t) } } -/* { dg-final { scan-tree-dump "note: vectorized 1 loops in function" "vect" { target i?86-*-* x86_64-*-* } } } */ +/* { dg-final { scan-tree-dump "vectorized 1 loops in function" "vect" { target i?86-*-* x86_64-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/vect/pr46032.c b/gcc/testsuite/gcc.dg/vect/pr46032.c index e1a58347b93..bad87453a7d 100644 --- a/gcc/testsuite/gcc.dg/vect/pr46032.c +++ b/gcc/testsuite/gcc.dg/vect/pr46032.c @@ -44,6 +44,6 @@ main (void) return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loop" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loop" 1 "vect" { xfail { vect_no_align && { ! vect_hw_misalign } } } } } */ /* { dg-final { scan-tree-dump-not "versioning for alias required" "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-10.c b/gcc/testsuite/gcc.dg/vect/vect-cond-10.c index 1a18800850a..b2f97d735ef 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-cond-10.c +++ b/gcc/testsuite/gcc.dg/vect/vect-cond-10.c @@ -163,4 +163,4 @@ main () return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 8 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 8 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-8.c b/gcc/testsuite/gcc.dg/vect/vect-cond-8.c index 224251d0cf5..d888442aa45 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-cond-8.c +++ b/gcc/testsuite/gcc.dg/vect/vect-cond-8.c @@ -119,4 +119,4 @@ main () return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 5 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 5 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-cond-9.c b/gcc/testsuite/gcc.dg/vect/vect-cond-9.c index c03ed96d62f..63eee1b4729 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-cond-9.c +++ b/gcc/testsuite/gcc.dg/vect/vect-cond-9.c @@ -198,4 +198,4 @@ main () return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 10 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 10 "vect" } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c b/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c index 3a38b64e520..992cbda2e91 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-mask-load-1.c @@ -46,4 +46,4 @@ main () return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 1 "vect" { target avx_runtime } } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target avx_runtime } } } */ diff --git a/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c b/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c index 56b130e8bf7..7d9dc5addf5 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c +++ b/gcc/testsuite/gcc.dg/vect/vect-mask-loadstore-1.c @@ -44,4 +44,4 @@ main () return 0; } -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops" 1 "vect" { target avx_runtime } } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target avx_runtime } } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx-cvt-2.c b/gcc/testsuite/gcc.target/i386/avx-cvt-2.c index 7380833c093..1fbcf6e5025 100644 --- a/gcc/testsuite/gcc.target/i386/avx-cvt-2.c +++ b/gcc/testsuite/gcc.target/i386/avx-cvt-2.c @@ -3,7 +3,7 @@ #include "avx-cvt-1.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 6 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 6 "vect" } } */ /* { dg-final { scan-assembler "vcvttpd2dq(y\[^\n\r\]*%xmm|\[^\n\r\]*xmm\[^\n\r\]*YMMWORD PTR)" } } */ /* { dg-final { scan-assembler "vcvtdq2ps\[^\n\r\]*ymm" } } */ /* { dg-final { scan-assembler "vcvtps2pd\[^\n\r\]*(%xmm\[^\n\r\]*%ymm|ymm\[^\n\r\]*xmm)" } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx-cvt-3.c b/gcc/testsuite/gcc.target/i386/avx-cvt-3.c index de2e482e476..33af620c76c 100644 --- a/gcc/testsuite/gcc.target/i386/avx-cvt-3.c +++ b/gcc/testsuite/gcc.target/i386/avx-cvt-3.c @@ -3,7 +3,7 @@ #include "avx-cvt-1.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 6 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 6 "vect" } } */ /* { dg-final { scan-assembler "vcvttpd2dq(x\[^\n\r\]*%xmm|\[^\n\r\]*xmm\[^\n\r\]*XMMWORD PTR)" } } */ /* { dg-final { scan-assembler "vcvtdq2ps\[^\n\r\]*xmm" } } */ /* { dg-final { scan-assembler "vcvtps2pd\[^\n\r\]*(%xmm\[^\n\r\]*%xmm|xmm\[^\n\r\]*xmm)" } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c b/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c index 317c2c01121..d37809da81b 100644 --- a/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c +++ b/gcc/testsuite/gcc.target/i386/avx2-cvt-2.c @@ -3,7 +3,7 @@ #include "avx2-cvt-1.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 6 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 6 "vect" } } */ /* { dg-final { scan-assembler "vcvttpd2dq(y\[^\n\r\]*%xmm|\[^\n\r\]*xmm\[^\n\r\]*YMMWORD PTR)" } } */ /* { dg-final { scan-assembler "vcvtdq2ps\[^\n\r\]*ymm" } } */ /* { dg-final { scan-assembler "vcvtps2pd\[^\n\r\]*(%xmm\[^\n\r\]*%ymm|ymm\[^\n\r\]*xmm)" } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx2-gather-2.c b/gcc/testsuite/gcc.target/i386/avx2-gather-2.c index e0803233071..1a704afd834 100644 --- a/gcc/testsuite/gcc.target/i386/avx2-gather-2.c +++ b/gcc/testsuite/gcc.target/i386/avx2-gather-2.c @@ -3,4 +3,4 @@ #include "avx2-gather-1.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 16 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 16 "vect" } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx2-gather-6.c b/gcc/testsuite/gcc.target/i386/avx2-gather-6.c index 0ffb04f7c8c..b9119581ae2 100644 --- a/gcc/testsuite/gcc.target/i386/avx2-gather-6.c +++ b/gcc/testsuite/gcc.target/i386/avx2-gather-6.c @@ -3,4 +3,4 @@ #include "avx2-gather-5.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 1 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 1 "vect" } } */ diff --git a/gcc/testsuite/gcc.target/i386/avx512f-gather-2.c b/gcc/testsuite/gcc.target/i386/avx512f-gather-2.c index e52a0ef599c..a26aa6529e8 100644 --- a/gcc/testsuite/gcc.target/i386/avx512f-gather-2.c +++ b/gcc/testsuite/gcc.target/i386/avx512f-gather-2.c @@ -7,4 +7,4 @@ /* { dg-final { scan-assembler-not "gather\[^\n\]*xmm\[^\n\]*ymm" } } */ /* { dg-final { scan-assembler-not "gather\[^\n\]*ymm\[^\n\]*xmm" } } */ /* { dg-final { scan-assembler-not "gather\[^\n\]*xmm\[^\n\]*xmm" } } */ -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 16 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 16 "vect" } } */ diff --git a/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c b/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c index 97bd1fdf15b..0ecafb2eaac 100644 --- a/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c +++ b/gcc/testsuite/gcc.target/i386/sse2-cvt-2.c @@ -3,7 +3,7 @@ #include "sse2-cvt-1.c" -/* { dg-final { scan-tree-dump-times "note: vectorized 1 loops in function" 6 "vect" } } */ +/* { dg-final { scan-tree-dump-times "vectorized 1 loops in function" 6 "vect" } } */ /* { dg-final { scan-assembler "cvttpd2dq" } } */ /* { dg-final { scan-assembler "cvtdq2ps" } } */ /* { dg-final { scan-assembler "cvtps2pd" } } */ diff --git a/gcc/testsuite/gfortran.dg/directive_unroll_1.f90 b/gcc/testsuite/gfortran.dg/directive_unroll_1.f90 index 00fe7dcb345..85b3671c909 100644 --- a/gcc/testsuite/gfortran.dg/directive_unroll_1.f90 +++ b/gcc/testsuite/gfortran.dg/directive_unroll_1.f90 @@ -12,7 +12,7 @@ subroutine test1(a) DO i=1, 8, 1 call dummy(a(i)) ENDDO -! { dg-final { scan-tree-dump "12:.*: note: loop with 8 iterations completely unrolled" "cunrolli" } } */ +! { dg-final { scan-tree-dump "12:.*: loop with 8 iterations completely unrolled" "cunrolli" } } */ end subroutine test1 subroutine test2(a, n) diff --git a/gcc/testsuite/gfortran.dg/directive_unroll_2.f90 b/gcc/testsuite/gfortran.dg/directive_unroll_2.f90 index bc93f91afa7..6dff8faf3e0 100644 --- a/gcc/testsuite/gfortran.dg/directive_unroll_2.f90 +++ b/gcc/testsuite/gfortran.dg/directive_unroll_2.f90 @@ -12,7 +12,7 @@ subroutine test1(a) DO i=1, 8, 1 call dummy(a(i)) ENDDO -! { dg-final { scan-tree-dump "12:.*: note: loop with 7 iterations completely unrolled" "cunroll" } } */ +! { dg-final { scan-tree-dump "12:.*: loop with 7 iterations completely unrolled" "cunroll" } } */ end subroutine test1 subroutine test2(a, n) diff --git a/gcc/testsuite/gnat.dg/unroll2.adb b/gcc/testsuite/gnat.dg/unroll2.adb index e4473cc0558..1d3a75706de 100644 --- a/gcc/testsuite/gnat.dg/unroll2.adb +++ b/gcc/testsuite/gnat.dg/unroll2.adb @@ -23,4 +23,4 @@ package body Unroll2 is end Unroll2; --- { dg-final { scan-tree-dump-times "note: loop with 3 iterations completely unrolled" 2 "cunrolli" } } +-- { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 2 "cunrolli" } } diff --git a/gcc/testsuite/gnat.dg/unroll3.adb b/gcc/testsuite/gnat.dg/unroll3.adb index ba4e122530a..3bd06e7de76 100644 --- a/gcc/testsuite/gnat.dg/unroll3.adb +++ b/gcc/testsuite/gnat.dg/unroll3.adb @@ -23,4 +23,4 @@ package body Unroll3 is end Unroll3; --- { dg-final { scan-tree-dump-times "note: loop with 3 iterations completely unrolled" 2 "cunroll" } } +-- { dg-final { scan-tree-dump-times "loop with 3 iterations completely unrolled" 2 "cunroll" } } -- 2.30.2