On Thu, Mar 2, 2017 at 10:10 AM, Richard Biener <rguent...@suse.de> wrote:
> On Thu, 2 Mar 2017, Uros Bizjak wrote:
>
>> > Annoying me for quite some time, fixed as follows.
>> >
>> > Tested on x86_64-unknown-linux-gnu, applied to trunk.
>>
>> Index: gcc/testsuite/gcc.dg/rtl/x86_64/dfinit.c
>> ===================================================================
>> --- gcc/testsuite/gcc.dg/rtl/x86_64/dfinit.c (revision 245830)
>> +++ gcc/testsuite/gcc.dg/rtl/x86_64/dfinit.c (working copy)
>> @@ -1,4 +1,4 @@
>> -/* { dg-do run { target x86_64-*-* } } */
>> +/* { dg-do run { target { x86_64-*-* && lp64 } } } */
>>
>> All hese should be "{ target { { i?86-*-* x86_64-*-* } && { ! ia32 } }
>> }". x32 works OK with all test, modulo final.c where it ICEs for some
>> reason.
>
> AFAIK they were testcases with RTL generated for x86_64 lp64 so
> restricting to that is appropriate IMHO (do we really support
> -m64 on i?86-*-*?)
>
> But feel free to adjust them as you see fit - I was just annoyed
> by the persisting FAILs.
Adjusted by attached patch.
2017-03-02 Uros Bizjak <ubiz...@gmail.com>
* gcc.dg/rtl/x86_64/*.c: Test for
"{ i?86-*-* x86_64-*-* } && lp64" targets only.
Tested on x86_64-linux-gnu {,-m32} and committed to mainline SVN.
Uros
Index: gcc.dg/rtl/x86_64/dfinit.c
===================================================================
--- gcc.dg/rtl/x86_64/dfinit.c (revision 245843)
+++ gcc.dg/rtl/x86_64/dfinit.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-dfinit" } */
#include "test_1.h"
Index: gcc.dg/rtl/x86_64/different-structs.c
===================================================================
--- gcc.dg/rtl/x86_64/different-structs.c (revision 245843)
+++ gcc.dg/rtl/x86_64/different-structs.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
extern double sqrt(double x);
Index: gcc.dg/rtl/x86_64/final.c
===================================================================
--- gcc.dg/rtl/x86_64/final.c (revision 245843)
+++ gcc.dg/rtl/x86_64/final.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { x86_64-*-* && lp64 } } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-final" } */
/* Lightly-modified dump of test.c.304r.dwarf2 for x86_64 target,
Index: gcc.dg/rtl/x86_64/into-cfglayout.c
===================================================================
--- gcc.dg/rtl/x86_64/into-cfglayout.c (revision 245843)
+++ gcc.dg/rtl/x86_64/into-cfglayout.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-into_cfglayout" } */
/* Lightly-modified dump of test.c.226r.vregs for x86_64. */
Index: gcc.dg/rtl/x86_64/ira.c
===================================================================
--- gcc.dg/rtl/x86_64/ira.c (revision 245843)
+++ gcc.dg/rtl/x86_64/ira.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-ira" } */
/* Lightly-modified dump of test.c.265r.asmcons for x86_64. */
Index: gcc.dg/rtl/x86_64/pro_and_epilogue.c
===================================================================
--- gcc.dg/rtl/x86_64/pro_and_epilogue.c (revision 245843)
+++ gcc.dg/rtl/x86_64/pro_and_epilogue.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-pro_and_epilogue" } */
/* Lightly-modified dump of test.c.274r.split2 for x86_64. */
Index: gcc.dg/rtl/x86_64/test-multiple-fns.c
===================================================================
--- gcc.dg/rtl/x86_64/test-multiple-fns.c (revision 245843)
+++ gcc.dg/rtl/x86_64/test-multiple-fns.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target x86_64-*-* } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* Verify that we can have multiple __RTL functions in one test case.
Each of these __RTL functions returns a const, dumped immediately after
Index: gcc.dg/rtl/x86_64/test-return-const.c.after-expand.c
===================================================================
--- gcc.dg/rtl/x86_64/test-return-const.c.after-expand.c (revision
245843)
+++ gcc.dg/rtl/x86_64/test-return-const.c.after-expand.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target x86_64-*-* } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
extern void abort (void);
Index: gcc.dg/rtl/x86_64/test-return-const.c.before-fwprop.c
===================================================================
--- gcc.dg/rtl/x86_64/test-return-const.c.before-fwprop.c (revision
245843)
+++ gcc.dg/rtl/x86_64/test-return-const.c.before-fwprop.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target x86_64-*-* } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-fwprop1 -O2" } */
extern void abort (void);
Index: gcc.dg/rtl/x86_64/test-rtl.c
===================================================================
--- gcc.dg/rtl/x86_64/test-rtl.c (revision 245843)
+++ gcc.dg/rtl/x86_64/test-rtl.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* Test of embedding RTL dump in a C function, tagged with "__RTL".
Index: gcc.dg/rtl/x86_64/times-two.c.after-expand.c
===================================================================
--- gcc.dg/rtl/x86_64/times-two.c.after-expand.c (revision 245843)
+++ gcc.dg/rtl/x86_64/times-two.c.after-expand.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
extern void abort (void);
Index: gcc.dg/rtl/x86_64/times-two.c.before-df.c
===================================================================
--- gcc.dg/rtl/x86_64/times-two.c.before-df.c (revision 245843)
+++ gcc.dg/rtl/x86_64/times-two.c.before-df.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-dfinit" } */
int __RTL (startwith ("rtl-dfinit")) times_two (int i)
Index: gcc.dg/rtl/x86_64/vregs.c
===================================================================
--- gcc.dg/rtl/x86_64/vregs.c (revision 245843)
+++ gcc.dg/rtl/x86_64/vregs.c (working copy)
@@ -1,4 +1,4 @@
-/* { dg-do run { target { x86_64-*-* && lp64 } } } */
+/* { dg-do run { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
/* { dg-options "-fdump-rtl-vregs" } */
/* Lightly-modified dump of test.c.225r.expand for x86_64. */
