diff mbox

Fix PR68707

Message ID 87r3hp8wbp.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Jan. 10, 2016, 12:15 p.m. UTC
Hi!

On Fri,  8 Jan 2016 11:30:16 +0000, Alan Lawrence <alan.lawrence@arm.com> wrote:
> Here's an alternative patch, [...]

> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */

For all these, you're missing to provide the "suffix" in the
'scan-tree-dump "note: [...]' directives, which results in:

    UNRESOLVED: gcc.dg/vect/slp-perm-1.c -flto -ffat-lto-objects  scan-tree-dump  target { vect_perm && vect_load_lanes }  "note: Built SLP cancelled: can use load/store-lanes"

The target selector doesn't trigger in my x86_64 GNU/Linux testing, but
to get rid of the UNRESOLVEDs, in r232197 I fixed at least the syntax as
follows:

commit 880ed4be84bfc9cec83d7c9718fd4f87a9ca8f39
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Sun Jan 10 12:12:38 2016 +0000

    Fix scan-tree-dump syntax
    
    	gcc/testsuite/
    	* gcc.dg/vect/slp-perm-1.c: Fix scan-tree-dump syntax.
    	* gcc.dg/vect/slp-perm-2.c: Likewise.
    	* gcc.dg/vect/slp-perm-3.c: Likewise.
    	* gcc.dg/vect/slp-perm-5.c: Likewise.
    	* gcc.dg/vect/slp-perm-6.c: Likewise.
    	* gcc.dg/vect/slp-perm-7.c: Likewise.
    	* gcc.dg/vect/slp-perm-8.c: Likewise.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232197 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                |   10 ++++++++++
 gcc/testsuite/gcc.dg/vect/slp-perm-1.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-2.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-3.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-5.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-6.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-7.c |    2 +-
 gcc/testsuite/gcc.dg/vect/slp-perm-8.c |    2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)



Grüße
 Thomas

Comments

Christophe Lyon Jan. 11, 2016, 1:08 p.m. UTC | #1
On 10 January 2016 at 13:15, Thomas Schwinge <thomas@codesourcery.com> wrote:
> Hi!
>
> On Fri,  8 Jan 2016 11:30:16 +0000, Alan Lawrence <alan.lawrence@arm.com> wrote:
>> Here's an alternative patch, [...]
>
>> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
>
> For all these, you're missing to provide the "suffix" in the
> 'scan-tree-dump "note: [...]' directives, which results in:
>
>     UNRESOLVED: gcc.dg/vect/slp-perm-1.c -flto -ffat-lto-objects  scan-tree-dump  target { vect_perm && vect_load_lanes }  "note: Built SLP cancelled: can use load/store-lanes"
>
> The target selector doesn't trigger in my x86_64 GNU/Linux testing, but
> to get rid of the UNRESOLVEDs, in r232197 I fixed at least the syntax as
> follows:
>

Not sure if I need to mention that these updated tests fail on armeb;
I guess that falls into the known problems with vectorization on
armeb.

Christophe.

> commit 880ed4be84bfc9cec83d7c9718fd4f87a9ca8f39
> Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
> Date:   Sun Jan 10 12:12:38 2016 +0000
>
>     Fix scan-tree-dump syntax
>
>         gcc/testsuite/
>         * gcc.dg/vect/slp-perm-1.c: Fix scan-tree-dump syntax.
>         * gcc.dg/vect/slp-perm-2.c: Likewise.
>         * gcc.dg/vect/slp-perm-3.c: Likewise.
>         * gcc.dg/vect/slp-perm-5.c: Likewise.
>         * gcc.dg/vect/slp-perm-6.c: Likewise.
>         * gcc.dg/vect/slp-perm-7.c: Likewise.
>         * gcc.dg/vect/slp-perm-8.c: Likewise.
>
>     git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232197 138bc75d-0d04-0410-961f-82ee72b054a4
> ---
>  gcc/testsuite/ChangeLog                |   10 ++++++++++
>  gcc/testsuite/gcc.dg/vect/slp-perm-1.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-2.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-3.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-5.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-6.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-7.c |    2 +-
>  gcc/testsuite/gcc.dg/vect/slp-perm-8.c |    2 +-
>  8 files changed, 17 insertions(+), 7 deletions(-)
>
> diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
> index 198f26c..3005c9f 100644
> --- gcc/testsuite/ChangeLog
> +++ gcc/testsuite/ChangeLog
> @@ -1,3 +1,13 @@
> +2016-01-10  Thomas Schwinge  <thomas@codesourcery.com>
> +
> +       * gcc.dg/vect/slp-perm-1.c: Fix scan-tree-dump syntax.
> +       * gcc.dg/vect/slp-perm-2.c: Likewise.
> +       * gcc.dg/vect/slp-perm-3.c: Likewise.
> +       * gcc.dg/vect/slp-perm-5.c: Likewise.
> +       * gcc.dg/vect/slp-perm-6.c: Likewise.
> +       * gcc.dg/vect/slp-perm-7.c: Likewise.
> +       * gcc.dg/vect/slp-perm-8.c: Likewise.
> +
>  2016-01-10  Tom de Vries  <tom@codesourcery.com>
>
>         PR tree-optimization/69039
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-1.c gcc/testsuite/gcc.dg/vect/slp-perm-1.c
> index 6d0d66f..ee211f2 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-1.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-1.c
> @@ -60,7 +60,7 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
>
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-2.c gcc/testsuite/gcc.dg/vect/slp-perm-2.c
> index 34b413d..4bab348 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-2.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-2.c
> @@ -56,6 +56,6 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-3.c gcc/testsuite/gcc.dg/vect/slp-perm-3.c
> index ec13e0f..568e400 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-3.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-3.c
> @@ -69,7 +69,7 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
>
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-5.c gcc/testsuite/gcc.dg/vect/slp-perm-5.c
> index f44f44f..806603f 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-5.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-5.c
> @@ -75,7 +75,7 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
>
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-6.c gcc/testsuite/gcc.dg/vect/slp-perm-6.c
> index 551734a..0fb4a6b 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-6.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-6.c
> @@ -74,6 +74,6 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-7.c gcc/testsuite/gcc.dg/vect/slp-perm-7.c
> index 8b66142..a2881f9 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-7.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-7.c
> @@ -73,6 +73,6 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect"  { target vect_perm } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
> diff --git gcc/testsuite/gcc.dg/vect/slp-perm-8.c gcc/testsuite/gcc.dg/vect/slp-perm-8.c
> index b1e9a10..d5fa1e8 100644
> --- gcc/testsuite/gcc.dg/vect/slp-perm-8.c
> +++ gcc/testsuite/gcc.dg/vect/slp-perm-8.c
> @@ -56,6 +56,6 @@ int main (int argc, const char* argv[])
>  /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm_byte && {! vect_char_mult } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm_byte && {! vect_load_lanes } } } } } */
>  /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
> -/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm_byte && vect_load_lanes } } } } */
> +/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm_byte && vect_load_lanes } } } } */
>  /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
>  /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
>
>
> Grüße
>  Thomas
diff mbox

