* [PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target
@ 2022-04-18 17:15 Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR " Paul A. Clarke
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Paul A. Clarke @ 2022-04-18 17:15 UTC (permalink / raw)
To: segher, gcc-patches
v3: moved "not tested on Darwin" changes into 1/2, where they belong.
v2:
- v1 patches 1/3 and 2/3 have been merged after reviews / approval.
- Previous 3/3 is now 1/2, and new 2/2 is per review from Segher...
Some tests in g++.dg are target-specific for powerpc. Move those to
g++.target/powerpc. Update the DejaGnu directives as needed, since
the target restriction is perhaps no longer needed when residing in the
target-specific powerpc subdirectory.
In addition (new patch 2/2), as suggested by Segher, remove 'lp64' restriction
for a handful of tests, protecting uses of '-mcmodel' flag with
dg-additional-options.
Tested on Linux/Power9 (BE) and Linux Power8 (LE 32 and 64), full "make check".
OK for trunk?
Paul A. Clarke (2):
rs6000: Move g++.dg powerpc PR tests to g++.target
rs6000: Remove a few needless 'lp64' contraints.
gcc/testsuite/g++.dg/pr65240-1.C | 8 --------
gcc/testsuite/g++.dg/pr65240-2.C | 8 --------
gcc/testsuite/g++.dg/pr65240-3.C | 8 --------
gcc/testsuite/g++.target/powerpc/pr65240-1.C | 9 +++++++++
gcc/testsuite/g++.target/powerpc/pr65240-2.C | 9 +++++++++
gcc/testsuite/g++.target/powerpc/pr65240-3.C | 9 +++++++++
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h | 0
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C | 0
16 files changed, 45 insertions(+), 37 deletions(-)
delete mode 100644 gcc/testsuite/g++.dg/pr65240-1.C
delete mode 100644 gcc/testsuite/g++.dg/pr65240-2.C
delete mode 100644 gcc/testsuite/g++.dg/pr65240-3.C
create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-1.C
create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-2.C
create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-3.C
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (93%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (91%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C (97%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C (79%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C (89%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
--
2.27.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR tests to g++.target
2022-04-18 17:15 [PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
@ 2022-04-18 17:15 ` Paul A. Clarke
2022-05-12 22:38 ` Segher Boessenkool
2022-04-18 17:15 ` [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints Paul A. Clarke
2022-05-12 21:17 ` [PING PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
2 siblings, 1 reply; 9+ messages in thread
From: Paul A. Clarke @ 2022-04-18 17:15 UTC (permalink / raw)
To: segher, gcc-patches
Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.
2021-04-18 Paul A. Clarke <pc@us.ibm.com>
gcc/testsuite
* g++.dg/pr65240.h: Move to g++.target/powerpc.
* g++.dg/pr93974.C: Likewise.
* g++.dg/pr65240-1.C: Move to g++.target/powerpc, adjust dg directives.
* g++.dg/pr65240-2.C: Likewise.
* g++.dg/pr65240-3.C: Likewise.
* g++.dg/pr65240-4.C: Likewise.
* g++.dg/pr65242.C: Likewise.
* g++.dg/pr67211.C: Likewise.
* g++.dg/pr69667.C: Likewise.
* g++.dg/pr71294.C: Likewise.
* g++.dg/pr84264.C: Likewise.
* g++.dg/pr84279.C: Likewise.
* g++.dg/pr85657.C: Likewise.
---
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h | 0
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C | 0
13 files changed, 27 insertions(+), 19 deletions(-)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C (67%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (65%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (92%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C (79%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C (89%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
diff --git a/gcc/testsuite/g++.dg/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
similarity index 68%
rename from gcc/testsuite/g++.dg/pr65240-1.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-1.C
index ff8910df6a1a..23026673e76b 100644
--- a/gcc/testsuite/g++.dg/pr65240-1.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
similarity index 68%
rename from gcc/testsuite/g++.dg/pr65240-2.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-2.C
index bdb7a62d73d2..ddd3b3b75f43 100644
--- a/gcc/testsuite/g++.dg/pr65240-2.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
similarity index 67%
rename from gcc/testsuite/g++.dg/pr65240-3.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-3.C
index f37db9025d12..9e826c46ae7f 100644
--- a/gcc/testsuite/g++.dg/pr65240-3.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
similarity index 65%
rename from gcc/testsuite/g++.dg/pr65240-4.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-4.C
index efb6a6c06e7c..6047f136536e 100644
--- a/gcc/testsuite/g++.dg/pr65240-4.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { 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++.dg/pr65240.h b/gcc/testsuite/g++.target/powerpc/pr65240.h
similarity index 100%
rename from gcc/testsuite/g++.dg/pr65240.h
rename to gcc/testsuite/g++.target/powerpc/pr65240.h
diff --git a/gcc/testsuite/g++.dg/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C
similarity index 92%
rename from gcc/testsuite/g++.dg/pr65242.C
rename to gcc/testsuite/g++.target/powerpc/pr65242.C
index 662f375015f2..09f5bb35f11d 100644
--- a/gcc/testsuite/g++.dg/pr65242.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65242.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr67211.C
rename to gcc/testsuite/g++.target/powerpc/pr67211.C
index ac241818ab5b..5cd00ba98ee4 100644
--- a/gcc/testsuite/g++.dg/pr67211.C
+++ b/gcc/testsuite/g++.target/powerpc/pr67211.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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=power7 -mdejagnu-tune=power8 -O3 -w" } */
diff --git a/gcc/testsuite/g++.dg/pr69667.C b/gcc/testsuite/g++.target/powerpc/pr69667.C
similarity index 96%
rename from gcc/testsuite/g++.dg/pr69667.C
rename to gcc/testsuite/g++.target/powerpc/pr69667.C
index 422116dd5995..2d6d51d11a32 100644
--- a/gcc/testsuite/g++.dg/pr69667.C
+++ b/gcc/testsuite/g++.target/powerpc/pr69667.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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 -w -std=c++14" } */
diff --git a/gcc/testsuite/g++.dg/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C
similarity index 96%
rename from gcc/testsuite/g++.dg/pr71294.C
rename to gcc/testsuite/g++.target/powerpc/pr71294.C
index 716fa0d44b20..1da1e327a285 100644
--- a/gcc/testsuite/g++.dg/pr71294.C
+++ b/gcc/testsuite/g++.target/powerpc/pr71294.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc64*-*-* && lp64 } } }
+// { 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++.dg/pr84264.C b/gcc/testsuite/g++.target/powerpc/pr84264.C
similarity index 79%
rename from gcc/testsuite/g++.dg/pr84264.C
rename to gcc/testsuite/g++.target/powerpc/pr84264.C
index 4f8a77d8ac41..c9968cf66aa7 100644
--- a/gcc/testsuite/g++.dg/pr84264.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84264.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-do compile } */
/* { dg-options "-w -O1 -fstack-protector-strong" } */
void _setjmp ();
diff --git a/gcc/testsuite/g++.dg/pr84279.C b/gcc/testsuite/g++.target/powerpc/pr84279.C
similarity index 89%
rename from gcc/testsuite/g++.dg/pr84279.C
rename to gcc/testsuite/g++.target/powerpc/pr84279.C
index e78201c30dbe..f551ac156cfd 100644
--- a/gcc/testsuite/g++.dg/pr84279.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84279.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-require-effective-target fpic } */
/* { dg-options "-O3 -mdejagnu-cpu=power8 -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */
diff --git a/gcc/testsuite/g++.dg/pr85657.C b/gcc/testsuite/g++.target/powerpc/pr85657.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr85657.C
rename to gcc/testsuite/g++.target/powerpc/pr85657.C
index e62b62abcc5a..3a386542154d 100644
--- a/gcc/testsuite/g++.dg/pr85657.C
+++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc*-*-linux* } } }
+// { dg-do compile { target { *-*-linux* } } }
// { dg-require-effective-target ppc_float128_sw }
// { dg-options "-mvsx -mfloat128 -O2 -mabi=ibmlongdouble -Wno-psabi" }
diff --git a/gcc/testsuite/g++.dg/pr93974.C b/gcc/testsuite/g++.target/powerpc/pr93974.C
similarity index 100%
rename from gcc/testsuite/g++.dg/pr93974.C
rename to gcc/testsuite/g++.target/powerpc/pr93974.C
--
2.27.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints.
2022-04-18 17:15 [PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR " Paul A. Clarke
@ 2022-04-18 17:15 ` Paul A. Clarke
2022-05-12 22:30 ` Segher Boessenkool
2022-05-12 21:17 ` [PING PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
2 siblings, 1 reply; 9+ messages in thread
From: Paul A. Clarke @ 2022-04-18 17:15 UTC (permalink / raw)
To: segher, gcc-patches
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-04-18 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 | 2 +-
gcc/testsuite/g++.target/powerpc/pr65242.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr67211.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr69667.C | 2 +-
gcc/testsuite/g++.target/powerpc/pr71294.C | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
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" }
--
2.27.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PING PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target
2022-04-18 17:15 [PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR " Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints Paul A. Clarke
@ 2022-05-12 21:17 ` Paul A. Clarke
2 siblings, 0 replies; 9+ messages in thread
From: Paul A. Clarke @ 2022-05-12 21:17 UTC (permalink / raw)
To: segher, gcc-patches
ping
On Mon, Apr 18, 2022 at 12:15:33PM -0500, Paul A. Clarke via Gcc-patches wrote:
> v3: moved "not tested on Darwin" changes into 1/2, where they belong.
>
> v2:
> - v1 patches 1/3 and 2/3 have been merged after reviews / approval.
> - Previous 3/3 is now 1/2, and new 2/2 is per review from Segher...
>
> Some tests in g++.dg are target-specific for powerpc. Move those to
> g++.target/powerpc. Update the DejaGnu directives as needed, since
> the target restriction is perhaps no longer needed when residing in the
> target-specific powerpc subdirectory.
>
> In addition (new patch 2/2), as suggested by Segher, remove 'lp64' restriction
> for a handful of tests, protecting uses of '-mcmodel' flag with
> dg-additional-options.
>
> Tested on Linux/Power9 (BE) and Linux Power8 (LE 32 and 64), full "make check".
>
> OK for trunk?
>
> Paul A. Clarke (2):
> rs6000: Move g++.dg powerpc PR tests to g++.target
> rs6000: Remove a few needless 'lp64' contraints.
>
> gcc/testsuite/g++.dg/pr65240-1.C | 8 --------
> gcc/testsuite/g++.dg/pr65240-2.C | 8 --------
> gcc/testsuite/g++.dg/pr65240-3.C | 8 --------
> gcc/testsuite/g++.target/powerpc/pr65240-1.C | 9 +++++++++
> gcc/testsuite/g++.target/powerpc/pr65240-2.C | 9 +++++++++
> gcc/testsuite/g++.target/powerpc/pr65240-3.C | 9 +++++++++
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C | 5 +++--
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h | 0
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C | 5 +++--
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C | 5 +++--
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C | 5 +++--
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C | 2 +-
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C | 2 +-
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C | 5 +++--
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C | 2 +-
> gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C | 0
> 16 files changed, 45 insertions(+), 37 deletions(-)
> delete mode 100644 gcc/testsuite/g++.dg/pr65240-1.C
> delete mode 100644 gcc/testsuite/g++.dg/pr65240-2.C
> delete mode 100644 gcc/testsuite/g++.dg/pr65240-3.C
> create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-1.C
> create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-2.C
> create mode 100644 gcc/testsuite/g++.target/powerpc/pr65240-3.C
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (68%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (93%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (91%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C (97%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C (96%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C (79%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C (89%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
> rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
>
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints.
2022-04-18 17:15 ` [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints Paul A. Clarke
@ 2022-05-12 22:30 ` Segher Boessenkool
2022-05-13 22:45 ` [COMMITTED] " Paul A. Clarke
0 siblings, 1 reply; 9+ messages in thread
From: Segher Boessenkool @ 2022-05-12 22:30 UTC (permalink / raw)
To: Paul A. Clarke; +Cc: gcc-patches
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR tests to g++.target
2022-04-18 17:15 ` [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR " Paul A. Clarke
@ 2022-05-12 22:38 ` Segher Boessenkool
2022-05-12 22:53 ` Iain Sandoe
0 siblings, 1 reply; 9+ messages in thread
From: Segher Boessenkool @ 2022-05-12 22:38 UTC (permalink / raw)
To: Paul A. Clarke; +Cc: gcc-patches
Hi!
On Mon, Apr 18, 2022 at 12:15:34PM -0500, Paul A. Clarke wrote:
> -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> +/* Never tested on darwin, so skip there. */
> +/* { dg-skip-if "" { *-*-darwin* } } */
That is probably the reason for the skip, but it is a lousy reason, and
not a good precedent to create. It is much better to let the Darwin
maintainer deal with this *if* it fails. If you have proof it fails on
Darwin, just say *that* (or even say *why* it fails!)
Other than that this looks good.
Segher
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR tests to g++.target
2022-05-12 22:38 ` Segher Boessenkool
@ 2022-05-12 22:53 ` Iain Sandoe
2022-05-13 22:36 ` [COMMITTED] " Paul A. Clarke
0 siblings, 1 reply; 9+ messages in thread
From: Iain Sandoe @ 2022-05-12 22:53 UTC (permalink / raw)
To: Paul A. Clarke; +Cc: GCC Patches, Segher Boessenkool
Hi
> On 12 May 2022, at 23:38, Segher Boessenkool <segher@kernel.crashing.org> wrote:
> On Mon, Apr 18, 2022 at 12:15:34PM -0500, Paul A. Clarke wrote:
>> -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
>> +/* Never tested on darwin, so skip there. */
>> +/* { dg-skip-if "" { *-*-darwin* } } */
>
> That is probably the reason for the skip, but it is a lousy reason, and
> not a good precedent to create. It is much better to let the Darwin
> maintainer deal with this *if* it fails. If you have proof it fails on
> Darwin, just say *that* (or even say *why* it fails!)
For the record, if there’s a specific patch you’d like tested on Darwin,
I am happy to try and fit it into the schedule (the machine is slow for
modern codebases, so don’t expect immediate answers).
Iain
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [COMMITTED] rs6000: Move g++.dg powerpc PR tests to g++.target
2022-05-12 22:53 ` Iain Sandoe
@ 2022-05-13 22:36 ` Paul A. Clarke
0 siblings, 0 replies; 9+ messages in thread
From: Paul A. Clarke @ 2022-05-13 22:36 UTC (permalink / raw)
To: Segher Boessenkool, Iain Sandoe; +Cc: GCC Patches
> On 12 May 2022, at 23:38, Segher Boessenkool <segher@kernel.crashing.org> wrote:
> On Mon, Apr 18, 2022 at 12:15:34PM -0500, Paul A. Clarke wrote:
>> -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
>> +/* Never tested on darwin, so skip there. */
>> +/* { dg-skip-if "" { *-*-darwin* } } */
>
> That is probably the reason for the skip, but it is a lousy reason, and
> not a good precedent to create. It is much better to let the Darwin
> maintainer deal with this *if* it fails. If you have proof it fails on
> Darwin, just say *that* (or even say *why* it fails!)
I misunderstood your earlier review comments, sorry.
This is all pre-existing (in slightly different form), so it probably shouldn't
be in this patch, anyway. I took your original "Okay for trunk",
and committed the patch below. If somebody has a strong desire to enable Darwin
for these tests, that can be done separately later.
I also committed patch 2/2.
On Thu, May 12, 2022 at 11:53:43PM +0100, Iain Sandoe via Gcc-patches wrote:
> For the record, if there’s a specific patch you’d like tested on Darwin,
> I am happy to try and fit it into the schedule (the machine is slow for
> modern codebases, so don’t expect immediate answers).
Thank you, Iain. Good to know. I won't trouble you for this set. The net of the
committed changes is just test movement.
PC
rs6000: Move g++.dg powerpc PR tests to g++.target
Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.
2021-05-13 Paul A. Clarke <pc@us.ibm.com>
gcc/testsuite
* g++.dg/pr65240.h: Move to g++.target/powerpc.
* g++.dg/pr93974.C: Likewise.
* g++.dg/pr65240-1.C: Move to g++.target/powerpc, adjust dg directives.
* g++.dg/pr65240-2.C: Likewise.
* g++.dg/pr65240-3.C: Likewise.
* g++.dg/pr65240-4.C: Likewise.
* g++.dg/pr65242.C: Likewise.
* g++.dg/pr67211.C: Likewise.
* g++.dg/pr69667.C: Likewise.
* g++.dg/pr71294.C: Likewise.
* g++.dg/pr84264.C: Likewise.
* g++.dg/pr84279.C: Likewise.
* g++.dg/pr85657.C: Likewise.
---
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h | 0
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C | 4 ++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C | 0
13 files changed, 19 insertions(+), 19 deletions(-)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C (71%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C (71%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C (70%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (93%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (91%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C (97%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C (79%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
diff --git a/gcc/testsuite/g++.dg/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
similarity index 71%
rename from gcc/testsuite/g++.dg/pr65240-1.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-1.C
index ff8910df6a1a..f735a1f7834a 100644
--- a/gcc/testsuite/g++.dg/pr65240-1.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
similarity index 71%
rename from gcc/testsuite/g++.dg/pr65240-2.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-2.C
index bdb7a62d73d2..e201e3a74d71 100644
--- a/gcc/testsuite/g++.dg/pr65240-2.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
similarity index 70%
rename from gcc/testsuite/g++.dg/pr65240-3.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-3.C
index f37db9025d12..0821f68a5cf9 100644
--- a/gcc/testsuite/g++.dg/pr65240-3.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
similarity index 68%
rename from gcc/testsuite/g++.dg/pr65240-4.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-4.C
index efb6a6c06e7c..92d31acb20d9 100644
--- a/gcc/testsuite/g++.dg/pr65240-4.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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++.dg/pr65240.h b/gcc/testsuite/g++.target/powerpc/pr65240.h
similarity index 100%
rename from gcc/testsuite/g++.dg/pr65240.h
rename to gcc/testsuite/g++.target/powerpc/pr65240.h
diff --git a/gcc/testsuite/g++.dg/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C
similarity index 93%
rename from gcc/testsuite/g++.dg/pr65242.C
rename to gcc/testsuite/g++.target/powerpc/pr65242.C
index 662f375015f2..b2984d1d6083 100644
--- a/gcc/testsuite/g++.dg/pr65242.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65242.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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++.dg/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C
similarity index 91%
rename from gcc/testsuite/g++.dg/pr67211.C
rename to gcc/testsuite/g++.target/powerpc/pr67211.C
index ac241818ab5b..b58c08234272 100644
--- a/gcc/testsuite/g++.dg/pr67211.C
+++ b/gcc/testsuite/g++.target/powerpc/pr67211.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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++.dg/pr69667.C b/gcc/testsuite/g++.target/powerpc/pr69667.C
similarity index 97%
rename from gcc/testsuite/g++.dg/pr69667.C
rename to gcc/testsuite/g++.target/powerpc/pr69667.C
index 422116dd5995..6a12a3363e98 100644
--- a/gcc/testsuite/g++.dg/pr69667.C
+++ b/gcc/testsuite/g++.target/powerpc/pr69667.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { 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++.dg/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C
similarity index 96%
rename from gcc/testsuite/g++.dg/pr71294.C
rename to gcc/testsuite/g++.target/powerpc/pr71294.C
index 716fa0d44b20..1da1e327a285 100644
--- a/gcc/testsuite/g++.dg/pr71294.C
+++ b/gcc/testsuite/g++.target/powerpc/pr71294.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc64*-*-* && lp64 } } }
+// { 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++.dg/pr84264.C b/gcc/testsuite/g++.target/powerpc/pr84264.C
similarity index 79%
rename from gcc/testsuite/g++.dg/pr84264.C
rename to gcc/testsuite/g++.target/powerpc/pr84264.C
index 4f8a77d8ac41..c9968cf66aa7 100644
--- a/gcc/testsuite/g++.dg/pr84264.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84264.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-do compile } */
/* { dg-options "-w -O1 -fstack-protector-strong" } */
void _setjmp ();
diff --git a/gcc/testsuite/g++.dg/pr84279.C b/gcc/testsuite/g++.target/powerpc/pr84279.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr84279.C
rename to gcc/testsuite/g++.target/powerpc/pr84279.C
index e78201c30dbe..02632420744a 100644
--- a/gcc/testsuite/g++.dg/pr84279.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84279.C
@@ -1,5 +1,5 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile } */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-require-effective-target fpic } */
/* { dg-options "-O3 -mdejagnu-cpu=power8 -g -fPIC -fvisibility=hidden -fstack-protector-strong" } */
diff --git a/gcc/testsuite/g++.dg/pr85657.C b/gcc/testsuite/g++.target/powerpc/pr85657.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr85657.C
rename to gcc/testsuite/g++.target/powerpc/pr85657.C
index e62b62abcc5a..3a386542154d 100644
--- a/gcc/testsuite/g++.dg/pr85657.C
+++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc*-*-linux* } } }
+// { dg-do compile { target { *-*-linux* } } }
// { dg-require-effective-target ppc_float128_sw }
// { dg-options "-mvsx -mfloat128 -O2 -mabi=ibmlongdouble -Wno-psabi" }
diff --git a/gcc/testsuite/g++.dg/pr93974.C b/gcc/testsuite/g++.target/powerpc/pr93974.C
similarity index 100%
rename from gcc/testsuite/g++.dg/pr93974.C
rename to gcc/testsuite/g++.target/powerpc/pr93974.C
--
2.27.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [COMMITTED] rs6000: Remove a few needless 'lp64' contraints.
2022-05-12 22:30 ` Segher Boessenkool
@ 2022-05-13 22:45 ` Paul A. Clarke
0 siblings, 0 replies; 9+ messages in thread
From: Paul A. Clarke @ 2022-05-13 22:45 UTC (permalink / raw)
To: Segher Boessenkool; +Cc: gcc-patches
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" }
--
2.27.0
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-05-13 22:45 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-18 17:15 [PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 1/2] rs6000: Move g++.dg powerpc PR " Paul A. Clarke
2022-05-12 22:38 ` Segher Boessenkool
2022-05-12 22:53 ` Iain Sandoe
2022-05-13 22:36 ` [COMMITTED] " Paul A. Clarke
2022-04-18 17:15 ` [PATCH v3 2/2] rs6000: Remove a few needless 'lp64' contraints Paul A. Clarke
2022-05-12 22:30 ` Segher Boessenkool
2022-05-13 22:45 ` [COMMITTED] " Paul A. Clarke
2022-05-12 21:17 ` [PING PATCH v3 0/2] rs6000: Move g++.dg powerpc tests to g++.target Paul A. Clarke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).