From patchwork Thu Nov 10 20:43:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cesar Philippidis X-Patchwork-Id: 693473 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 3tFFPh0SYmz9t1b for ; Fri, 11 Nov 2016 07:43:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="lw7hrDVU"; 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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=qzokXUYBEfNumWoyihnEbxBNZTDkkZpxOvdO58hpBJ8tcrKxSO K0WzWyQaGPxILt7JtzzTlVgYe0lC1qzUL8FrUn4hBHRV4c4lYg+t/A0Z3edCCidS 2RIztxK6+PMPyuT4LqkBAnQFTbP6HPG5nbmByNsYuKuA+dlPzvrcZWZf8= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=VY+VWOl6JJODjHlb2KJahLFbzxc=; b=lw7hrDVU8oLY6C1lGla6 pRmvFSESMIRohA0gbPF/I7u8aisYvoiCxd64h1K/ThVq+3Jnek9tfX+pf/6Y4MIA rnoasxabCU9E01vtxEpj5oeHnoZyBBGuTj2C8MrgyUdqon9Od/B+Hir9M8oOk8Fj 49nyEfbsBvdfFR29GKp1nbI= Received: (qmail 106125 invoked by alias); 10 Nov 2016 20:43:26 -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 106099 invoked by uid 89); 10 Nov 2016 20:43:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, URIBL_RED autolearn=ham version=3.3.2 spammy=FALLTHRU, UD:tree-nested.c, tree-nested.c, sk:scan_sh 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; Thu, 10 Nov 2016 20:43:15 +0000 Received: from svr-orw-mbx-01.mgc.mentorg.com ([147.34.90.201]) by relay1.mentorg.com with esmtp id 1c4wBl-0000th-10 from Cesar_Philippidis@mentor.com for gcc-patches@gcc.gnu.org; Thu, 10 Nov 2016 12:43:13 -0800 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Thu, 10 Nov 2016 12:43:11 -0800 To: "gcc-patches@gcc.gnu.org" From: Cesar Philippidis Subject: [gomp4] remove OMP_CLAUSE_DEVICE_RESIDENT Message-ID: Date: Thu, 10 Nov 2016 12:43:09 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) I've committed this patch to gomp-4_0-branch which removes OMP_CLAUSE_DEVICE_RESIDENT. This standalone clause is no longer necessary, and hasn't been for a while, because device_resident is treated as a data mapping type for OMP_CLAUSE_MAP, and not a clause itself. Cesar 2016-11-10 Cesar Philippidis gcc/fortran/ * trans-openmp.c (gfc_trans_omp_clauses_1): Remove OMP_CLAUSE_DEVICE_RESIDENT. gcc/ * gimplify.c (gimplify_scan_omp_clauses): Remove OMP_CLAUSE_DEVICE_RESIDENT. (gimplify_adjust_omp_clauses): Likewise. * omp-low.c (scan_sharing_clauses): Likewise. * tree-core.h (enum omp_clause_code): Likewise. * tree-nested.c (convert_nonlocal_omp_clauses): (convert_local_omp_clauses): * tree-pretty-print.c (dump_omp_clause): Likewise. * tree.c (walk_tree_1): Likewise. diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index 9924872..3c53414 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -1781,9 +1781,6 @@ gfc_trans_omp_clauses_1 (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 a/gcc/gimplify.c b/gcc/gimplify.c index 36c128b..9649fae 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7594,10 +7594,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p, remove = true; break; - case OMP_CLAUSE_DEVICE_RESIDENT: - remove = true; - break; - case OMP_CLAUSE_NOWAIT: case OMP_CLAUSE_ORDERED: case OMP_CLAUSE_UNTIED: @@ -8445,7 +8441,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 a/gcc/omp-low.c b/gcc/omp-low.c index e7cb66c..142330c 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -2246,7 +2246,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx, break; case OMP_CLAUSE_BIND: - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_NOHOST: case OMP_CLAUSE__CACHE_: default: @@ -2414,7 +2413,6 @@ scan_sharing_clauses (tree clauses, omp_context *ctx, break; case OMP_CLAUSE_BIND: - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_NOHOST: case OMP_CLAUSE__CACHE_: default: diff --git a/gcc/tree-core.h b/gcc/tree-core.h index b07ff30..a3c4b18 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -313,9 +313,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 a/gcc/tree-nested.c b/gcc/tree-nested.c index ed77798..55f1f20 100644 --- a/gcc/tree-nested.c +++ b/gcc/tree-nested.c @@ -1215,7 +1215,6 @@ convert_nonlocal_omp_clauses (tree *pclauses, struct walk_stmt_info *wi) gcc_unreachable (); case OMP_CLAUSE_BIND: - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_NOHOST: default: gcc_unreachable (); @@ -1914,7 +1913,6 @@ convert_local_omp_clauses (tree *pclauses, struct walk_stmt_info *wi) gcc_unreachable (); case OMP_CLAUSE_BIND: - case OMP_CLAUSE_DEVICE_RESIDENT: case OMP_CLAUSE_NOHOST: default: gcc_unreachable (); diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index f5970e1..f1af737 100644 --- a/gcc/tree-pretty-print.c +++ b/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 a/gcc/tree.c b/gcc/tree.c index f26e282..7c87612 100644 --- a/gcc/tree.c +++ b/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 */ @@ -356,7 +355,6 @@ const char * const omp_clause_code_name[] = "use_device_ptr", "is_device_ptr", "_cache_", - "device_resident", "gang", "async", "wait", @@ -11651,7 +11649,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: