From patchwork Tue Jun 30 21:30:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 489818 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 8BB2114030A for ; Wed, 1 Jul 2015 07:31:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=HiUZOaeo; 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=EpCJ7JDXNefLaAh0b 2/fMpMfZCOnD1Ke9BF7C48T/2BRgzrSKKcFRAPcVYG2gckI7V9Z+CuE+hddifAu3 J14e7nhFJtqrt5GDePL9XyIxGBi1EPB1zRDip/CuRxTRl0LI4hN3DprSvu6hZZmh olT9BNVePXiGCZtAQ51mfDd/u8= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=SH/NLqFe1mrQQ/xUridwekC fXQE=; b=HiUZOaeoAecZn2W2hkAN9+yCfqeYHffdDa8+5NVu7q+6rfP1eiubeUo zJg390kXC2oKraIUDLadCN/Xfh0pGPsSQw7SN2ZceZiUnpdMPvHgooNN+7E/qj1s 9Nt0GxiokkjbvWT+5i9DRJn9BAYNn2gYt1Ojbz4/b5pRiCOSsXME= Received: (qmail 34293 invoked by alias); 30 Jun 2015 21:31:09 -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 34280 invoked by uid 89); 30 Jun 2015 21:31:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 30 Jun 2015 21:31:07 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59099) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZA37Q-0007nV-MP for gcc-patches@gnu.org; Tue, 30 Jun 2015 17:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZA37J-00058P-Uq for gcc-patches@gnu.org; Tue, 30 Jun 2015 17:31:04 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:40262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA37J-00057y-Kh for gcc-patches@gnu.org; Tue, 30 Jun 2015 17:30:57 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZA37H-0001u4-1E from Tom_deVries@mentor.com ; Tue, 30 Jun 2015 14:30:55 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Tue, 30 Jun 2015 22:30:53 +0100 Message-ID: <55930A84.9010801@mentor.com> Date: Tue, 30 Jun 2015 23:30:44 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Jakub Jelinek CC: , Thomas Schwinge Subject: [committed, gomp4] Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by default References: <557EFF01.6030106@mentor.com> <20150630120717.GG10247@tucnak.redhat.com> <5592BA5F.7050101@mentor.com> In-Reply-To: <5592BA5F.7050101@mentor.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 [ was Re: [committed] Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by default ] On 30/06/15 17:48, Tom de Vries wrote: > [ was: Re: [patch] Run testsuite/libgomp.c++/c++.exp at -O2 by default ] > > On 30/06/15 14:07, Jakub Jelinek wrote: >> On Mon, Jun 15, 2015 at 06:36:17PM +0200, Tom de Vries wrote: >>> Hi, >>> >>> this patch: >>> - sets DEFAULT_CFLAGS to -O2, if not set otherwise >>> (similar to what is done in c.exp) >>> - removes superfluous dg-options "-O2" settings. >>> - removes superfluous dg-options "-fopenmp" settings. >>> - uses dg-additional-options for -std= settings >>> >>> Tested on x86_64. >>> >>> OK for trunk? >> >> Ok, thanks. >> > > I've also committed this patch, as obvious. It does the same, but for > libgomp.oacc-c++/c++.exp (which was based on libgomp.c++/c++.exp). > I've backported this patch to the gomp-4_0-branch, in addition with two more patches cleaning up dg-options in testsuite/libgomp.oacc-c-c++-common. Committed as attached. Thanks, - Tom [PATCH 3/3] Remove dg-options in libgomp.oacc-c-c++-common 2015-06-30 Tom de Vries * testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c: Remove dg-options "-O2" setting. * testsuite/libgomp.oacc-c-c++-common/routine-1.c: Replace dg-options with dg-additional-options. * testsuite/libgomp.oacc-c-c++-common/routine-2.c: Same. --- libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c | 1 - libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c | 4 ++-- libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c index d3306aa..5685dbd 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c @@ -1,5 +1,4 @@ /* { dg-do run } */ -/* { dg-options "-O2" } */ /* Data directive at end of function. This is the variant that triggered PR65419. */ diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c index 144f892..6b22e7f 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c @@ -1,7 +1,7 @@ -/* FIXME: remove -fno-var-tracking from dg-options. */ +/* FIXME: remove -fno-var-tracking from dg-aditional-options. */ /* { dg-do run } */ -/* { dg-options "-fno-inline -fno-var-tracking" } */ +/* { dg-additional-options "-fno-inline -fno-var-tracking" } */ #include #include diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c index f08aeda..e1605b9 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c @@ -1,7 +1,7 @@ -/* FIXME: remove -fno-var-tracking from dg-options. */ +/* FIXME: remove -fno-var-tracking from dg-additional-options. */ /* { dg-do run } */ -/* { dg-options "-fno-inline -fno-var-tracking" } */ +/* { dg-additional-options "-fno-inline -fno-var-tracking" } */ #include #include -- 1.9.1