From patchwork Tue Sep 29 20:29:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 54247 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by patches.linaro.org (Postfix) with ESMTPS id B12BD23009 for ; Tue, 29 Sep 2015 20:30:05 +0000 (UTC) Received: by obqc1 with SMTP id c1sf23829933obq.2 for ; Tue, 29 Sep 2015 13:30:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:sender :delivered-to:mime-version:date:message-id:subject:from:to :content-type:x-original-sender:x-original-authentication-results; bh=SrcvlAamL7wc8hozNBvL+4ITcx7OZ+HcQdMriB4L9Zo=; b=MDbMYMOpcC9zhw5ebcH8j3TXRXehaeB+tdvlzvJLi46QuvVGCZWt0Fu3CJ1grte/VA /ABfyb5osIiK932yC51N90ys7/IHloINhJ2VdzBb4bZb34FtdogSMaus/k3yXgFf++Oe RMF+e2DNuq2vSvt3FNhpNRKrE3ii208UjzzpF/OEYMiKpkMQULrwFMT5ipZ6y2VgeIw9 gAvVeVhvCLLbO0HCjf7aO9u3QDMaTklOvKl/BoUdCoiRxHXsOnI7bf5RNX5LN1EYU6V7 9PuR5PtzCPaMoueKOJvaPgqlkMr7TzDXDwkMUeuiiQuyrrL5RXWKymbxqimNqhyME+f7 bx6w== X-Gm-Message-State: ALoCoQnYE7ibX1J/+1vxHVtkwH0EY5BHw3y6tn1FTLL+rUMWzOYhjwIBCz6BUAi8GPNMh32x/Pae X-Received: by 10.107.163.80 with SMTP id m77mr706226ioe.0.1443558605069; Tue, 29 Sep 2015 13:30:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.135 with SMTP id 7ls14957qgn.58.gmail; Tue, 29 Sep 2015 13:30:04 -0700 (PDT) X-Received: by 10.55.197.146 with SMTP id k18mr32338133qkl.96.1443558604863; Tue, 29 Sep 2015 13:30:04 -0700 (PDT) Received: from mail-qg0-x234.google.com (mail-qg0-x234.google.com. [2607:f8b0:400d:c04::234]) by mx.google.com with ESMTPS id w194si22930040qha.91.2015.09.29.13.30.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 13:30:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400d:c04::234 as permitted sender) client-ip=2607:f8b0:400d:c04::234; Received: by qgev79 with SMTP id v79so17363087qge.0 for ; Tue, 29 Sep 2015 13:30:04 -0700 (PDT) X-Received: by 10.140.18.240 with SMTP id 103mr32937711qgf.31.1443558604689; Tue, 29 Sep 2015 13:30:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.55.75.214 with SMTP id y205csp2051372qka; Tue, 29 Sep 2015 13:30:03 -0700 (PDT) X-Received: by 10.107.169.72 with SMTP id s69mr752533ioe.155.1443558603849; Tue, 29 Sep 2015 13:30:03 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id v14si18263367igr.97.2015.09.29.13.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 13:30:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-408636-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 32805 invoked by alias); 29 Sep 2015 20:29:48 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 32792 invoked by uid 89); 29 Sep 2015 20:29:47 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f51.google.com Received: from mail-qg0-f51.google.com (HELO mail-qg0-f51.google.com) (209.85.192.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 29 Sep 2015 20:29:45 +0000 Received: by qgt47 with SMTP id 47so17380968qgt.2 for ; Tue, 29 Sep 2015 13:29:43 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.140.201.78 with SMTP id w75mr31637855qha.86.1443558583356; Tue, 29 Sep 2015 13:29:43 -0700 (PDT) Received: by 10.140.44.10 with HTTP; Tue, 29 Sep 2015 13:29:43 -0700 (PDT) Date: Tue, 29 Sep 2015 22:29:43 +0200 Message-ID: Subject: [testsuite] Fix order of dg-do and dg-require-effective-target directives From: Christophe Lyon To: "gcc-patches@gcc.gnu.org" X-IsSubscribed: yes X-Original-Sender: christophe.lyon@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400d:c04::234 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gcc.gnu.org X-Google-Group-Id: 836684582541 I have noticed that both dg-do and dg-require-effective-target modify the value of dg-do-what, which means that dg-do directives must appear before dg-require-effective-target. Indeed if the effective-target property is false, but dg-do is executed later, the test would fail instead of being unsupported. The attached patch fixes the order on the few testcases where I noticed it was wrong. Tested on several arm* and aarch64* targets/multilibs with no regression. OK? Christophe. 2015-09-29 Christophe Lyon * g++.dg/cpp0x/stdint.C: Move dg-require-effective-target after dg-do. * g++.dg/gomp/tls-wrap4.C: Likewise. * gcc.dg/atomic-op-optimize.c: Likewise. * gcc.dg/pr54087.c: Likewise. * gcc.dg/tls/section-2.c: Likewise. * gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a-pr63175.c: Likewise. * gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c: Likewise. * gcc.dg/vect/trapv-vect-reduc-4.c: Likewise. * gcc.target/arm/divzero.c: Likewise. * gcc.target/arm/sibcall-2.c: Likewise. * gcc.target/arm/thumb1-Os-mult.c: Likewise. * gcc.target/arm/thumb1-load-64bit-constant-1.c: Likewise. * gcc.target/arm/thumb1-load-64bit-constant-2.c: Likewise. * gcc.target/arm/thumb1-load-64bit-constant-3.c: Likewise. * gcc.target/arm/volatile-bitfields-1.c: Likewise. * gcc.target/arm/volatile-bitfields-2.c: Likewise. * gcc.target/arm/volatile-bitfields-3.c: Likewise. * gcc.target/arm/volatile-bitfields-4.c: Likewise. * gfortran.dg/default_format_2.f90: Likewise. * gfortran.dg/default_format_denormal_2.f90: Likewise. diff --git a/gcc/testsuite/g++.dg/cpp0x/stdint.C b/gcc/testsuite/g++.dg/cpp0x/stdint.C index 434d458..6c213d7 100644 --- a/gcc/testsuite/g++.dg/cpp0x/stdint.C +++ b/gcc/testsuite/g++.dg/cpp0x/stdint.C @@ -1,6 +1,6 @@ // PR c++/52764 -// { dg-require-effective-target stdint_types } // { dg-do compile { target c++11 } } +// { dg-require-effective-target stdint_types } #include diff --git a/gcc/testsuite/g++.dg/gomp/tls-wrap4.C b/gcc/testsuite/g++.dg/gomp/tls-wrap4.C index 59a5683..dca249d 100644 --- a/gcc/testsuite/g++.dg/gomp/tls-wrap4.C +++ b/gcc/testsuite/g++.dg/gomp/tls-wrap4.C @@ -1,8 +1,8 @@ // We don't need to call the wrapper through the PLT; we can use a separate // copy per shared object. -// { dg-require-effective-target tls } // { dg-do compile { target c++11 } } +// { dg-require-effective-target tls } // { dg-options "-fPIC" } // { dg-final { scan-assembler-not "_ZTW1i@PLT" { target i?86-*-* x86_64-*-* } } } diff --git a/gcc/testsuite/gcc.dg/atomic-op-optimize.c b/gcc/testsuite/gcc.dg/atomic-op-optimize.c index d2e960a..66efee4 100644 --- a/gcc/testsuite/gcc.dg/atomic-op-optimize.c +++ b/gcc/testsuite/gcc.dg/atomic-op-optimize.c @@ -2,8 +2,8 @@ Test that it at happens on x86 by making sure there are 2 xchg's and no compare_exchange loop. */ -/* { dg-require-effective-target sync_int_long } */ /* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-require-effective-target sync_int_long } */ /* { dg-final { scan-assembler-times "cmpxchg" 0 } } */ /* { dg-final { scan-assembler-times "xchg" 2 } } */ diff --git a/gcc/testsuite/gcc.dg/pr54087.c b/gcc/testsuite/gcc.dg/pr54087.c index abb0af3..5874e9c 100644 --- a/gcc/testsuite/gcc.dg/pr54087.c +++ b/gcc/testsuite/gcc.dg/pr54087.c @@ -1,7 +1,7 @@ /* PR54087. Verify __atomic_sub (val) uses __atomic_add (-val) if there is no atomic_aub. */ -/* { dg-require-effective-target sync_int_long } */ /* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-require-effective-target sync_int_long } */ /* { dg-final { scan-assembler-times "xadd" 2 } } */ diff --git a/gcc/testsuite/gcc.dg/tls/section-2.c b/gcc/testsuite/gcc.dg/tls/section-2.c index 8f11def..9c21307 100644 --- a/gcc/testsuite/gcc.dg/tls/section-2.c +++ b/gcc/testsuite/gcc.dg/tls/section-2.c @@ -1,7 +1,7 @@ /* Verify that we get errors for trying to put TLS data in sections which can't work. */ -/* { dg-require-effective-target tls } */ /* { dg-do compile { target *-*-vxworks } } */ +/* { dg-require-effective-target tls } */ #define A(X) __attribute__((section(X))) diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a-pr63175.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a-pr63175.c index bf6053d..409e685 100644 --- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a-pr63175.c +++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-bb-slp-9a-pr63175.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target vect_int } */ /* { dg-do compile } */ +/* { dg-require-effective-target vect_int } */ #define N 16 diff --git a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c index e0093c4..5b5dd1b 100644 --- a/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c +++ b/gcc/testsuite/gcc.dg/vect/costmodel/ppc/costmodel-pr37194.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target vect_float } */ /* { dg-do compile } */ +/* { dg-require-effective-target vect_float } */ #include #include "../../tree-vect.h" diff --git a/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c b/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c index f801e76..d19d42c 100644 --- a/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c +++ b/gcc/testsuite/gcc.dg/vect/trapv-vect-reduc-4.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target vect_int } */ /* { dg-do compile } */ +/* { dg-require-effective-target vect_int } */ #include #include "tree-vect.h" diff --git a/gcc/testsuite/gcc.target/arm/divzero.c b/gcc/testsuite/gcc.target/arm/divzero.c index 7d398a5..b005763 100644 --- a/gcc/testsuite/gcc.target/arm/divzero.c +++ b/gcc/testsuite/gcc.target/arm/divzero.c @@ -1,6 +1,6 @@ +/* { dg-do run } */ /* { dg-require-effective-target arm_eabi } */ /* { dg-options "" } */ -/* { dg-do run } */ /* Check that long long divmod functions pass the right argument to __aeabi_ldiv0 on divide by zero. */ diff --git a/gcc/testsuite/gcc.target/arm/sibcall-2.c b/gcc/testsuite/gcc.target/arm/sibcall-2.c index 921c0f3..52cd307 100644 --- a/gcc/testsuite/gcc.target/arm/sibcall-2.c +++ b/gcc/testsuite/gcc.target/arm/sibcall-2.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_eabi } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_eabi } */ /* { dg-options "-O2 -mabi=aapcs" } */ diff --git a/gcc/testsuite/gcc.target/arm/thumb1-Os-mult.c b/gcc/testsuite/gcc.target/arm/thumb1-Os-mult.c index 08d735c..b989c42 100644 --- a/gcc/testsuite/gcc.target/arm/thumb1-Os-mult.c +++ b/gcc/testsuite/gcc.target/arm/thumb1-Os-mult.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-options "-Os" } */ /* { dg-skip-if "" { ! { arm_thumb1 } } } */ diff --git a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-1.c b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-1.c index 9537aaf..59e9a8d 100644 --- a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-1.c +++ b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-1.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-options "-Os" } */ /* { dg-skip-if "" { ! { arm_thumb1 } } } */ diff --git a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-2.c b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-2.c index 836682b..f542ad3 100644 --- a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-2.c +++ b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-2.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-options "-O2" } */ /* { dg-skip-if "" { ! { arm_thumb1 } } } */ diff --git a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-3.c b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-3.c index b53ed8b..0a18484 100644 --- a/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-3.c +++ b/gcc/testsuite/gcc.target/arm/thumb1-load-64bit-constant-3.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-options "-Os" } */ /* { dg-skip-if "" { ! { arm_thumb1 } } } */ diff --git a/gcc/testsuite/gcc.target/arm/volatile-bitfields-1.c b/gcc/testsuite/gcc.target/arm/volatile-bitfields-1.c index c519419..d841ca1 100644 --- a/gcc/testsuite/gcc.target/arm/volatile-bitfields-1.c +++ b/gcc/testsuite/gcc.target/arm/volatile-bitfields-1.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_eabi } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_eabi } */ /* { dg-options "-O2" } */ typedef struct { diff --git a/gcc/testsuite/gcc.target/arm/volatile-bitfields-2.c b/gcc/testsuite/gcc.target/arm/volatile-bitfields-2.c index eb0aaf7..ea1af39 100644 --- a/gcc/testsuite/gcc.target/arm/volatile-bitfields-2.c +++ b/gcc/testsuite/gcc.target/arm/volatile-bitfields-2.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_eabi } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_eabi } */ /* { dg-options "-O2" } */ typedef struct { diff --git a/gcc/testsuite/gcc.target/arm/volatile-bitfields-3.c b/gcc/testsuite/gcc.target/arm/volatile-bitfields-3.c index 0f5dde0..4580da0 100644 --- a/gcc/testsuite/gcc.target/arm/volatile-bitfields-3.c +++ b/gcc/testsuite/gcc.target/arm/volatile-bitfields-3.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_eabi } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_eabi } */ /* { dg-options "-O2" } */ typedef struct { diff --git a/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c b/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c index 805dab1..4256965 100644 --- a/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c +++ b/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c @@ -1,5 +1,5 @@ -/* { dg-require-effective-target arm_eabi } */ /* { dg-do compile } */ +/* { dg-require-effective-target arm_eabi } */ /* { dg-options "-O2" } */ /* { dg-final { scan-assembler-times "ldr\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ /* { dg-final { scan-assembler-times "str\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ diff --git a/gcc/testsuite/gfortran.dg/default_format_2.f90 b/gcc/testsuite/gfortran.dg/default_format_2.f90 index e970090..9c5af7b 100644 --- a/gcc/testsuite/gfortran.dg/default_format_2.f90 +++ b/gcc/testsuite/gfortran.dg/default_format_2.f90 @@ -1,5 +1,5 @@ -! { dg-require-effective-target fortran_large_real } ! { dg-do run { xfail powerpc*-apple-darwin* powerpc*-*-linux* } } +! { dg-require-effective-target fortran_large_real } ! Test XFAILed on these platforms because the system's printf() lacks ! proper support for denormalized long doubles. See PR24685 ! diff --git a/gcc/testsuite/gfortran.dg/default_format_denormal_2.f90 b/gcc/testsuite/gfortran.dg/default_format_denormal_2.f90 index 6134a56..58cd987 100644 --- a/gcc/testsuite/gfortran.dg/default_format_denormal_2.f90 +++ b/gcc/testsuite/gfortran.dg/default_format_denormal_2.f90 @@ -1,5 +1,5 @@ -! { dg-require-effective-target fortran_large_real } ! { dg-do run { xfail powerpc*-apple-darwin* } } +! { dg-require-effective-target fortran_large_real } ! Test XFAILed on this platform because the system's printf() lacks ! proper support for denormalized long doubles. See PR24685 !