* [testsuite] remove -m32/-m64 options in powerpc tests
@ 2009-11-24 19:18 Janis Johnson
0 siblings, 0 replies; only message in thread
From: Janis Johnson @ 2009-11-24 19:18 UTC (permalink / raw)
To: gcc-patches; +Cc: meissner, eres
When tests are run on a powerpc64 system they should use something like
RUNTESTFLAGS="--target_board=unix'{-m32,-m64}'" to run tests with both
-m32 and -m64. A test that should be run for only ilp32 or lp64 should
require that as part of a target list, rather than specifying -m32 or
-m64.
Several powerpc-specific tests add -m32 or -m64 to the options used to
compile the test, but that isn't necessary since the tests should be run
both ways anyway. This patch fixes those tests, and adds ilp32 or lp64
to the target lists in the few cases where they aren't already used.
Tested on powerpc64-linux with -m32/-m64, checked in on mainline.
2009-11-24 Janis Johnson <janis187@us.ibm.com>
* gcc.target/powerpc/altivec-32.c: Don't use -m64.
* gcc.target/powerpc/const-compare.c: Require lp64, don't use -m64.
* gcc.target/powerpc/darwin-bool-1.c: Require ilp32, remove dg-skip-if.
* gcc.target/powerpc/paired-1.c: Require ilp32, don't use -m32.
* gcc.target/powerpc/paired-2.c: Ditto.
* gcc.target/powerpc/paired-3.c: Ditto.
* gcc.target/powerpc/paired-4.c: Ditto.
* gcc.target/powerpc/paired-5.c: Ditto.
* gcc.target/powerpc/paired-6.c: Ditto.
* gcc.target/powerpc/paired-7.c: Ditto.
* gcc.target/powerpc/paired-8.c: Ditto.
* gcc.target/powerpc/paired-9.c: Ditto.
* gcc.target/powerpc/paired-10.c: Ditto.
* gcc.target/powerpc/popcount-2.c: Don't use -m32.
* gcc.target/powerpc/popcount-3.c: Don't use -m64.
* gcc.target/powerpc/ppc-paired.c: Require ilp32, don't use -m32.
* gcc.target/powerpc/pr39457.c: Don't use -m64.
* gcc.target/powerpc/vsx-vector-1.c: Ditto.
* gcc.target/powerpc/vsx-vector-2.c: Ditto.
* gcc.target/powerpc/vsx-vector-3.c: Ditto.
* gcc.target/powerpc/vsx-vector-4.c: Ditto.
Index: gcc/testsuite/gcc.target/powerpc/altivec-32.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/altivec-32.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/altivec-32.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power6 -m64 -maltivec" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power6 -maltivec" } */
/* { dg-final { scan-assembler "vsel" } } */
/* { dg-final { scan-assembler "vrfim" } } */
/* { dg-final { scan-assembler "vrfip" } } */
Index: gcc/testsuite/gcc.target/powerpc/const-compare.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/const-compare.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/const-compare.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc*-*-darwin* } } */
-/* { dg-options "-m64 -O1 -static" } */
+/* { dg-do compile { target { powerpc*-*-darwin* && lp64 } } } */
+/* { dg-options "-O1 -static" } */
typedef unsigned long long uint64_t;
static int
Index: gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c (working copy)
@@ -1,7 +1,6 @@
/* Check that sizeof(bool) is 4 if we don't use special options. */
/* Matt Austern <austern@apple.com> */
-/* { dg-do run { target powerpc*-*-darwin* } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } { "-m64" } { "" } } */
+/* { dg-do run { target { powerpc*-*-darwin* && ilp32 } } } */
int dummy1[sizeof(_Bool) - 3];
int dummy2[5 - sizeof(_Bool)];
Index: gcc/testsuite/gcc.target/powerpc/paired-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-1.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-1.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32} } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-2.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-2.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-3.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-3.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-3.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-4.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-4.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-4.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-5.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-5.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-5.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-6.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-6.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-6.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-7.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-7.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-7.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-8.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-8.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-8.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-9.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-9.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-9.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/paired-10.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/paired-10.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/paired-10.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/popcount-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/popcount-2.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/popcount-2.c (working copy)
@@ -1,6 +1,6 @@
/* { dg-do compile { target { ilp32 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-/* { dg-options "-O2 -mcpu=power7 -m32" } */
+/* { dg-options "-O2 -mcpu=power7" } */
/* { dg-final { scan-assembler "popcntw" } } */
int foo(int x)
Index: gcc/testsuite/gcc.target/powerpc/popcount-3.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/popcount-3.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/popcount-3.c (working copy)
@@ -1,6 +1,6 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-/* { dg-options "-O2 -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -mcpu=power7" } */
/* { dg-final { scan-assembler "popcntd" } } */
long foo(int x)
Index: gcc/testsuite/gcc.target/powerpc/ppc-paired.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/ppc-paired.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/ppc-paired.c (working copy)
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
/* Test PowerPC PAIRED extensions. */
Index: gcc/testsuite/gcc.target/powerpc/pr39457.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/pr39457.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/pr39457.c (working copy)
@@ -1,5 +1,5 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-options "-m64 -O2 -mminimal-toc" } */
+/* { dg-options "-O2 -mminimal-toc" } */
/* PR 39457 -- fix breakage because the compiler ran out of registers and
wanted to stash a floating point value to the LR/CTR register. */
Index: gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64 -ffast-math" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -ffast-math" } */
/* { dg-final { scan-assembler "xvadddp" } } */
/* { dg-final { scan-assembler "xvsubdp" } } */
/* { dg-final { scan-assembler "xvmuldp" } } */
Index: gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64 -ffast-math" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -ffast-math" } */
/* { dg-final { scan-assembler "xvaddsp" } } */
/* { dg-final { scan-assembler "xvsubsp" } } */
/* { dg-final { scan-assembler "xvmulsp" } } */
Index: gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7" } */
/* { dg-final { scan-assembler "xvadddp" } } */
/* { dg-final { scan-assembler "xvsubdp" } } */
/* { dg-final { scan-assembler "xvmuldp" } } */
Index: gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c
===================================================================
--- gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c (revision 154511)
+++ gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c (working copy)
@@ -1,7 +1,7 @@
/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
/* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7" } */
/* { dg-final { scan-assembler "xvaddsp" } } */
/* { dg-final { scan-assembler "xvsubsp" } } */
/* { dg-final { scan-assembler "xvmulsp" } } */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-24 19:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-24 19:18 [testsuite] remove -m32/-m64 options in powerpc tests Janis Johnson
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).