Patch

diff --git gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index 198f26c..3005c9f 100644
--- gcc/testsuite/ChangeLog
+++ gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@ 
+2016-01-10  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* gcc.dg/vect/slp-perm-1.c: Fix scan-tree-dump syntax.
+	* gcc.dg/vect/slp-perm-2.c: Likewise.
+	* gcc.dg/vect/slp-perm-3.c: Likewise.
+	* gcc.dg/vect/slp-perm-5.c: Likewise.
+	* gcc.dg/vect/slp-perm-6.c: Likewise.
+	* gcc.dg/vect/slp-perm-7.c: Likewise.
+	* gcc.dg/vect/slp-perm-8.c: Likewise.
+
 2016-01-10  Tom de Vries  <tom@codesourcery.com>
 
 	PR tree-optimization/69039
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-1.c gcc/testsuite/gcc.dg/vect/slp-perm-1.c
index 6d0d66f..ee211f2 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-1.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-1.c
@@ -60,7 +60,7 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
 
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-2.c gcc/testsuite/gcc.dg/vect/slp-perm-2.c
index 34b413d..4bab348 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-2.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-2.c
@@ -56,6 +56,6 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-3.c gcc/testsuite/gcc.dg/vect/slp-perm-3.c
index ec13e0f..568e400 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-3.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-3.c
@@ -69,7 +69,7 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
 
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-5.c gcc/testsuite/gcc.dg/vect/slp-perm-5.c
index f44f44f..806603f 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-5.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-5.c
@@ -75,7 +75,7 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
 
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-6.c gcc/testsuite/gcc.dg/vect/slp-perm-6.c
index 551734a..0fb4a6b 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-6.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-6.c
@@ -74,6 +74,6 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 2 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-7.c gcc/testsuite/gcc.dg/vect/slp-perm-7.c
index 8b66142..a2881f9 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-7.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-7.c
@@ -73,6 +73,6 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 2 "vect"  { target vect_perm } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */
diff --git gcc/testsuite/gcc.dg/vect/slp-perm-8.c gcc/testsuite/gcc.dg/vect/slp-perm-8.c
index b1e9a10..d5fa1e8 100644
--- gcc/testsuite/gcc.dg/vect/slp-perm-8.c
+++ gcc/testsuite/gcc.dg/vect/slp-perm-8.c
@@ -56,6 +56,6 @@  int main (int argc, const char* argv[])
 /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { target { vect_perm_byte && {! vect_char_mult } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 1 "vect" { target { vect_perm_byte && {! vect_load_lanes } } } } } */
 /* { dg-final { scan-tree-dump-times "vectorizing stmts using SLP" 0 "vect" { target vect_load_lanes } } } */
-/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" { target { vect_perm_byte && vect_load_lanes } } } } */
+/* { dg-final { scan-tree-dump "note: Built SLP cancelled: can use load/store-lanes" "vect" { target { vect_perm_byte && vect_load_lanes } } } } */
 /* { dg-final { scan-tree-dump "LOAD_LANES" "vect" { target vect_load_lanes } } } */
 /* { dg-final { scan-tree-dump "STORE_LANES" "vect" { target vect_load_lanes } } } */