From patchwork Wed Apr 29 15:46:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 466175 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 9D160140320 for ; Thu, 30 Apr 2015 01:46:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=x5j1bcr/; dkim-adsp=none (unprotected policy); 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=eTTEE4gPNg3a8cw1 YJqDG8VvVy6hqH9aeirvLWZ8yMETVLmAzMQ1jTALM0q/wPR/DRGp6nmcecdCTb1d R15f3Z04NXAsJd8iztsisnbsVn8M+K8esucukohaaECMYEFxPppuVyo7v9gT9aoa CyDpvYoG7FHObBtoMuJ/Jy6ap7c= 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=DbB9bkjROc6SclsrXB5385 xVfxw=; b=x5j1bcr/mdTmf87Guhp5jyJKPNB/ViPbZ9A6UDPYgeYb2vYdHoG6K2 uDTuoIwvM/Rzilh+UwvmrlBcAvEnPDoLju5XQ7wzs/i8DB1pE+RosMWBYMJ8Cpwi W/37ZZm8IgaIFYMVQdEPR5kMRMBGrH+Ag1bilYyGG25eA4iaqBMG0= Received: (qmail 70364 invoked by alias); 29 Apr 2015 15:46:49 -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 69400 invoked by uid 89); 29 Apr 2015 15:46:49 -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; Wed, 29 Apr 2015 15:46:47 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1YnUCB-0001U0-LE from Thomas_Schwinge@mentor.com ; Wed, 29 Apr 2015 08:46:44 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Wed, 29 Apr 2015 16:46:41 +0100 From: Thomas Schwinge To: Jakub Jelinek , CC: Cesar Philippidis Subject: Re: OMP_CLAUSES with clauses in operand 0 In-Reply-To: <20150429152854.GJ1751@tucnak.redhat.com> References: <553E787A.1020109@mentor.com> <87383kt7kx.fsf@schwinge.name> <20150429085332.GC1751@tucnak.redhat.com> <87egn3s2p4.fsf@schwinge.name> <20150429093231.GD1751@tucnak.redhat.com> <877fsvrxuu.fsf@schwinge.name> <20150429114355.GF1751@tucnak.redhat.com> <871tj3roor.fsf@schwinge.name> <20150429143624.GI1751@tucnak.redhat.com> <87twvzq7m4.fsf@schwinge.name> <20150429152854.GJ1751@tucnak.redhat.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Wed, 29 Apr 2015 17:46:35 +0200 Message-ID: <87lhhbq6n8.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Wed, 29 Apr 2015 17:28:54 +0200, Jakub Jelinek wrote: > On Wed, Apr 29, 2015 at 05:25:39PM +0200, Thomas Schwinge wrote: > > Done. (I also reverted the gcc/cp/pt.c:tsubst_expr change which > > motivated this patch; will include that with the patch adding support for > > C++ templates usage with OpenACC directives.) OK for trunk? > > Ok, thanks. Committed in r222580: commit 95cfd3918aef02196f24de30a1e7cbd34e45e827 Author: tschwinge Date: Wed Apr 29 15:44:41 2015 +0000 Add OMP_STANDALONE_CLAUSES. gcc/ * tree.h (OMP_STANDALONE_CLAUSES): New macro. * gimplify.c (gimplify_omp_workshare): Use it. gcc/c/ * c-parser.c (c_parser_oacc_enter_exit_data): Use OMP_STANDALONE_CLAUSES. gcc/cp/ * parser.c (cp_parser_oacc_enter_exit_data): Use OMP_STANDALONE_CLAUSES. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222580 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/c/ChangeLog | 5 +++++ gcc/c/c-parser.c | 5 +---- gcc/cp/ChangeLog | 5 +++++ gcc/cp/parser.c | 5 +---- gcc/gimplify.c | 13 +++++-------- gcc/tree.h | 6 ++++++ 7 files changed, 28 insertions(+), 16 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog gcc/ChangeLog index 4fb5490..11cb62a 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-04-29 Thomas Schwinge + + * tree.h (OMP_STANDALONE_CLAUSES): New macro. + * gimplify.c (gimplify_omp_workshare): Use it. + 2015-04-29 Richard Sandiford * Makefile.in (build/genrecog.o): Depend on inchash.h. diff --git gcc/c/ChangeLog gcc/c/ChangeLog index 9c769ca..6d8dbb1 100644 --- gcc/c/ChangeLog +++ gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2015-04-29 Thomas Schwinge + + * c-parser.c (c_parser_oacc_enter_exit_data): Use + OMP_STANDALONE_CLAUSES. + 2015-04-28 Marek Polacek * c-parser.c (c_parser_binary_expression): Remove duplicate line. diff --git gcc/c/c-parser.c gcc/c/c-parser.c index cc8a4e3..bf0e4c57 100644 --- gcc/c/c-parser.c +++ gcc/c/c-parser.c @@ -12154,10 +12154,7 @@ c_parser_oacc_enter_exit_data (c_parser *parser, bool enter) stmt = enter ? make_node (OACC_ENTER_DATA) : make_node (OACC_EXIT_DATA); TREE_TYPE (stmt) = void_type_node; - if (enter) - OACC_ENTER_DATA_CLAUSES (stmt) = clauses; - else - OACC_EXIT_DATA_CLAUSES (stmt) = clauses; + OMP_STANDALONE_CLAUSES (stmt) = clauses; SET_EXPR_LOCATION (stmt, loc); add_stmt (stmt); } diff --git gcc/cp/ChangeLog gcc/cp/ChangeLog index 3ee050c..9442faa 100644 --- gcc/cp/ChangeLog +++ gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-04-29 Thomas Schwinge + + * parser.c (cp_parser_oacc_enter_exit_data): Use + OMP_STANDALONE_CLAUSES. + 2015-04-29 Paolo Carlini PR c++/64667 diff --git gcc/cp/parser.c gcc/cp/parser.c index 4ea2ca2..cfb512b 100644 --- gcc/cp/parser.c +++ gcc/cp/parser.c @@ -31606,10 +31606,7 @@ cp_parser_oacc_enter_exit_data (cp_parser *parser, cp_token *pragma_tok, stmt = enter ? make_node (OACC_ENTER_DATA) : make_node (OACC_EXIT_DATA); TREE_TYPE (stmt) = void_type_node; - if (enter) - OACC_ENTER_DATA_CLAUSES (stmt) = clauses; - else - OACC_EXIT_DATA_CLAUSES (stmt) = clauses; + OMP_STANDALONE_CLAUSES (stmt) = clauses; SET_EXPR_LOCATION (stmt, pragma_tok->location); add_stmt (stmt); return stmt; diff --git gcc/gimplify.c gcc/gimplify.c index 1d5341e..9ce3dd9 100644 --- gcc/gimplify.c +++ gcc/gimplify.c @@ -7411,34 +7411,31 @@ gimplify_omp_workshare (tree *expr_p, gimple_seq *pre_p) static void gimplify_omp_target_update (tree *expr_p, gimple_seq *pre_p) { - tree expr = *expr_p, clauses; + tree expr = *expr_p; int kind; gomp_target *stmt; switch (TREE_CODE (expr)) { case OACC_ENTER_DATA: - clauses = OACC_ENTER_DATA_CLAUSES (expr); kind = GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA; break; case OACC_EXIT_DATA: - clauses = OACC_EXIT_DATA_CLAUSES (expr); kind = GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA; break; case OACC_UPDATE: - clauses = OACC_UPDATE_CLAUSES (expr); kind = GF_OMP_TARGET_KIND_OACC_UPDATE; break; case OMP_TARGET_UPDATE: - clauses = OMP_TARGET_UPDATE_CLAUSES (expr); kind = GF_OMP_TARGET_KIND_UPDATE; break; default: gcc_unreachable (); } - gimplify_scan_omp_clauses (&clauses, pre_p, ORT_WORKSHARE); - gimplify_adjust_omp_clauses (pre_p, &clauses); - stmt = gimple_build_omp_target (NULL, kind, clauses); + gimplify_scan_omp_clauses (&OMP_STANDALONE_CLAUSES (expr), pre_p, + ORT_WORKSHARE); + gimplify_adjust_omp_clauses (pre_p, &OMP_STANDALONE_CLAUSES (expr)); + stmt = gimple_build_omp_target (NULL, kind, OMP_STANDALONE_CLAUSES (expr)); gimplify_seq_add_stmt (pre_p, stmt); *expr_p = NULL_TREE; diff --git gcc/tree.h gcc/tree.h index 2ec9708..e17bd9b 100644 --- gcc/tree.h +++ gcc/tree.h @@ -1197,11 +1197,17 @@ extern void protected_set_expr_location (tree, location_t); /* OpenMP and OpenACC directive and clause accessors. */ +/* Generic accessors for OMP nodes that keep the body as operand 0, and clauses + as operand 1. */ #define OMP_BODY(NODE) \ TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_PARALLEL, OMP_CRITICAL), 0) #define OMP_CLAUSES(NODE) \ TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_PARALLEL, OMP_SINGLE), 1) +/* Generic accessors for OMP nodes that keep clauses as operand 0. */ +#define OMP_STANDALONE_CLAUSES(NODE) \ + TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_CACHE, OMP_TARGET_UPDATE), 0) + #define OACC_PARALLEL_BODY(NODE) \ TREE_OPERAND (OACC_PARALLEL_CHECK (NODE), 0) #define OACC_PARALLEL_CLAUSES(NODE) \