| Message ID | 20220418171535.416784-3-pc@us.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | rs6000: Move g++.dg powerpc tests to g++.target | expand |
Hi! On Mon, Apr 18, 2022 at 12:15:35PM -0500, Paul A. Clarke wrote: > A few tests need not be restricted to 'lp64', so remove the restriction. > > A few of those need a simple change to the DejaGnu directives to suppress > '-mcmodel' flags for '-m32'. Okay for trunk. Thanks! Segher
On Thu, May 12, 2022 at 05:30:16PM -0500, Segher Boessenkool wrote: > On Mon, Apr 18, 2022 at 12:15:35PM -0500, Paul A. Clarke wrote: > > A few tests need not be restricted to 'lp64', so remove the restriction. > > > > A few of those need a simple change to the DejaGnu directives to suppress > > '-mcmodel' flags for '-m32'. > > Okay for trunk. Thanks! I noticed that removing "{ target lp64 }" just left "{ dg-do compile }", which is superfluous, so I removed the whole line before committing. Since the actual commit was different than what was posted, I'm sending the final, committed patch to the list, below. PC rs6000: Remove a few needless 'lp64' contraints. A few tests need not be restricted to 'lp64', so remove the restriction. A few of those need a simple change to the DejaGnu directives to suppress '-mcmodel' flags for '-m32'. 2022-05-13 Paul A. Clarke <pc@us.ibm.com> gcc/testsuite * g++.target/powerpc/pr65240-1.C: Adjust DejaGnu directives. * g++.target/powerpc/pr65240-2.C: Likewise. * g++.target/powerpc/pr65240-3.C: Likewise. * g++.target/powerpc/pr65240-4.C: Likewise. * g++.target/powerpc/pr65242.C: Likewise. * g++.target/powerpc/pr67211.C: Likewise. * g++.target/powerpc/pr69667.C: Likewise. * g++.target/powerpc/pr71294.C: Likewise. --- gcc/testsuite/g++.target/powerpc/pr65240-1.C | 4 ++-- gcc/testsuite/g++.target/powerpc/pr65240-2.C | 4 ++-- gcc/testsuite/g++.target/powerpc/pr65240-3.C | 4 ++-- gcc/testsuite/g++.target/powerpc/pr65240-4.C | 1 - gcc/testsuite/g++.target/powerpc/pr65242.C | 1 - gcc/testsuite/g++.target/powerpc/pr67211.C | 1 - gcc/testsuite/g++.target/powerpc/pr69667.C | 1 - gcc/testsuite/g++.target/powerpc/pr71294.C | 1 - 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C index f735a1f7834a..1cf158c69097 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-1.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C @@ -1,7 +1,7 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C index e201e3a74d71..32d1c799b0db 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-2.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C @@ -1,7 +1,7 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mfp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mfp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C index 0821f68a5cf9..02567647f304 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-3.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C @@ -1,7 +1,7 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=medium -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=medium" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C index 92d31acb20d9..3f6993aa1cde 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-4.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C @@ -1,4 +1,3 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_vsx_ok } */ /* { dg-options "-mdejagnu-cpu=power7 -O3 -ffast-math -Wno-return-type" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C index b2984d1d6083..3f5c2eaa9099 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65242.C +++ b/gcc/testsuite/g++.target/powerpc/pr65242.C @@ -1,4 +1,3 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power8 -O3" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C index b58c08234272..7d5dd42765fe 100644 --- a/gcc/testsuite/g++.target/powerpc/pr67211.C +++ b/gcc/testsuite/g++.target/powerpc/pr67211.C @@ -1,4 +1,3 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -w" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr69667.C b/gcc/testsuite/g++.target/powerpc/pr69667.C index 6a12a3363e98..da550cd14bd6 100644 --- a/gcc/testsuite/g++.target/powerpc/pr69667.C +++ b/gcc/testsuite/g++.target/powerpc/pr69667.C @@ -1,4 +1,3 @@ -/* { dg-do compile { target lp64 } } */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power8 -w -std=c++14" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C index 1da1e327a285..7f12c8d5c90a 100644 --- a/gcc/testsuite/g++.target/powerpc/pr71294.C +++ b/gcc/testsuite/g++.target/powerpc/pr71294.C @@ -1,4 +1,3 @@ -// { dg-do compile { target lp64 } } // { dg-require-effective-target powerpc_p8vector_ok } */ // { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" }
diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C index 23026673e76b..40682d5fe857 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-1.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C @@ -1,8 +1,8 @@ -/* { dg-do compile { target lp64 } } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C index ddd3b3b75f43..4e4a1c2bb897 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-2.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C @@ -1,8 +1,8 @@ -/* { dg-do compile { target lp64 } } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mfp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mfp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C index 9e826c46ae7f..6acd278cab50 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-3.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C @@ -1,8 +1,8 @@ -/* { dg-do compile { target lp64 } } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=medium -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=medium" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C index 6047f136536e..57f2c769a3f3 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-4.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C @@ -1,4 +1,4 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_vsx_ok } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C index 09f5bb35f11d..64ca67e246f8 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65242.C +++ b/gcc/testsuite/g++.target/powerpc/pr65242.C @@ -1,4 +1,4 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C index 5cd00ba98ee4..946802e44cde 100644 --- a/gcc/testsuite/g++.target/powerpc/pr67211.C +++ b/gcc/testsuite/g++.target/powerpc/pr67211.C @@ -1,4 +1,4 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr69667.C b/gcc/testsuite/g++.target/powerpc/pr69667.C index 2d6d51d11a32..7527611f334f 100644 --- a/gcc/testsuite/g++.target/powerpc/pr69667.C +++ b/gcc/testsuite/g++.target/powerpc/pr69667.C @@ -1,4 +1,4 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ /* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C index 1da1e327a285..50ced56cdf6a 100644 --- a/gcc/testsuite/g++.target/powerpc/pr71294.C +++ b/gcc/testsuite/g++.target/powerpc/pr71294.C @@ -1,4 +1,4 @@ -// { dg-do compile { target lp64 } } +// { dg-do compile } // { dg-require-effective-target powerpc_p8vector_ok } */ // { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" }