From patchwork Mon Feb 29 16:02:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 593071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 87DEA140273 for ; Tue, 8 Mar 2016 04:35:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=D/FSSAGh; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :resent-from:resent-date:resent-message-id:resent-to:message-id :in-reply-to:references:from:date:subject:cc:to; q=dns; s= default; b=I4dkKqr1wS8qPuxS9zu1EAbamw11ppjfOXP3mkqZNz8wazmisYv93 yBbWcP09juJ65Tj5QBrxcRZD867tyETrhmzSmdxdx4ldo8u7YC+IzT3KnE0qW/Bt uPuejIp2jjLVXjBtFVLf/kfiz5cSXhUrn16SWdpMFnaIhKGW+owkJc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :resent-from:resent-date:resent-message-id:resent-to:message-id :in-reply-to:references:from:date:subject:cc:to; s=default; bh=L tC9T8BD/QnpTVOBUqbYpie7VBg=; b=D/FSSAGhoXt221wZoAI5iymMK/FHtPh7m nSf4YQ98t0vaIyCyX9Zw4qiFvcdgLiu7RsflXJfqLjWa6cTVNXyXqnqqsFkv8Tcr o/ekRZBbl82BlRPNJMVoxxf/98uyIK8Sp9ZLa55C+7nETYryVclEPwvCUiIQlu5n +ZwIZiPttY= Received: (qmail 114283 invoked by alias); 7 Mar 2016 17:34:31 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk 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 114220 invoked by uid 89); 7 Mar 2016 17:34:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Moved, superfluous, *C, *c X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Mon, 07 Mar 2016 17:34:26 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 68994ADE5 for ; Mon, 7 Mar 2016 17:34:22 +0000 (UTC) Resent-From: Martin Jambor Resent-Date: Mon, 7 Mar 2016 18:34:22 +0100 Resent-Message-ID: <20160307173422.GC23597@virgil.suse.cz> Resent-To: GCC Patches Message-Id: In-Reply-To: References: From: Martin Jambor Date: Mon, 29 Feb 2016 17:02:34 +0100 Subject: [hsa testsuite 2/5] Suppress hsa warnings in compiler gomp tests CC: Jakub Jelinek To: GCC Patches X-IsSubscribed: yes Hi, as Jakub requested, this patch deals with HSA "excess errors" in the gomp compiler testsuite by passing -Wno-hsa to all of them. After discussing this in the thread about similar libgomp tests[1] (which are however handled differently), Jakub expressed preference for passing the option in default_extra_flags rather than flags so that names of the tests do not change. This however requires that the failing tests which use dg-options must be adjusted. There is 9 of them, most of them have just superfluous -fopenmp in them which can be removed because that is the default and the rest is handled by turning dg-options into dg-additional-options. OK for trunk? Thanks, Martin [1] https://gcc.gnu.org/ml/gcc-patches/2016-03/msg00381.html 2016-03-04 Martin Jambor * c-c++-common/gomp/clauses-1.c: Remove dg-options. * c-c++-common/gomp/if-1.c: Likewise. * c-c++-common/gomp/pr61486-2.c: Likewise. * c-c++-common/gomp/target-teams-1.c: Moved dg-options except -fopenmp to dg-additional-options. * g++.dg/gomp/gomp.exp: Pass -Wno-hsa to all tests. * g++/gomp/target-teams-1.c: Likewise. * gcc.dg/gomp/gomp.exp: Likewise. * gcc.dg/gomp/pr68128-2.c: Moved dg-options except -fopenmp to dg-additional-options. * gfortran.dg/gomp/gomp.exp: Likewise. * gfortran.dg/gomp/target1.f90: Remove dg-options. * gfortran.dg/gomp/target2.f90: Moved dg-options except -fopenmp to dg-additional-options. * gfortran.dg/gomp/target3.f90: Remove dg-options. --- gcc/testsuite/c-c++-common/gomp/clauses-1.c | 1 - gcc/testsuite/c-c++-common/gomp/if-1.c | 1 - gcc/testsuite/c-c++-common/gomp/pr61486-2.c | 1 - gcc/testsuite/c-c++-common/gomp/target-teams-1.c | 2 +- gcc/testsuite/g++.dg/gomp/gomp.exp | 2 +- gcc/testsuite/g++.dg/gomp/target-teams-1.C | 2 +- gcc/testsuite/gcc.dg/gomp/gomp.exp | 2 +- gcc/testsuite/gcc.dg/gomp/pr68128-2.c | 2 +- gcc/testsuite/gfortran.dg/gomp/gomp.exp | 2 +- gcc/testsuite/gfortran.dg/gomp/target1.f90 | 1 - gcc/testsuite/gfortran.dg/gomp/target2.f90 | 2 +- gcc/testsuite/gfortran.dg/gomp/target3.f90 | 1 - 12 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gcc/testsuite/c-c++-common/gomp/clauses-1.c b/gcc/testsuite/c-c++-common/gomp/clauses-1.c index 2d1c352..91aed39 100644 --- a/gcc/testsuite/c-c++-common/gomp/clauses-1.c +++ b/gcc/testsuite/c-c++-common/gomp/clauses-1.c @@ -1,5 +1,4 @@ /* { dg-do compile } */ -/* { dg-options "-fopenmp" } */ /* { dg-additional-options "-std=c99" { target c } } */ int t; diff --git a/gcc/testsuite/c-c++-common/gomp/if-1.c b/gcc/testsuite/c-c++-common/gomp/if-1.c index 4ba708c..3a9b538 100644 --- a/gcc/testsuite/c-c++-common/gomp/if-1.c +++ b/gcc/testsuite/c-c++-common/gomp/if-1.c @@ -1,5 +1,4 @@ /* { dg-do compile } */ -/* { dg-options "-fopenmp" } */ void foo (int a, int b, int *p, int *q) diff --git a/gcc/testsuite/c-c++-common/gomp/pr61486-2.c b/gcc/testsuite/c-c++-common/gomp/pr61486-2.c index db97143..4a68023 100644 --- a/gcc/testsuite/c-c++-common/gomp/pr61486-2.c +++ b/gcc/testsuite/c-c++-common/gomp/pr61486-2.c @@ -1,6 +1,5 @@ /* PR middle-end/61486 */ /* { dg-do compile } */ -/* { dg-options "-fopenmp" } */ /* { dg-require-effective-target alloca } */ #pragma omp declare target diff --git a/gcc/testsuite/c-c++-common/gomp/target-teams-1.c b/gcc/testsuite/c-c++-common/gomp/target-teams-1.c index 0a707c2..51b8d48 100644 --- a/gcc/testsuite/c-c++-common/gomp/target-teams-1.c +++ b/gcc/testsuite/c-c++-common/gomp/target-teams-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-fopenmp -fdump-tree-gimple" } */ +/* { dg-additional-options "-fdump-tree-gimple" } */ int v = 6; void bar (int); diff --git a/gcc/testsuite/g++.dg/gomp/gomp.exp b/gcc/testsuite/g++.dg/gomp/gomp.exp index 7365389..d26596c 100644 --- a/gcc/testsuite/g++.dg/gomp/gomp.exp +++ b/gcc/testsuite/g++.dg/gomp/gomp.exp @@ -29,7 +29,7 @@ dg-init # Main loop. g++-dg-runtest [lsort [concat \ [find $srcdir/$subdir *.C] \ - [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp" + [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp -Wno-hsa" # All done. dg-finish diff --git a/gcc/testsuite/g++.dg/gomp/target-teams-1.C b/gcc/testsuite/g++.dg/gomp/target-teams-1.C index 0a97de0..f78a608 100644 --- a/gcc/testsuite/g++.dg/gomp/target-teams-1.C +++ b/gcc/testsuite/g++.dg/gomp/target-teams-1.C @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-fopenmp -fdump-tree-gimple" } +// { dg-additional-options "-fdump-tree-gimple" } int v = 6; void bar (int); diff --git a/gcc/testsuite/gcc.dg/gomp/gomp.exp b/gcc/testsuite/gcc.dg/gomp/gomp.exp index 78623fc..b6b5932 100644 --- a/gcc/testsuite/gcc.dg/gomp/gomp.exp +++ b/gcc/testsuite/gcc.dg/gomp/gomp.exp @@ -31,7 +31,7 @@ dg-init # Main loop. dg-runtest [lsort [concat \ [find $srcdir/$subdir *.c] \ - [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp" + [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp -Wno-hsa" # All done. dg-finish diff --git a/gcc/testsuite/gcc.dg/gomp/pr68128-2.c b/gcc/testsuite/gcc.dg/gomp/pr68128-2.c index 58a07e9..9720add 100644 --- a/gcc/testsuite/gcc.dg/gomp/pr68128-2.c +++ b/gcc/testsuite/gcc.dg/gomp/pr68128-2.c @@ -1,6 +1,6 @@ /* PR tree-optimization/68128 */ /* { dg-do compile } */ -/* { dg-options "-O2 -fopenmp -fdump-tree-omplower" } */ +/* { dg-additional-options "-O2 -fdump-tree-omplower" } */ extern int omp_get_thread_num (void); extern int omp_get_ancestor_thread_num (int); diff --git a/gcc/testsuite/gfortran.dg/gomp/gomp.exp b/gcc/testsuite/gfortran.dg/gomp/gomp.exp index 625361b..1cd2e36 100644 --- a/gcc/testsuite/gfortran.dg/gomp/gomp.exp +++ b/gcc/testsuite/gfortran.dg/gomp/gomp.exp @@ -30,7 +30,7 @@ dg-init # Main loop. gfortran-dg-runtest [lsort \ - [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp" + [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp -Wno-hsa" # All done. dg-finish diff --git a/gcc/testsuite/gfortran.dg/gomp/target1.f90 b/gcc/testsuite/gfortran.dg/gomp/target1.f90 index 14db497..1e77176 100644 --- a/gcc/testsuite/gfortran.dg/gomp/target1.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/target1.f90 @@ -1,5 +1,4 @@ ! { dg-do compile } -! { dg-options "-fopenmp" } module target1 interface diff --git a/gcc/testsuite/gfortran.dg/gomp/target2.f90 b/gcc/testsuite/gfortran.dg/gomp/target2.f90 index 7521331..dfe0ec3 100644 --- a/gcc/testsuite/gfortran.dg/gomp/target2.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/target2.f90 @@ -1,5 +1,5 @@ ! { dg-do compile } -! { dg-options "-fopenmp -ffree-line-length-160" } +! { dg-additional-options "-ffree-line-length-160" } subroutine foo (n, s, t, u, v, w) integer :: n, i, s, t, u, v, w diff --git a/gcc/testsuite/gfortran.dg/gomp/target3.f90 b/gcc/testsuite/gfortran.dg/gomp/target3.f90 index 7ba42a0..d968e54 100644 --- a/gcc/testsuite/gfortran.dg/gomp/target3.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/target3.f90 @@ -1,5 +1,4 @@ ! { dg-do compile } -! { dg-options "-fopenmp" } subroutine foo (r) integer :: i, r