[PATCH 0/3] rs6000: Move g++.dg powerpc tests to g++.target

[PATCH 0/3] rs6000: Move g++.dg powerpc tests to g++.target

[Paul A. Clarke]

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.

Tested with Linux on Power9, full "make check".

OK for trunk?

Paul A. Clarke (3):
  rs6000: Move g++.dg/ext powerpc tests to g++.target
  rs6000: Move g++.dg powerpc PR tests to g++.target
  rs6000: Move more g++.dg powerpc tests to g++.target

 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-1.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-10.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-11.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-12.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-13.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-14.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-15.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-16.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-17.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-18.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-2.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-3.C  | 4 ++--
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-4.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-5.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-6.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-7.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-8.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-9.C  | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-1.C       | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-2.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-3.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-4.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-5.C       | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-1.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-2.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-3.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-4.C      | 2 +-
 .../{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C      | 0
 .../other => g++.target/powerpc}/darwin-minversion-1.C        | 0
 .../{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C    | 0
 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
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C      | 2 +-
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C      | 0
 .../{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C          | 2 +-
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C   | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/undef-bool-1.C         | 2 +-
 48 files changed, 54 insertions(+), 54 deletions(-)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-1.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-10.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-11.C (80%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-12.C (87%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-13.C (97%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-14.C (86%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-15.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-16.C (88%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-17.C (91%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-18.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-2.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-3.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-4.C (81%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-5.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-6.C (94%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-7.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-8.C (93%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-9.C (86%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-1.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-2.C (94%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-3.C (85%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-4.C (88%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-5.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-1.C (98%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-2.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-3.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-4.C (89%)
 rename gcc/testsuite/{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C (100%)
 rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C (100%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C (100%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (75%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (94%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (92%)
 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 (91%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C (95%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C (100%)
 rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C (84%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/undef-bool-1.C (85%)

-- 
2.27.0

[PATCH 1/3] rs6000: Move g++.dg/ext powerpc tests to g++.target

[Paul A. Clarke]

Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.

2021-02-21  Paul A. Clarke  <pc@us.ibm.com>

gcc/testsuite
	* g++.dg/ext/altivec-1.C: Move to g++.target/powerpc, adjust dg
	directives.
	* g++.dg/ext/altivec-2.C: Likewise.
	* g++.dg/ext/altivec-3.C: Likewise.
	* g++.dg/ext/altivec-4.C: Likewise.
	* g++.dg/ext/altivec-5.C: Likewise.
	* g++.dg/ext/altivec-6.C: Likewise.
	* g++.dg/ext/altivec-7.C: Likewise.
	* g++.dg/ext/altivec-8.C: Likewise.
	* g++.dg/ext/altivec-9.C: Likewise.
	* g++.dg/ext/altivec-10.C: Likewise.
	* g++.dg/ext/altivec-11.C: Likewise.
	* g++.dg/ext/altivec-12.C: Likewise.
	* g++.dg/ext/altivec-13.C: Likewise.
	* g++.dg/ext/altivec-14.C: Likewise.
	* g++.dg/ext/altivec-15.C: Likewise.
	* g++.dg/ext/altivec-16.C: Likewise.
	* g++.dg/ext/altivec-17.C: Likewise.
	* g++.dg/ext/altivec-18.C: Likewise.
	* g++.dg/ext/altivec-cell-1.C: Likewise.
	* g++.dg/ext/altivec-cell-2.C: Likewise.
	* g++.dg/ext/altivec-cell-3.C: Likewise.
	* g++.dg/ext/altivec-cell-4.C: Likewise.
	* g++.dg/ext/altivec-cell-5.C: Likewise.
	* g++.dg/ext/altivec-types-1.C: Likewise.
	* g++.dg/ext/altivec-types-2.C: Likewise.
	* g++.dg/ext/altivec-types-3.C: Likewise.
	* g++.dg/ext/altivec-types-4.C: Likewise.
	* g++.dg/ext/undef-bool-1.C: Likewise.
---
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-1.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-10.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-11.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-12.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-13.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-14.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-15.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-16.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-17.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-18.C | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-2.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-3.C  | 4 ++--
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-4.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-5.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-6.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-7.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-8.C  | 2 +-
 gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-9.C  | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-1.C       | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-2.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-3.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-4.C       | 4 ++--
 .../{g++.dg/ext => g++.target/powerpc}/altivec-cell-5.C       | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-1.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-2.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-3.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/altivec-types-4.C      | 2 +-
 .../{g++.dg/ext => g++.target/powerpc}/undef-bool-1.C         | 2 +-
 28 files changed, 32 insertions(+), 32 deletions(-)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-1.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-10.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-11.C (80%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-12.C (87%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-13.C (97%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-14.C (86%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-15.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-16.C (88%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-17.C (91%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-18.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-2.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-3.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-4.C (81%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-5.C (83%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-6.C (94%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-7.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-8.C (93%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-9.C (86%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-1.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-2.C (94%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-3.C (85%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-4.C (88%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-cell-5.C (96%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-1.C (98%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-2.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-3.C (92%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/altivec-types-4.C (89%)
 rename gcc/testsuite/{g++.dg/ext => g++.target/powerpc}/undef-bool-1.C (85%)

diff --git a/gcc/testsuite/g++.dg/ext/altivec-1.C b/gcc/testsuite/g++.target/powerpc/altivec-1.C
similarity index 83%
rename from gcc/testsuite/g++.dg/ext/altivec-1.C
rename to gcc/testsuite/g++.target/powerpc/altivec-1.C
index cd7c3aad2611..a809de2a3bf4 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-1.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-10.C b/gcc/testsuite/g++.target/powerpc/altivec-10.C
similarity index 92%
rename from gcc/testsuite/g++.dg/ext/altivec-10.C
rename to gcc/testsuite/g++.target/powerpc/altivec-10.C
index c36c3914b1ad..c9c475426113 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-10.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-10.C
@@ -1,6 +1,6 @@
 /* This is a compile-only test for interaction of "-maltivec" and "-save-temps".  */
 /* Author:  Ziemowit Laski  <zlaski@apple.com>.  */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-save-temps -maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-11.C b/gcc/testsuite/g++.target/powerpc/altivec-11.C
similarity index 80%
rename from gcc/testsuite/g++.dg/ext/altivec-11.C
rename to gcc/testsuite/g++.target/powerpc/altivec-11.C
index ff3016953d87..c767715c8b61 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-11.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-11.C
@@ -1,5 +1,5 @@
 /* Test handling of literal constant for dss operation.  */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-12.C b/gcc/testsuite/g++.target/powerpc/altivec-12.C
similarity index 87%
rename from gcc/testsuite/g++.dg/ext/altivec-12.C
rename to gcc/testsuite/g++.target/powerpc/altivec-12.C
index 6f21da961b28..f57923e7155d 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-12.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-12.C
@@ -1,5 +1,5 @@
 /* Test vec_dst* functions with float pointer as first argument.  */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-13.C b/gcc/testsuite/g++.target/powerpc/altivec-13.C
similarity index 97%
rename from gcc/testsuite/g++.dg/ext/altivec-13.C
rename to gcc/testsuite/g++.target/powerpc/altivec-13.C
index abc05af62d5b..286d7789076a 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-13.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-13.C
@@ -2,7 +2,7 @@
    test is derived from parts of gcc.dg/vmx/8-02.c from Motorola's
    AltiVec testsuite.  */
 
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-14.C b/gcc/testsuite/g++.target/powerpc/altivec-14.C
similarity index 86%
rename from gcc/testsuite/g++.dg/ext/altivec-14.C
rename to gcc/testsuite/g++.target/powerpc/altivec-14.C
index 02e8a23258d2..8f4cb6af6529 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-14.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-14.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-15.C b/gcc/testsuite/g++.target/powerpc/altivec-15.C
similarity index 92%
rename from gcc/testsuite/g++.dg/ext/altivec-15.C
rename to gcc/testsuite/g++.target/powerpc/altivec-15.C
index 662d67890873..dc5d9552c365 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-15.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-15.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-16.C b/gcc/testsuite/g++.target/powerpc/altivec-16.C
similarity index 88%
rename from gcc/testsuite/g++.dg/ext/altivec-16.C
rename to gcc/testsuite/g++.target/powerpc/altivec-16.C
index 91230d26138b..cdfbc6d74aae 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-16.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-16.C
@@ -1,5 +1,5 @@
 // PR c++/36662
-// { dg-do compile { target powerpc*-*-* } }
+// { dg-do compile }
 // { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-17.C b/gcc/testsuite/g++.target/powerpc/altivec-17.C
similarity index 91%
rename from gcc/testsuite/g++.dg/ext/altivec-17.C
rename to gcc/testsuite/g++.target/powerpc/altivec-17.C
index 099f8742e783..d95ac16a6999 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-17.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-17.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-* } }
+// { dg-do compile }
 // { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-18.C b/gcc/testsuite/g++.target/powerpc/altivec-18.C
similarity index 83%
rename from gcc/testsuite/g++.dg/ext/altivec-18.C
rename to gcc/testsuite/g++.target/powerpc/altivec-18.C
index 5b83028e7370..ddfca943c0c3 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-18.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-18.C
@@ -1,5 +1,5 @@
 // PR target/82112
-// { dg-do compile { target powerpc*-*-* } }
+// { dg-do compile }
 // { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-2.C b/gcc/testsuite/g++.target/powerpc/altivec-2.C
similarity index 92%
rename from gcc/testsuite/g++.dg/ext/altivec-2.C
rename to gcc/testsuite/g++.target/powerpc/altivec-2.C
index e14e6f800f78..b2eaf62a0ed1 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-2.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -Wall -Wno-unused-but-set-variable -Wno-deprecated" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-3.C b/gcc/testsuite/g++.target/powerpc/altivec-3.C
similarity index 96%
rename from gcc/testsuite/g++.dg/ext/altivec-3.C
rename to gcc/testsuite/g++.target/powerpc/altivec-3.C
index 151132059508..522d62bd3ffd 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-3.C
@@ -1,5 +1,5 @@
-/* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
+/* { dg-do run { target { vmx_hw } } } */
+/* { dg-do compile { target { ! vmx_hw } } } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-4.C b/gcc/testsuite/g++.target/powerpc/altivec-4.C
similarity index 81%
rename from gcc/testsuite/g++.dg/ext/altivec-4.C
rename to gcc/testsuite/g++.target/powerpc/altivec-4.C
index 86a2615dc498..9ac1fbf38a38 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-4.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-5.C b/gcc/testsuite/g++.target/powerpc/altivec-5.C
similarity index 83%
rename from gcc/testsuite/g++.dg/ext/altivec-5.C
rename to gcc/testsuite/g++.target/powerpc/altivec-5.C
index 04c26e80ff45..d11f1fabd25a 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-5.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-5.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-6.C b/gcc/testsuite/g++.target/powerpc/altivec-6.C
similarity index 94%
rename from gcc/testsuite/g++.dg/ext/altivec-6.C
rename to gcc/testsuite/g++.target/powerpc/altivec-6.C
index d17fd90739ac..cfbfa4edc50a 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-6.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-6.C
@@ -1,6 +1,6 @@
 /* Test for correct handling of literal arguments. */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-7.C b/gcc/testsuite/g++.target/powerpc/altivec-7.C
similarity index 96%
rename from gcc/testsuite/g++.dg/ext/altivec-7.C
rename to gcc/testsuite/g++.target/powerpc/altivec-7.C
index 038335433f42..de166879a167 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-7.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-7.C
@@ -1,5 +1,5 @@
 /* Test for AltiVec type overloading and name mangling.  */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-8.C b/gcc/testsuite/g++.target/powerpc/altivec-8.C
similarity index 93%
rename from gcc/testsuite/g++.dg/ext/altivec-8.C
rename to gcc/testsuite/g++.target/powerpc/altivec-8.C
index 3c5a76e060e8..2a5891ca0cfc 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-8.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-8.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-9.C b/gcc/testsuite/g++.target/powerpc/altivec-9.C
similarity index 86%
rename from gcc/testsuite/g++.dg/ext/altivec-9.C
rename to gcc/testsuite/g++.target/powerpc/altivec-9.C
index 174ae63edcb7..6f07bdf30270 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-9.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-9.C
@@ -1,5 +1,5 @@
 /* Test for AltiVec function vec_ld, passing a pointer to const vector */
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-cell-1.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
similarity index 96%
rename from gcc/testsuite/g++.dg/ext/altivec-cell-1.C
rename to gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
index 16d311c3bef5..cdef3222ad91 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-cell-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-cell-2.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
similarity index 94%
rename from gcc/testsuite/g++.dg/ext/altivec-cell-2.C
rename to gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
index f0d3433cdd99..9601545913b4 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-cell-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
@@ -1,5 +1,5 @@
-/* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
+/* { dg-do run { target { vmx_hw } } } */
+/* { dg-do compile { target { ! vmx_hw } } } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 /* Test the vec_extract VMX intrinsics.  */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-cell-3.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
similarity index 85%
rename from gcc/testsuite/g++.dg/ext/altivec-cell-3.C
rename to gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
index bd7e774e3cdc..76624009c69e 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-cell-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
@@ -1,5 +1,5 @@
-/* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
+/* { dg-do run { target { vmx_hw } } } */
+/* { dg-do compile { target { ! vmx_hw } } } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 /* Test the vec_splats and vec_promote VMX intrinsics.  */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-cell-4.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
similarity index 88%
rename from gcc/testsuite/g++.dg/ext/altivec-cell-4.C
rename to gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
index 7d91adbb34e7..cbe779724046 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-cell-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
@@ -1,5 +1,5 @@
-/* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
+/* { dg-do run { target { vmx_hw } } } */
+/* { dg-do compile { target { ! vmx_hw } } } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-cell-5.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
similarity index 96%
rename from gcc/testsuite/g++.dg/ext/altivec-cell-5.C
rename to gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
index 7e5bc78d5685..13320f6537c1 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-cell-5.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-types-1.C b/gcc/testsuite/g++.target/powerpc/altivec-types-1.C
similarity index 98%
rename from gcc/testsuite/g++.dg/ext/altivec-types-1.C
rename to gcc/testsuite/g++.target/powerpc/altivec-types-1.C
index afcd5693d80d..fe8e11fe07b1 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-types-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-1.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-linux* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx -std=c++98" } */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-types-2.C b/gcc/testsuite/g++.target/powerpc/altivec-types-2.C
similarity index 92%
rename from gcc/testsuite/g++.dg/ext/altivec-types-2.C
rename to gcc/testsuite/g++.target/powerpc/altivec-types-2.C
index 4df12da0b195..44b557e92a11 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-types-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-2.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-linux* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-types-3.C b/gcc/testsuite/g++.target/powerpc/altivec-types-3.C
similarity index 92%
rename from gcc/testsuite/g++.dg/ext/altivec-types-3.C
rename to gcc/testsuite/g++.target/powerpc/altivec-types-3.C
index 755de736477c..8cb41394e2dd 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-types-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-3.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-linux* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-options "-maltivec -mno-vsx" } */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-types-4.C b/gcc/testsuite/g++.target/powerpc/altivec-types-4.C
similarity index 89%
rename from gcc/testsuite/g++.dg/ext/altivec-types-4.C
rename to gcc/testsuite/g++.target/powerpc/altivec-types-4.C
index b937f3cf1b1e..86592da7100c 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-types-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-4.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-linux* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx -mno-warn-altivec-long" } */
diff --git a/gcc/testsuite/g++.dg/ext/undef-bool-1.C b/gcc/testsuite/g++.target/powerpc/undef-bool-1.C
similarity index 85%
rename from gcc/testsuite/g++.dg/ext/undef-bool-1.C
rename to gcc/testsuite/g++.target/powerpc/undef-bool-1.C
index 9cc1cd872609..d9a1eb5aa85e 100644
--- a/gcc/testsuite/g++.dg/ext/undef-bool-1.C
+++ b/gcc/testsuite/g++.target/powerpc/undef-bool-1.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-do compile } */
 /* { dg-options "-O2 -DNO_WARN_X86_INTRINSICS -mvsx" } */
 /* { dg-require-effective-target lp64 } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
-- 
2.27.0

[PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Paul A. Clarke]

Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.

2021-02-21  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 (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C (76%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (75%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (94%)
 rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (92%)
 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 (91%)
 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 76%
rename from gcc/testsuite/g++.dg/pr65240-1.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-1.C
index d2e25b65fcae..d2f4a229773e 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
 /* { dg-options "-mcpu=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 76%
rename from gcc/testsuite/g++.dg/pr65240-2.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-2.C
index 38d5020bd198..12e36994d27b 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
 /* { dg-options "-mcpu=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 76%
rename from gcc/testsuite/g++.dg/pr65240-3.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-3.C
index e8463c914946..9ded3e3ab1d3 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
 /* { dg-options "-mcpu=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 75%
rename from gcc/testsuite/g++.dg/pr65240-4.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-4.C
index a119752d18e4..069a2e23add3 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */
 /* { dg-options "-mcpu=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 94%
rename from gcc/testsuite/g++.dg/pr65242.C
rename to gcc/testsuite/g++.target/powerpc/pr65242.C
index be2ddaa85b23..22576daac7db 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
 /* { dg-options "-mcpu=power8 -O3" } */
diff --git a/gcc/testsuite/g++.dg/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C
similarity index 92%
rename from gcc/testsuite/g++.dg/pr67211.C
rename to gcc/testsuite/g++.target/powerpc/pr67211.C
index cb3d342c122d..a9298b8d119a 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */
 /* { dg-options "-mcpu=power7 -mtune=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 76f7cb3d40b3..8b94ea4eca0e 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power7" } } */
 /* { dg-options "-mcpu=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 67675dd7e306..3b77f982dfa7 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } }
 // { dg-options "-mcpu=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 91%
rename from gcc/testsuite/g++.dg/pr84279.C
rename to gcc/testsuite/g++.target/powerpc/pr84279.C
index b2b5b8eabab1..ff71fd5eacef 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-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
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

[PATCH 3/3] rs6000: Move more g++.dg powerpc tests to g++.target

[Paul A. Clarke]

Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.

2021-02-21  Paul A. Clarke  <pc@us.ibm.com>

gcc/testsuite
	* g++.dg/debug/dwarf2/const2.C: Move to g++.target/powerpc.
	* g++.dg/other/darwin-minversion-1.C: Likewise.
	* g++.dg/eh/ppc64-sighandle-cr.C: Likewise.
	* g++.dg/eh/simd-5.C: Likewise.
	* g++.dg/eh/simd-4.C: Move to g++.target/powerpc, adjust dg directives.
	* g++.dg/eh/uncaught3.C: Likewise.
	* g++.dg/other/spu2vmx-1.C: Likewise.
---
 .../{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C        | 0
 .../{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C  | 0
 .../{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C      | 0
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C        | 2 +-
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C        | 0
 gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C  | 2 +-
 gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C     | 2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename gcc/testsuite/{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C (100%)
 rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C (100%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C (100%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C (95%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C (100%)
 rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C (84%)
 rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C (96%)

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/const2.C b/gcc/testsuite/g++.target/powerpc/const2.C
similarity index 100%
rename from gcc/testsuite/g++.dg/debug/dwarf2/const2.C
rename to gcc/testsuite/g++.target/powerpc/const2.C
diff --git a/gcc/testsuite/g++.dg/other/darwin-minversion-1.C b/gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
similarity index 100%
rename from gcc/testsuite/g++.dg/other/darwin-minversion-1.C
rename to gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
diff --git a/gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C b/gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
similarity index 100%
rename from gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C
rename to gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
diff --git a/gcc/testsuite/g++.dg/eh/simd-4.C b/gcc/testsuite/g++.target/powerpc/simd-4.C
similarity index 95%
rename from gcc/testsuite/g++.dg/eh/simd-4.C
rename to gcc/testsuite/g++.target/powerpc/simd-4.C
index 8c9b58bf8684..a01f19c27369 100644
--- a/gcc/testsuite/g++.dg/eh/simd-4.C
+++ b/gcc/testsuite/g++.target/powerpc/simd-4.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc*-*-darwin* } } */
+/* { dg-do run { target *-*-darwin* } } */
 /* { dg-options "-fexceptions -fnon-call-exceptions -O -maltivec" } */
 
 #include <cstdlib>
diff --git a/gcc/testsuite/g++.dg/eh/simd-5.C b/gcc/testsuite/g++.target/powerpc/simd-5.C
similarity index 100%
rename from gcc/testsuite/g++.dg/eh/simd-5.C
rename to gcc/testsuite/g++.target/powerpc/simd-5.C
diff --git a/gcc/testsuite/g++.dg/other/spu2vmx-1.C b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
similarity index 84%
rename from gcc/testsuite/g++.dg/other/spu2vmx-1.C
rename to gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
index d9c8faf94592..496b46c22c95 100644
--- a/gcc/testsuite/g++.dg/other/spu2vmx-1.C
+++ b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc*-*-* } } */
+/* { dg-do compile } */
 /* { dg-require-effective-target powerpc_spu } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/g++.dg/eh/uncaught3.C b/gcc/testsuite/g++.target/powerpc/uncaught3.C
similarity index 96%
rename from gcc/testsuite/g++.dg/eh/uncaught3.C
rename to gcc/testsuite/g++.target/powerpc/uncaught3.C
index 1b3333eaab3f..f891401584ec 100644
--- a/gcc/testsuite/g++.dg/eh/uncaught3.C
+++ b/gcc/testsuite/g++.target/powerpc/uncaught3.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target powerpc*-*-darwin* } }
+// { dg-do compile { target *-*-darwin* } }
 // { dg-final { scan-assembler-not "__cxa_get_exception" } }
 // { dg-options "-mmacosx-version-min=10.4" }
 // { dg-additional-options "-Wno-deprecated" { target c++17 } }
-- 
2.27.0

Re: [PATCH 1/3] rs6000: Move g++.dg/ext powerpc tests to g++.target

[Segher Boessenkool]

Hi!

On Mon, Feb 21, 2022 at 03:17:45PM -0600, Paul A. Clarke wrote:
> Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> longer required.
> 
> 2021-02-21  Paul A. Clarke  <pc@us.ibm.com>
> 
> gcc/testsuite
> 	* g++.dg/ext/altivec-1.C: Move to g++.target/powerpc, adjust dg
> 	directives.
> 	* g++.dg/ext/altivec-2.C: Likewise.
> 	* g++.dg/ext/altivec-3.C: Likewise.
> 	* g++.dg/ext/altivec-4.C: Likewise.
> 	* g++.dg/ext/altivec-5.C: Likewise.
> 	* g++.dg/ext/altivec-6.C: Likewise.
> 	* g++.dg/ext/altivec-7.C: Likewise.
> 	* g++.dg/ext/altivec-8.C: Likewise.
> 	* g++.dg/ext/altivec-9.C: Likewise.
> 	* g++.dg/ext/altivec-10.C: Likewise.
> 	* g++.dg/ext/altivec-11.C: Likewise.
> 	* g++.dg/ext/altivec-12.C: Likewise.
> 	* g++.dg/ext/altivec-13.C: Likewise.
> 	* g++.dg/ext/altivec-14.C: Likewise.
> 	* g++.dg/ext/altivec-15.C: Likewise.
> 	* g++.dg/ext/altivec-16.C: Likewise.
> 	* g++.dg/ext/altivec-17.C: Likewise.
> 	* g++.dg/ext/altivec-18.C: Likewise.
> 	* g++.dg/ext/altivec-cell-1.C: Likewise.
> 	* g++.dg/ext/altivec-cell-2.C: Likewise.
> 	* g++.dg/ext/altivec-cell-3.C: Likewise.
> 	* g++.dg/ext/altivec-cell-4.C: Likewise.
> 	* g++.dg/ext/altivec-cell-5.C: Likewise.
> 	* g++.dg/ext/altivec-types-1.C: Likewise.
> 	* g++.dg/ext/altivec-types-2.C: Likewise.
> 	* g++.dg/ext/altivec-types-3.C: Likewise.
> 	* g++.dg/ext/altivec-types-4.C: Likewise.
> 	* g++.dg/ext/undef-bool-1.C: Likewise.

Okay for trunk.  Thanks!


Segher

Re: [PATCH 0/3] rs6000: Move g++.dg powerpc tests to g++.target

[Segher Boessenkool]

On Mon, Feb 21, 2022 at 03:17:44PM -0600, Paul A. Clarke wrote:
> 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.

Not "perhaps" :-)  More specifically, powerpc.exp has

# Exit immediately if this isn't a PowerPC target.
if {![istarget powerpc*-*-*] } then {
  return
}

so anything run from that driver does not have to test for powerpc
separately anymore.


Segher

Re: [PATCH 0/3] rs6000: Move g++.dg powerpc tests to g++.target

[Paul A. Clarke]

On Tue, Feb 22, 2022 at 12:28:56PM -0600, Segher Boessenkool wrote:
> On Mon, Feb 21, 2022 at 03:17:44PM -0600, Paul A. Clarke wrote:
> > 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.
> 
> Not "perhaps" :-)  More specifically, powerpc.exp has
> 
> # Exit immediately if this isn't a PowerPC target.
> if {![istarget powerpc*-*-*] } then {
>   return
> }
> 
> so anything run from that driver does not have to test for powerpc
> separately anymore.

The context for "perhaps" is for cases like:
// { dg-do compile { target powerpc*-*-darwin* } }
and
// { dg-do compile { target { powerpc*-*-linux* } } }

where the target is still needed, albeit without the "powerpc"
restriction itself.

PC

Re: [PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Segher Boessenkool]

On Mon, Feb 21, 2022 at 03:17:46PM -0600, Paul A. Clarke wrote:
> Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> longer required.
> 
> 2021-02-21  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.

Okay for trunk.  Thanks!

That said...

> -/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
> -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> +/* { dg-do compile { target lp64 } } */
> +/* { dg-skip-if "" { *-*-darwin* } } */

That skip-if is most likely cargo cult, and it's not clear why lp64
would be needed either (there is no comment what it is needed for, for
example).

> --- 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* } } }

A comment here would help as well.  All of that is pre-existing of
course.


Segher

Re: [PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Paul A. Clarke]

On Tue, Feb 22, 2022 at 06:41:45PM -0600, Segher Boessenkool wrote:
> On Mon, Feb 21, 2022 at 03:17:46PM -0600, Paul A. Clarke wrote:
> > Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> > longer required.
> > 
> > 2021-02-21  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.
> 
> Okay for trunk.  Thanks!

Thanks for the review! More below...

> That said...
> 
> > -/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
> > -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> > +/* { dg-do compile { target lp64 } } */
> > +/* { dg-skip-if "" { *-*-darwin* } } */
> 
> That skip-if is most likely cargo cult, and it's not clear why lp64
> would be needed either (there is no comment what it is needed for, for
> example).

I can't speak to darwin, nor have an easy way of testing on it.

As for lp64, these tests fail on -m32 with:
  cc1plus: error: '-mcmodel' not supported in this configuration
- g++.dg/pr65240-1.C
- g++.dg/pr65240-2.C
- g++.dg/pr65240-3.C

'-mcmodel' is in the dg-options line for the above tests.

The rest PASSed.  Shall I remove the 'lp64' restriction for those that PASS?

> > +++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
> > @@ -1,4 +1,4 @@
> > -// { dg-do compile { target { powerpc*-*-linux* } } }
> > +// { dg-do compile { target { *-*-linux* } } }
> 
> A comment here would help as well.  All of that is pre-existing of
> course.

I'm not sure what such a comment would say. I suspect it was a testing issue
(only tested on Linux), but I have similar limitations, so I'm also reluctant
to enable the test for what would be untested (by me) platforms.

PC

Re: [PING PATCH 3/3] rs6000: Move more g++.dg powerpc tests to g++.target

[Paul A. Clarke]

Ping.

On Mon, Feb 21, 2022 at 03:17:47PM -0600, Paul A. Clarke via Gcc-patches wrote:
> Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> longer required.
> 
> 2021-02-21  Paul A. Clarke  <pc@us.ibm.com>
> 
> gcc/testsuite
> 	* g++.dg/debug/dwarf2/const2.C: Move to g++.target/powerpc.
> 	* g++.dg/other/darwin-minversion-1.C: Likewise.
> 	* g++.dg/eh/ppc64-sighandle-cr.C: Likewise.
> 	* g++.dg/eh/simd-5.C: Likewise.
> 	* g++.dg/eh/simd-4.C: Move to g++.target/powerpc, adjust dg directives.
> 	* g++.dg/eh/uncaught3.C: Likewise.
> 	* g++.dg/other/spu2vmx-1.C: Likewise.
> ---
>  .../{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C        | 0
>  .../{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C  | 0
>  .../{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C      | 0
>  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C        | 2 +-
>  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C        | 0
>  gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C  | 2 +-
>  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C     | 2 +-
>  7 files changed, 3 insertions(+), 3 deletions(-)
>  rename gcc/testsuite/{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C (100%)
>  rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C (100%)
>  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C (100%)
>  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C (95%)
>  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C (100%)
>  rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C (84%)
>  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C (96%)
> 
> diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/const2.C b/gcc/testsuite/g++.target/powerpc/const2.C
> similarity index 100%
> rename from gcc/testsuite/g++.dg/debug/dwarf2/const2.C
> rename to gcc/testsuite/g++.target/powerpc/const2.C
> diff --git a/gcc/testsuite/g++.dg/other/darwin-minversion-1.C b/gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
> similarity index 100%
> rename from gcc/testsuite/g++.dg/other/darwin-minversion-1.C
> rename to gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
> diff --git a/gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C b/gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
> similarity index 100%
> rename from gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C
> rename to gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
> diff --git a/gcc/testsuite/g++.dg/eh/simd-4.C b/gcc/testsuite/g++.target/powerpc/simd-4.C
> similarity index 95%
> rename from gcc/testsuite/g++.dg/eh/simd-4.C
> rename to gcc/testsuite/g++.target/powerpc/simd-4.C
> index 8c9b58bf8684..a01f19c27369 100644
> --- a/gcc/testsuite/g++.dg/eh/simd-4.C
> +++ b/gcc/testsuite/g++.target/powerpc/simd-4.C
> @@ -1,4 +1,4 @@
> -/* { dg-do run { target powerpc*-*-darwin* } } */
> +/* { dg-do run { target *-*-darwin* } } */
>  /* { dg-options "-fexceptions -fnon-call-exceptions -O -maltivec" } */
>  
>  #include <cstdlib>
> diff --git a/gcc/testsuite/g++.dg/eh/simd-5.C b/gcc/testsuite/g++.target/powerpc/simd-5.C
> similarity index 100%
> rename from gcc/testsuite/g++.dg/eh/simd-5.C
> rename to gcc/testsuite/g++.target/powerpc/simd-5.C
> diff --git a/gcc/testsuite/g++.dg/other/spu2vmx-1.C b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> similarity index 84%
> rename from gcc/testsuite/g++.dg/other/spu2vmx-1.C
> rename to gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> index d9c8faf94592..496b46c22c95 100644
> --- a/gcc/testsuite/g++.dg/other/spu2vmx-1.C
> +++ b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> @@ -1,4 +1,4 @@
> -/* { dg-do compile { target powerpc*-*-* } } */
> +/* { dg-do compile } */
>  /* { dg-require-effective-target powerpc_spu } */
>  /* { dg-options "-maltivec" } */
>  
> diff --git a/gcc/testsuite/g++.dg/eh/uncaught3.C b/gcc/testsuite/g++.target/powerpc/uncaught3.C
> similarity index 96%
> rename from gcc/testsuite/g++.dg/eh/uncaught3.C
> rename to gcc/testsuite/g++.target/powerpc/uncaught3.C
> index 1b3333eaab3f..f891401584ec 100644
> --- a/gcc/testsuite/g++.dg/eh/uncaught3.C
> +++ b/gcc/testsuite/g++.target/powerpc/uncaught3.C
> @@ -1,4 +1,4 @@
> -// { dg-do compile { target powerpc*-*-darwin* } }
> +// { dg-do compile { target *-*-darwin* } }
>  // { dg-final { scan-assembler-not "__cxa_get_exception" } }
>  // { dg-options "-mmacosx-version-min=10.4" }
>  // { dg-additional-options "-Wno-deprecated" { target c++17 } }
> -- 
> 2.27.0
> 

Re: [PING PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Paul A. Clarke]

Gentle ping. I am grateful for the initial review, but seek closure on the
final couple of discussion items. Thanks!

PC

On Tue, Feb 22, 2022 at 07:56:40PM -0600, Paul A. Clarke via Gcc-patches wrote:
> On Tue, Feb 22, 2022 at 06:41:45PM -0600, Segher Boessenkool wrote:
> > On Mon, Feb 21, 2022 at 03:17:46PM -0600, Paul A. Clarke wrote:
> > > Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> > > longer required.
> > > 
> > > 2021-02-21  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.
> > 
> > Okay for trunk.  Thanks!
> 
> Thanks for the review! More below...
> 
> > That said...
> > 
> > > -/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
> > > -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> > > +/* { dg-do compile { target lp64 } } */
> > > +/* { dg-skip-if "" { *-*-darwin* } } */
> > 
> > That skip-if is most likely cargo cult, and it's not clear why lp64
> > would be needed either (there is no comment what it is needed for, for
> > example).
> 
> I can't speak to darwin, nor have an easy way of testing on it.
> 
> As for lp64, these tests fail on -m32 with:
>   cc1plus: error: '-mcmodel' not supported in this configuration
> - g++.dg/pr65240-1.C
> - g++.dg/pr65240-2.C
> - g++.dg/pr65240-3.C
> 
> '-mcmodel' is in the dg-options line for the above tests.
> 
> The rest PASSed.  Shall I remove the 'lp64' restriction for those that PASS?
> 
> > > +++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
> > > @@ -1,4 +1,4 @@
> > > -// { dg-do compile { target { powerpc*-*-linux* } } }
> > > +// { dg-do compile { target { *-*-linux* } } }
> > 
> > A comment here would help as well.  All of that is pre-existing of
> > course.
> 
> I'm not sure what such a comment would say. I suspect it was a testing issue
> (only tested on Linux), but I have similar limitations, so I'm also reluctant
> to enable the test for what would be untested (by me) platforms.
> 
> PC

Re: [PING^2 PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Paul A. Clarke]

Ping.

On Tue, Mar 08, 2022 at 02:03:04PM -0600, Paul A. Clarke via Gcc-patches wrote:
> Gentle ping. I am grateful for the initial review, but seek closure on the
> final couple of discussion items. Thanks!
> 
> PC
> 
> On Tue, Feb 22, 2022 at 07:56:40PM -0600, Paul A. Clarke via Gcc-patches wrote:
> > On Tue, Feb 22, 2022 at 06:41:45PM -0600, Segher Boessenkool wrote:
> > > On Mon, Feb 21, 2022 at 03:17:46PM -0600, Paul A. Clarke wrote:
> > > > Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> > > > longer required.
> > > > 
> > > > 2021-02-21  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.
> > > 
> > > Okay for trunk.  Thanks!
> > 
> > Thanks for the review! More below...
> > 
> > > That said...
> > > 
> > > > -/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
> > > > -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> > > > +/* { dg-do compile { target lp64 } } */
> > > > +/* { dg-skip-if "" { *-*-darwin* } } */
> > > 
> > > That skip-if is most likely cargo cult, and it's not clear why lp64
> > > would be needed either (there is no comment what it is needed for, for
> > > example).
> > 
> > I can't speak to darwin, nor have an easy way of testing on it.
> > 
> > As for lp64, these tests fail on -m32 with:
> >   cc1plus: error: '-mcmodel' not supported in this configuration
> > - g++.dg/pr65240-1.C
> > - g++.dg/pr65240-2.C
> > - g++.dg/pr65240-3.C
> > 
> > '-mcmodel' is in the dg-options line for the above tests.
> > 
> > The rest PASSed.  Shall I remove the 'lp64' restriction for those that PASS?
> > 
> > > > +++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
> > > > @@ -1,4 +1,4 @@
> > > > -// { dg-do compile { target { powerpc*-*-linux* } } }
> > > > +// { dg-do compile { target { *-*-linux* } } }
> > > 
> > > A comment here would help as well.  All of that is pre-existing of
> > > course.
> > 
> > I'm not sure what such a comment would say. I suspect it was a testing issue
> > (only tested on Linux), but I have similar limitations, so I'm also reluctant
> > to enable the test for what would be untested (by me) platforms.
> > 
> > PC

Re: [PING^2 PATCH 3/3] rs6000: Move more g++.dg powerpc tests to g++.target

[Paul A. Clarke]

Ping.

On Tue, Mar 08, 2022 at 01:59:47PM -0600, Paul A. Clarke via Gcc-patches wrote:
> Ping.
> 
> On Mon, Feb 21, 2022 at 03:17:47PM -0600, Paul A. Clarke via Gcc-patches wrote:
> > Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
> > longer required.
> > 
> > 2021-02-21  Paul A. Clarke  <pc@us.ibm.com>
> > 
> > gcc/testsuite
> > 	* g++.dg/debug/dwarf2/const2.C: Move to g++.target/powerpc.
> > 	* g++.dg/other/darwin-minversion-1.C: Likewise.
> > 	* g++.dg/eh/ppc64-sighandle-cr.C: Likewise.
> > 	* g++.dg/eh/simd-5.C: Likewise.
> > 	* g++.dg/eh/simd-4.C: Move to g++.target/powerpc, adjust dg directives.
> > 	* g++.dg/eh/uncaught3.C: Likewise.
> > 	* g++.dg/other/spu2vmx-1.C: Likewise.
> > ---
> >  .../{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C        | 0
> >  .../{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C  | 0
> >  .../{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C      | 0
> >  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C        | 2 +-
> >  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C        | 0
> >  gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C  | 2 +-
> >  gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C     | 2 +-
> >  7 files changed, 3 insertions(+), 3 deletions(-)
> >  rename gcc/testsuite/{g++.dg/debug/dwarf2 => g++.target/powerpc}/const2.C (100%)
> >  rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/darwin-minversion-1.C (100%)
> >  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/ppc64-sighandle-cr.C (100%)
> >  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-4.C (95%)
> >  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/simd-5.C (100%)
> >  rename gcc/testsuite/{g++.dg/other => g++.target/powerpc}/spu2vmx-1.C (84%)
> >  rename gcc/testsuite/{g++.dg/eh => g++.target/powerpc}/uncaught3.C (96%)
> > 
> > diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/const2.C b/gcc/testsuite/g++.target/powerpc/const2.C
> > similarity index 100%
> > rename from gcc/testsuite/g++.dg/debug/dwarf2/const2.C
> > rename to gcc/testsuite/g++.target/powerpc/const2.C
> > diff --git a/gcc/testsuite/g++.dg/other/darwin-minversion-1.C b/gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
> > similarity index 100%
> > rename from gcc/testsuite/g++.dg/other/darwin-minversion-1.C
> > rename to gcc/testsuite/g++.target/powerpc/darwin-minversion-1.C
> > diff --git a/gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C b/gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
> > similarity index 100%
> > rename from gcc/testsuite/g++.dg/eh/ppc64-sighandle-cr.C
> > rename to gcc/testsuite/g++.target/powerpc/ppc64-sighandle-cr.C
> > diff --git a/gcc/testsuite/g++.dg/eh/simd-4.C b/gcc/testsuite/g++.target/powerpc/simd-4.C
> > similarity index 95%
> > rename from gcc/testsuite/g++.dg/eh/simd-4.C
> > rename to gcc/testsuite/g++.target/powerpc/simd-4.C
> > index 8c9b58bf8684..a01f19c27369 100644
> > --- a/gcc/testsuite/g++.dg/eh/simd-4.C
> > +++ b/gcc/testsuite/g++.target/powerpc/simd-4.C
> > @@ -1,4 +1,4 @@
> > -/* { dg-do run { target powerpc*-*-darwin* } } */
> > +/* { dg-do run { target *-*-darwin* } } */
> >  /* { dg-options "-fexceptions -fnon-call-exceptions -O -maltivec" } */
> >  
> >  #include <cstdlib>
> > diff --git a/gcc/testsuite/g++.dg/eh/simd-5.C b/gcc/testsuite/g++.target/powerpc/simd-5.C
> > similarity index 100%
> > rename from gcc/testsuite/g++.dg/eh/simd-5.C
> > rename to gcc/testsuite/g++.target/powerpc/simd-5.C
> > diff --git a/gcc/testsuite/g++.dg/other/spu2vmx-1.C b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> > similarity index 84%
> > rename from gcc/testsuite/g++.dg/other/spu2vmx-1.C
> > rename to gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> > index d9c8faf94592..496b46c22c95 100644
> > --- a/gcc/testsuite/g++.dg/other/spu2vmx-1.C
> > +++ b/gcc/testsuite/g++.target/powerpc/spu2vmx-1.C
> > @@ -1,4 +1,4 @@
> > -/* { dg-do compile { target powerpc*-*-* } } */
> > +/* { dg-do compile } */
> >  /* { dg-require-effective-target powerpc_spu } */
> >  /* { dg-options "-maltivec" } */
> >  
> > diff --git a/gcc/testsuite/g++.dg/eh/uncaught3.C b/gcc/testsuite/g++.target/powerpc/uncaught3.C
> > similarity index 96%
> > rename from gcc/testsuite/g++.dg/eh/uncaught3.C
> > rename to gcc/testsuite/g++.target/powerpc/uncaught3.C
> > index 1b3333eaab3f..f891401584ec 100644
> > --- a/gcc/testsuite/g++.dg/eh/uncaught3.C
> > +++ b/gcc/testsuite/g++.target/powerpc/uncaught3.C
> > @@ -1,4 +1,4 @@
> > -// { dg-do compile { target powerpc*-*-darwin* } }
> > +// { dg-do compile { target *-*-darwin* } }
> >  // { dg-final { scan-assembler-not "__cxa_get_exception" } }
> >  // { dg-options "-mmacosx-version-min=10.4" }
> >  // { dg-additional-options "-Wno-deprecated" { target c++17 } }
> > -- 
> > 2.27.0
> > 

Re: [PATCH 2/3] rs6000: Move g++.dg powerpc PR tests to g++.target

[Segher Boessenkool]

Hi!

On Tue, Feb 22, 2022 at 07:56:40PM -0600, Paul A. Clarke wrote:
> On Tue, Feb 22, 2022 at 06:41:45PM -0600, Segher Boessenkool wrote:
> > That said...
> > 
> > > -/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
> > > -/* { dg-skip-if "" { powerpc*-*-darwin* } } */
> > > +/* { dg-do compile { target lp64 } } */
> > > +/* { dg-skip-if "" { *-*-darwin* } } */
> > 
> > That skip-if is most likely cargo cult, and it's not clear why lp64
> > would be needed either (there is no comment what it is needed for, for
> > example).
> 
> I can't speak to darwin, nor have an easy way of testing on it.

Same here, of course.

> As for lp64, these tests fail on -m32 with:
>   cc1plus: error: '-mcmodel' not supported in this configuration
> - g++.dg/pr65240-1.C
> - g++.dg/pr65240-2.C
> - g++.dg/pr65240-3.C
> 
> '-mcmodel' is in the dg-options line for the above tests.

Yes.  That means the dg-options should be conditional (using
dg-additional-options is convenient).

Tests in *.dg should be done anywhere where that doesn't require
heroics to do.  This is true to a lesser extent elsewhere as well, and
least true in gcc.target -- but even there still true for many tests.

> The rest PASSed.  Shall I remove the 'lp64' restriction for those that PASS?

That is a separate change, so should be a separate commit.  If it is
obviously safe, please do it, yes.  Thanks!

> > > +++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
> > > @@ -1,4 +1,4 @@
> > > -// { dg-do compile { target { powerpc*-*-linux* } } }
> > > +// { dg-do compile { target { *-*-linux* } } }
> > 
> > A comment here would help as well.  All of that is pre-existing of
> > course.
> 
> I'm not sure what such a comment would say. I suspect it was a testing issue
> (only tested on Linux), but I have similar limitations, so I'm also reluctant
> to enable the test for what would be untested (by me) platforms.

It is obvious what it would say: the reason why this is only tested on
Linux, of course!  :-)

I know what you are saying of course.  If it isn't obviously safe, it is
not for stage 4.  And adding more coverage to existing tests is not very
high value, not high priority at all.  The biggest advantage of it would
be that people will stop copying from such bad examples!


Segher

Re: [PATCH 3/3] rs6000: Move more g++.dg powerpc tests to g++.target

[Segher Boessenkool]

Hi!

On Mon, Feb 21, 2022 at 03:17:47PM -0600, Paul A. Clarke wrote:
> gcc/testsuite
> 	* g++.dg/debug/dwarf2/const2.C: Move to g++.target/powerpc.
> 	* g++.dg/other/darwin-minversion-1.C: Likewise.
> 	* g++.dg/eh/ppc64-sighandle-cr.C: Likewise.

This one uses
// { dg-do run { target { powerpc64*-*-linux* } } }
which is never correct: the target defaulting to 64 bit does in no way
mean that this is built as 64 bit.  There is nothing in the test that
needs 64 bit afaics?

> 	* g++.dg/eh/simd-5.C: Likewise.
// { dg-do run { target { powerpc_spe && { ! *-*-vxworks* } } } }

This testcase can be deleted, there is no SPE anymore.

But that is perhaps best done deleting these tests and everything that
uses it as well at the same time :-)

> 	* g++.dg/eh/simd-4.C: Move to g++.target/powerpc, adjust dg directives.
> 	* g++.dg/eh/uncaught3.C: Likewise.
> 	* g++.dg/other/spu2vmx-1.C: Likewise.

Those things can be done later, so: okay for trunk.  Thanks!


Segher