Message ID | 20211102145442.3327981-1-stefansf@linux.ibm.com |
---|---|
State | New |
Headers | show |
Series | IBM Z: ldist-{rawmemchr, strlen} tests require vector extensions | expand |
On 11/2/21 15:54, Stefan Schulze Frielinghaus wrote: > The tests require vector extensions which are only available for z13 and > later while using the z/Architecture. > > Bootstrapped and regtested on IBM Z. Ok for mainline? > > gcc/testsuite/ChangeLog: > > * gcc.dg/tree-ssa/ldist-rawmemchr-1.c: For IBM Z set arch to z13 > and use z/Architecture since the tests require vector extensions. > * gcc.dg/tree-ssa/ldist-rawmemchr-2.c: Likewise. > * gcc.dg/tree-ssa/ldist-strlen-1.c: Likewise. > * gcc.dg/tree-ssa/ldist-strlen-3.c: Likewise. Ok. Thanks! Andreas
On Nov 02 2021, Stefan Schulze Frielinghaus via Gcc-patches wrote: > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > index 6abfd278351..bf6335f6360 100644 > --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > @@ -1,5 +1,6 @@ > /* { dg-do run { target s390x-*-* } } */ > /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ > +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ I think that should use an effective_target check. Andreas.
On Tue, Nov 02, 2021 at 04:20:01PM +0100, Andreas Schwab wrote: > On Nov 02 2021, Stefan Schulze Frielinghaus via Gcc-patches wrote: > > > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > > index 6abfd278351..bf6335f6360 100644 > > --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > > +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c > > @@ -1,5 +1,6 @@ > > /* { dg-do run { target s390x-*-* } } */ > > /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ > > +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ > > I think that should use an effective_target check. Thanks for the hint. Wasn't aware of those checks. I replaced all "target s390x-*-*" checks with "target s390_vx". The latter tests whether the toolchain and actual machine is capable to deal with vector extensions. Ok for mainline? From 86b46ae8cb3c014739f783a88043951c996deb61 Mon Sep 17 00:00:00 2001 From: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com> Date: Fri, 5 Nov 2021 09:05:01 +0100 Subject: [PATCH] IBM Z: ldist-{rawmemchr,strlen} tests require vector extensions fixup This is a fixup for 64bf0c835f8918adf7e4140a04ac79c2963204aa. Using effective target check s390_vx is more robust e.g. when trying to run the test on a machine older than z13. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/ldist-rawmemchr-1.c: Replace s390x-*-* by s390_vx. * gcc.dg/tree-ssa/ldist-rawmemchr-2.c: Likewise. * gcc.dg/tree-ssa/ldist-strlen-1.c: Likewise. * gcc.dg/tree-ssa/ldist-strlen-3.c: Likewise. --- gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c | 10 +++++----- gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c | 6 +++--- gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c index bf6335f6360..8e7f1f868fe 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c @@ -1,9 +1,9 @@ -/* { dg-do run { target s390x-*-* } } */ +/* { dg-do run { target s390_vx } } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ -/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390x-*-* } } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390x-*-* } } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390x-*-* } } } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390_vx } } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390_vx } } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390_vx } } } */ /* Rawmemchr pattern: reduction stmt and no store */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c index 83f5a35a322..0959d4b8f2a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c @@ -1,9 +1,9 @@ -/* { dg-do run { target s390x-*-* } } */ +/* { dg-do run { target s390_vx } } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ -/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390x-*-* } } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390x-*-* } } } */ -/* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390x-*-* } } } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390_vx } } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390_vx } } } */ +/* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390_vx } } } */ /* Rawmemchr pattern: reduction stmt and store */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c index aeb04b91f6b..dff573cb35f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c @@ -1,9 +1,9 @@ /* { dg-do run } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ -/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */ /* { dg-final { scan-tree-dump-times "generated strlenQI\n" 4 "ldist" } } */ -/* { dg-final { scan-tree-dump-times "generated strlenHI\n" 4 "ldist" { target s390x-*-* } } } */ -/* { dg-final { scan-tree-dump-times "generated strlenSI\n" 4 "ldist" { target s390x-*-* } } } */ +/* { dg-final { scan-tree-dump-times "generated strlenHI\n" 4 "ldist" { target s390_vx } } } */ +/* { dg-final { scan-tree-dump-times "generated strlenSI\n" 4 "ldist" { target s390_vx } } } */ #include <stdint.h> #include <assert.h> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c index 0652857265a..9355a98fb83 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ -/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ -/* { dg-final { scan-tree-dump-times "generated strlenSI\n" 1 "ldist" { target s390x-*-* } } } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390_vx } } */ +/* { dg-final { scan-tree-dump-times "generated strlenSI\n" 1 "ldist" { target s390_vx } } } */ extern int s[];
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c index 6abfd278351..bf6335f6360 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-1.c @@ -1,5 +1,6 @@ /* { dg-do run { target s390x-*-* } } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390x-*-* } } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390x-*-* } } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390x-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c index 00d6ea0f8e9..83f5a35a322 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-rawmemchr-2.c @@ -1,5 +1,6 @@ /* { dg-do run { target s390x-*-* } } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrQI" 2 "ldist" { target s390x-*-* } } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrHI" 2 "ldist" { target s390x-*-* } } } */ /* { dg-final { scan-tree-dump-times "generated rawmemchrSI" 2 "ldist" { target s390x-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c index 918b60099e4..aeb04b91f6b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-1.c @@ -1,5 +1,6 @@ /* { dg-do run } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ /* { dg-final { scan-tree-dump-times "generated strlenQI\n" 4 "ldist" } } */ /* { dg-final { scan-tree-dump-times "generated strlenHI\n" 4 "ldist" { target s390x-*-* } } } */ /* { dg-final { scan-tree-dump-times "generated strlenSI\n" 4 "ldist" { target s390x-*-* } } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c index 370fd5eb088..0652857265a 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ldist-strlen-3.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -ftree-loop-distribution -fdump-tree-ldist-details" } */ +/* { dg-additional-options "-march=z13 -mzarch" { target s390x-*-* } } */ /* { dg-final { scan-tree-dump-times "generated strlenSI\n" 1 "ldist" { target s390x-*-* } } } */ extern int s[];