From patchwork Mon Aug 3 11:07:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 503112 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 C979A14029C for ; Mon, 3 Aug 2015 21:07:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=hXEtDLyw; 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=kNiLJ8Rp+5cDeceoGCtwv2LYr7fHg tgXty+IJWhjN0w2sfy5fdA1/u0xn67aO5aC08DjOMC6lPORVbGojkqpLggwyCa2A JOSZmn3walwHu0h7exG80VZ7zGa+aqxbUIpsWdhMxujYyKJwN4b7TRvzdCmLD05I Xs0wyZ0g3E6u8k= 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=W8pRHc7j3wTCdoALnEaoL8RrjlY=; b=hXE tDLywtif6Lrm5mZbYyqDvtDV7FM9n7Bg9r8A4ekNIeuQBu9H9LyEpMcOWi0nEiJ1 wAFDx3taySecQVITal9PT/zzfNTTGR46/11GqkI3ItXH/S+qHfu+37gtRdnI+ONI NQfwpcyvAir45mdoG/FO056celIOLbFSnp6Y/CXg= Received: (qmail 52058 invoked by alias); 3 Aug 2015 11:07:52 -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 52045 invoked by uid 89); 3 Aug 2015 11:07:51 -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, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 03 Aug 2015 11:07:41 +0000 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 1ZMDaj-00001g-6t from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Mon, 03 Aug 2015 04:07:37 -0700 Received: from feldtkeller.schwinge.homeip.net (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; Mon, 3 Aug 2015 12:07:35 +0100 From: Thomas Schwinge To: Nathan Sidwell , GCC Patches Subject: Re: [gomp4] openacc default handling In-Reply-To: <55B95DFD.6090703@acm.org> References: <55B95DFD.6090703@acm.org> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Mon, 3 Aug 2015 13:07:29 +0200 Message-ID: <87d1z4ocjy.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 29 Jul 2015 19:13:01 -0400, Nathan Sidwell wrote: > gcc/ > * gimplify.c (oacc_default_clause): Outer scope searching moved to > omp_notice_variable. > (omp_notice_variable): For OpenACC search enclosing scopes before > applying default. Committed to gomp-4_0-branch in r226495: commit 9446d5a23e74653407f079188e8be4bc9343e15e Author: tschwinge Date: Mon Aug 3 11:06:38 2015 +0000 Resolve bootstrap failure in oacc_default_clause [...]/source-gcc/gcc/gimplify.c: In function 'unsigned int oacc_default_clause(gimplify_omp_ctx*, tree, bool, unsigned int)': [...]/source-gcc/gcc/gimplify.c:5913:13: error: unused parameter 'in_code' [-Werror=unused-parameter] bool in_code, unsigned flags) ^ Fixup for r226373. gcc/ * gimplify.c (oacc_default_clause): Remove in_code formal parameter. Adjust all users. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@226495 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 5 +++++ gcc/gimplify.c | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 3b907ea..a30f6a3 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,8 @@ +2015-08-03 Thomas Schwinge + + * gimplify.c (oacc_default_clause): Remove in_code formal + parameter. Adjust all users. + 2015-08-02 Nathan Sidwell * omp-low.c (oacc_xform_on_device): New function. diff --git gcc/gimplify.c gcc/gimplify.c index 0f8011d..f74f842 100644 --- gcc/gimplify.c +++ gcc/gimplify.c @@ -5909,8 +5909,7 @@ device_resident_p (tree decl) but not declared in an enclosing clause. */ static unsigned -oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, - bool in_code, unsigned flags) +oacc_default_clause (struct gimplify_omp_ctx *ctx, tree decl, unsigned flags) { switch (ctx->default_kind) { @@ -6036,7 +6035,7 @@ omp_notice_variable (struct gimplify_omp_ctx *ctx, tree decl, bool in_code) } if (is_oacc) - flags = oacc_default_clause (ctx, decl, in_code, flags); + flags = oacc_default_clause (ctx, decl, flags); else flags |= GOVD_MAP;