From patchwork Tue Mar 1 18:39:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 590691 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 BDCAE1402C4 for ; Wed, 2 Mar 2016 05:39:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=HG4BJYFc; 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=T1gTfknVGNC0ePv0K Y+WCPU9VdhbYP4MCMUrFoFqrz6Yc1u2brE7wai0M2UfCTOT7u2cEOW/a9USaAC8V GNMssvNptHTderA7VGPvmrHcSPFSk7Hku78f1dEca2q1K2Hkb4Njz2RP/N0GUPiU LnMvYG55ZbJHQjRYZzKRFfe8vM= 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:date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=default; bh=nwt0JNe2SBHMLpeFuQQq9Up SVOY=; b=HG4BJYFcjTbH/ILSHkg1qJN+A2XPFJd5jTvnHh9oFmJwvmKlqBZDeIs V+4c+BQXf1Q2ZKCXPmZMOGrJz72n5UoacKcA3AJlPY2U4COtn2zZBPw6WBhg0nWm cnYSmCfBLdW+VZ7b2JoHuA/fuA7UI9qPm1HXuphqUtUB5XpJ/zH0= Received: (qmail 19966 invoked by alias); 1 Mar 2016 18:39:33 -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 18344 invoked by uid 89); 1 Mar 2016 18:39:25 -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=657, 667, 66, 7, 65, 7 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; Tue, 01 Mar 2016 18:39:22 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8B403ADA6; Tue, 1 Mar 2016 18:39:18 +0000 (UTC) Date: Tue, 1 Mar 2016 19:39:18 +0100 From: Martin Jambor To: Jakub Jelinek Cc: GCC Patches Subject: Re: [hsa, testsuite] Suppress hsa warnings in libgomp tests Message-ID: <20160301183918.GA2148@virgil.suse.cz> Mail-Followup-To: Jakub Jelinek , GCC Patches References: <20160226155957.GJ3094@virgil.suse.cz> <20160226160756.GF3017@tucnak.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160226160756.GF3017@tucnak.redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes Hi, On Fri, Feb 26, 2016 at 05:07:56PM +0100, Jakub Jelinek wrote: > On Fri, Feb 26, 2016 at 04:59:57PM +0100, Martin Jambor wrote: > > just like with the compiler gomp testsuite, we need to add -Wno-hsa to > > options when compiling libgomp testcases in order not to have "excess > > errors" failures when HSA is enabled. ... > > I don't like this very much. > Couldn't you instead add -Wno-hsa next to -fopenmp in *.exp, and just where > you want to explicitly check the hsa warnings, enable it manually in > dg-options or dg-additional-options (it would need to be guarded with hsa > being enabled etc. anyway). > as Jakub requested, this patch deals with HSA "excess errors" in the libgomp library testsuite by passing -Wno-hsa to all of them. IIUC, that passing it in the second parameter of dg-runtest (as opposed to the third) means that it will apply even tests that have their own dg-options, which is presumably easier for everyone, provided that hsa will get is own libgomp testsuite directories. OK for trunk? Thanks, Martin 2016-02-29 Martin Jambor * testsuite/libgomp.c/c.exp: Pass -Wno-hsa to all tests. * testsuite/libgomp.c++/c++.exp: Likewise. * testsuite/libgomp.fortran/fortran.exp: Likewise. --- libgomp/testsuite/libgomp.c++/c++.exp | 2 +- libgomp/testsuite/libgomp.c/c.exp | 2 +- libgomp/testsuite/libgomp.fortran/fortran.exp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index 0454f95..120e573 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -65,7 +65,7 @@ if { $lang_test_file_found } { } # Main loop. - dg-runtest $tests "" "$libstdcxx_includes $DEFAULT_CFLAGS" + dg-runtest $tests "-Wno-hsa" "$libstdcxx_includes $DEFAULT_CFLAGS" } # All done. diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 300b921..d3cd144 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -31,7 +31,7 @@ append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST] set_ld_library_path_env_vars # Main loop. -dg-runtest $tests "" $DEFAULT_CFLAGS +dg-runtest $tests "-Wno-hsa" $DEFAULT_CFLAGS # All done. dg-finish diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 9e6b643..ea84d5c 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -66,7 +66,7 @@ if { $lang_test_file_found } { # For Fortran we're doing torture testing, as Fortran has far more tests # with arrays etc. that testing just -O0 or -O2 is insufficient, that is # typically not the case for C/C++. - gfortran-dg-runtest $tests "" "" + gfortran-dg-runtest $tests "-Wno-hsa" "" } # All done.