From patchwork Wed Jun 1 11:56:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 628628 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 3rKTNs5LlGz9t5c for ; Wed, 1 Jun 2016 21:57:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Tq4ZWW+r; 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:content-transfer-encoding; q=dns; s=default; b=sm+ CMHPIEFU8D2HxUQFVBsGonB46udiLI+9QMfZQv1940y4pA+Nr7qonss/1PhOwKyZ HFnDwI0agvHB4AQ3m8hxr1XD5XiQLJ9nxh0AtS1Lj2p37txbZjaEvyy7VdcL2iGg WnbsdF3nGnbqkGhpwsUoMk55YfRDrVjm5/DjdouA= 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:content-transfer-encoding; s=default; bh=Bpi/QwhVU fT5hZGKpQMd+FHnmKQ=; b=Tq4ZWW+r8sWc8KJN52nP13YyzD/Ov1GWfr2zNYx08 TCqceyI7qhG5OaVomZGqmR4gz8wfivw/oS56WdFi3JGZ5Axrv/2jhT4G+suVNPR4 EBzNmLAL3qg/1sAdFfLSApG69MANNBDt573ZExljH0iw0G6g4msY6bAh7yR/V7u5 nA= Received: (qmail 103800 invoked by alias); 1 Jun 2016 11:56:54 -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 102426 invoked by uid 89); 1 Jun 2016 11:56:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=82757 X-Spam-User: qpsmtpd, 2 recipients 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 01 Jun 2016 11:56:43 +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 1b84lL-0004Mf-QP from Thomas_Schwinge@mentor.com ; Wed, 01 Jun 2016 04:56:40 -0700 Received: from hertz.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, 1 Jun 2016 12:56:38 +0100 From: Thomas Schwinge To: Cesar Philippidis , , , Jakub Jelinek Subject: Re: Remove the unused OMP_CLAUSE_DEVICE_RESIDENT In-Reply-To: <574E11A5.50903@codesourcery.com> References: <87wpmaqlii.fsf@kepler.schwinge.homeip.net> <574E11A5.50903@codesourcery.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Wed, 1 Jun 2016 13:56:32 +0200 Message-ID: <87k2i9rukv.fsf@hertz.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Tue, 31 May 2016 15:35:17 -0700, Cesar Philippidis wrote: > On 05/31/2016 08:45 AM, Thomas Schwinge wrote: > > > While working on something else, I came across the following. Cesar, can > > you please verify that this is really dead code in the Fortran front end, > > which currently is the only producer of OMP_CLAUSE_DEVICE_RESIDENT? > > You're correct. Declare should be using map clauses for device resident > and link. > > Also, I noticed that the Fortran front end never creates OMP_CLAUSE_MAP > > with GOMP_MAP_LINK or GOMP_MAP_DEVICE_RESIDENT -- how is OpenACC declare > > working at all? Cesar, if this is not a simple question to answer, > > please file a GCC PR, for somebody to have a look later. > > Declare might not be working in fortran, or at least not all of its > clauses. I'll add this on my todo list. I extended the scope of the existing to generally examine the "Fortran OpenACC declare directive". Committed in r236985: commit 9c9a6c2515033aabbba5a037674573526ab37319 Author: tschwinge Date: Wed Jun 1 11:55:35 2016 +0000 Remove the unused OMP_CLAUSE_DEVICE_RESIDENT gcc/ * tree-core.h (enum omp_clause_code): Remove OMP_CLAUSE_DEVICE_RESIDENT. Adjust all users. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@236985 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/fortran/trans-openmp.c | 3 --- gcc/gimplify.c | 5 ----- gcc/omp-low.c | 2 -- gcc/tree-core.h | 3 --- gcc/tree-pretty-print.c | 3 --- gcc/tree.c | 3 --- 7 files changed, 5 insertions(+), 19 deletions(-) Grüße Thomas diff --git gcc/ChangeLog gcc/ChangeLog index 0bb7f28..58fea2f 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-06-01 Thomas Schwinge + + * tree-core.h (enum omp_clause_code): Remove + OMP_CLAUSE_DEVICE_RESIDENT. Adjust all users. + 2016-06-01 Kyrylo Tkachov * config/arm/sync.md (arm_store_exclusive): diff --git gcc/fortran/trans-openmp.c gcc/fortran/trans-openmp.c index c2d89eb..d3276f9 100644 --- gcc/fortran/trans-openmp.c +++ gcc/fortran/trans-openmp.c @@ -1773,9 +1773,6 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, case OMP_LIST_USE_DEVICE: clause_code = OMP_CLAUSE_USE_DEVICE_PTR; goto add_clause; - case OMP_LIST_DEVICE_RESIDENT: - clause_code = OMP_CLAUSE_DEVICE_RESIDENT; - goto add_clause; add_clause: omp_clauses diff --git gcc/gimplify.c gcc/gimplify.c index 8b7dddc..131fa24 100644 --- gcc/gimplify.c +++ gcc/gimplify.c @@ -7538,10 +7538,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, } break; - case OMP_CLAUSE_DEVICE_RESIDENT: - remove = true; - break; - case OMP_CLAUSE_NOWAIT: case OMP_CLAUSE_ORDERED: case OMP_CLAUSE_UNTIED: @@ -8275,7 +8271,6 @@ gimplify_adjust_omp_clauses (gimple_seq *pre_p, gimple_seq body, tree *list_p, case OMP_CLAUSE__CILK_FOR_COUNT_: case OMP_CLAUSE_ASYNC: case OMP_CLAUSE_WAIT: - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_INDEPENDENT: case OMP_CLAUSE_NUM_GANGS: case OMP_CLAUSE_NUM_WORKERS: diff --git gcc/omp-low.c gcc/omp-low.c index a11f44b..77bdb18 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -2200,7 +2200,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx, install_var_local (decl, ctx); break; - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE__CACHE_: sorry ("Clause not supported yet"); break; @@ -2368,7 +2367,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx, case OMP_CLAUSE__GRIDDIM_: break; - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE__CACHE_: sorry ("Clause not supported yet"); break; diff --git gcc/tree-core.h gcc/tree-core.h index b069928..db5b470 100644 --- gcc/tree-core.h +++ gcc/tree-core.h @@ -316,9 +316,6 @@ enum omp_clause_code { #pragma acc cache (variable-list). */ OMP_CLAUSE__CACHE_, - /* OpenACC clause: device_resident (variable_list). */ - OMP_CLAUSE_DEVICE_RESIDENT, - /* OpenACC clause: gang [(gang-argument-list)]. Where gang-argument-list: [gang-argument-list, ] gang-argument diff --git gcc/tree-pretty-print.c gcc/tree-pretty-print.c index 0e7fdd1..734ecda 100644 --- gcc/tree-pretty-print.c +++ gcc/tree-pretty-print.c @@ -407,9 +407,6 @@ dump_omp_clause (pretty_printer *pp, tree clause, int spc, int flags) case OMP_CLAUSE__LOOPTEMP_: name = "_looptemp_"; goto print_remap; - case OMP_CLAUSE_DEVICE_RESIDENT: - name = "device_resident"; - goto print_remap; case OMP_CLAUSE_TO_DECLARE: name = "to"; goto print_remap; diff --git gcc/tree.c gcc/tree.c index f4b470b..7511d0a 100644 --- gcc/tree.c +++ gcc/tree.c @@ -281,7 +281,6 @@ unsigned const char omp_clause_num_ops[] = 1, /* OMP_CLAUSE_USE_DEVICE_PTR */ 1, /* OMP_CLAUSE_IS_DEVICE_PTR */ 2, /* OMP_CLAUSE__CACHE_ */ - 1, /* OMP_CLAUSE_DEVICE_RESIDENT */ 2, /* OMP_CLAUSE_GANG */ 1, /* OMP_CLAUSE_ASYNC */ 1, /* OMP_CLAUSE_WAIT */ @@ -353,7 +352,6 @@ const char * const omp_clause_code_name[] = "use_device_ptr", "is_device_ptr", "_cache_", - "device_resident", "gang", "async", "wait", @@ -11764,7 +11762,6 @@ walk_tree_1 (tree *tp, walk_tree_fn func, void *data, WALK_SUBTREE (OMP_CLAUSE_OPERAND (*tp, 1)); /* FALLTHRU */ - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_ASYNC: case OMP_CLAUSE_WAIT: case OMP_CLAUSE_WORKER: