From patchwork Sat Mar 12 10:11:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 51909 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 26345385DC3D for ; Sat, 12 Mar 2022 10:11:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 8848A3858C27 for ; Sat, 12 Mar 2022 10:11:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8848A3858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.90,175,1643702400"; d="scan'208,223";a="73081319" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 12 Mar 2022 02:11:13 -0800 IronPort-SDR: AuZ7KbiV1K+CuWCCRhW01ty0Ep7cuJdmYIvV4oyI78cIVYtzpKZe9gHycDKz58WgiQUxV86igN lH6rATzIH3QCDutXxwhGtmBzjtSJH/8oyDjhPSIZZMXkHIdB9bvfl4Bn7EQ0muzzEq7Jw1V2dg qqeePc9Xd12jgPVxqa10M0IERzVBRB2QfHBNrYoPDr3Qn289eogyRr1Nmg0J3V40J0AZzN7iWm 66Y8UlK5DlQZ7UtMSInCS2W7DGZlCWOQsmrRk5IqM9bMQvGWTAtY1QSRKX8HiUWqlv5TuzKFjD YkA= From: Thomas Schwinge To: Subject: Add 'gcc/tree.cc:user_omp_clause_code_name' [PR65095] In-Reply-To: <875ypdpt92.fsf@euler.schwinge.homeip.net> References: <20191006223237.81842-1-julian@codesourcery.com> <20191006223237.81842-2-julian@codesourcery.com> <878spiw84d.fsf@euler.schwinge.homeip.net> <875ypdpt92.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/27.1 (x86_64-pc-linux-gnu) Date: Sat, 12 Mar 2022 11:11:04 +0100 Message-ID: <874k43mqfb.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jakub Jelinek , Julian Brown Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi! On 2022-02-17T13:33:45+0100, I wrote: > On 2019-10-18T14:28:18+0200, I wrote: >> On 2019-10-06T15:32:34-0700, Julian Brown wrote: >>> This patch adds a function to pretty-print OpenACC clause names from >>> OMP_CLAUSE_MAP_KINDs, for error output. >> >> Indeed talking about (OpenMP) 'map' clauses in an OpenACC context is not >> quite ideal -- that's what PR65095 is about > >>> Previously approved as part of: >>> >>> https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01292.html > > >> A few more comments, for later: >> >>> gcc/c-family/c-common.h | 1 + >>> gcc/c-family/c-omp.c | 33 +++++++++++++++++++++++++++++++++ >> >> As I'd mentioned before: 'Eventually (that is, later), this should move >> into generic code, next to the other "clause printing". > > As part of an ICE bug fix that I'm working on, I now need to use > this in GCC middle end code. Pushed to master branch commit 828335beb77676acffb5911e575672cb55beb2e9 "Add 'gcc/tree.cc:user_omp_clause_code_name' [PR65095]", see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 828335beb77676acffb5911e575672cb55beb2e9 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 17 Feb 2022 12:46:57 +0100 Subject: [PATCH] Add 'gcc/tree.cc:user_omp_clause_code_name' [PR65095] Re PR65095 "Adapt OpenMP diagnostic messages for OpenACC", move C/C++ front end 'gcc/c-family/c-omp.cc:c_omp_map_clause_name' to generic 'gcc/tree.cc:user_omp_clause_code_name' . No functional change. PR other/65095 gcc/ * tree-core.h (user_omp_claus_code_name): Declare function. * tree.cc (user_omp_clause_code_name): New function. gcc/c/ * c-typeck.cc (handle_omp_array_sections_1) (c_oacc_check_attachments): Call 'user_omp_clause_code_name' instead of 'c_omp_map_clause_name'. gcc/cp/ * semantics.cc (handle_omp_array_sections_1) (cp_oacc_check_attachments): Call 'user_omp_clause_code_name' instead of 'c_omp_map_clause_name'. gcc/c-family/ * c-common.h (c_omp_map_clause_name): Remove. * c-omp.cc (c_omp_map_clause_name): Remove. --- gcc/c-family/c-common.h | 1 - gcc/c-family/c-omp.cc | 33 --------------------------------- gcc/c/c-typeck.cc | 4 ++-- gcc/cp/semantics.cc | 4 ++-- gcc/tree-core.h | 1 + gcc/tree.cc | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h index a8d6f82bb2c..5f0b5d99d07 100644 --- a/gcc/c-family/c-common.h +++ b/gcc/c-family/c-common.h @@ -1250,7 +1250,6 @@ extern enum omp_clause_default_kind c_omp_predetermined_sharing (tree); extern enum omp_clause_defaultmap_kind c_omp_predetermined_mapping (tree); extern tree c_omp_check_context_selector (location_t, tree); extern void c_omp_mark_declare_variant (location_t, tree, tree); -extern const char *c_omp_map_clause_name (tree, bool); extern void c_omp_adjust_map_clauses (tree, bool); enum c_omp_directive_kind { diff --git a/gcc/c-family/c-omp.cc b/gcc/c-family/c-omp.cc index cd9d86641e1..777cdc65572 100644 --- a/gcc/c-family/c-omp.cc +++ b/gcc/c-family/c-omp.cc @@ -2996,39 +2996,6 @@ c_omp_predetermined_mapping (tree decl) } -/* For OpenACC, the OMP_CLAUSE_MAP_KIND of an OMP_CLAUSE_MAP is used internally - to distinguish clauses as seen by the user. Return the "friendly" clause - name for error messages etc., where possible. See also - c/c-parser.cc:c_parser_oacc_data_clause and - cp/parser.cc:cp_parser_oacc_data_clause. */ - -const char * -c_omp_map_clause_name (tree clause, bool oacc) -{ - if (oacc && OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_MAP) - switch (OMP_CLAUSE_MAP_KIND (clause)) - { - case GOMP_MAP_FORCE_ALLOC: - case GOMP_MAP_ALLOC: return "create"; - case GOMP_MAP_FORCE_TO: - case GOMP_MAP_TO: return "copyin"; - case GOMP_MAP_FORCE_FROM: - case GOMP_MAP_FROM: return "copyout"; - case GOMP_MAP_FORCE_TOFROM: - case GOMP_MAP_TOFROM: return "copy"; - case GOMP_MAP_RELEASE: return "delete"; - case GOMP_MAP_FORCE_PRESENT: return "present"; - case GOMP_MAP_ATTACH: return "attach"; - case GOMP_MAP_FORCE_DETACH: - case GOMP_MAP_DETACH: return "detach"; - case GOMP_MAP_DEVICE_RESIDENT: return "device_resident"; - case GOMP_MAP_LINK: return "link"; - case GOMP_MAP_FORCE_DEVICEPTR: return "deviceptr"; - default: break; - } - return omp_clause_code_name[OMP_CLAUSE_CODE (clause)]; -} - /* Used to merge map clause information in c_omp_adjust_map_clauses. */ struct map_clause { diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index 54b0b0d369b..c0812de84b4 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -13373,7 +13373,7 @@ handle_omp_array_sections_1 (tree c, tree t, vec &types, { error_at (OMP_CLAUSE_LOCATION (c), "expected single pointer in %qs clause", - c_omp_map_clause_name (c, ort == C_ORT_ACC)); + user_omp_clause_code_name (c, ort == C_ORT_ACC)); return error_mark_node; } } @@ -14096,7 +14096,7 @@ c_oacc_check_attachments (tree c) if (TREE_CODE (TREE_TYPE (t)) != POINTER_TYPE) { error_at (OMP_CLAUSE_LOCATION (c), "expected pointer in %qs clause", - c_omp_map_clause_name (c, true)); + user_omp_clause_code_name (c, true)); return true; } } diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 21740064d3d..da270e8f05c 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -5195,7 +5195,7 @@ handle_omp_array_sections_1 (tree c, tree t, vec &types, { error_at (OMP_CLAUSE_LOCATION (c), "expected single pointer in %qs clause", - c_omp_map_clause_name (c, ort == C_ORT_ACC)); + user_omp_clause_code_name (c, ort == C_ORT_ACC)); return error_mark_node; } } @@ -6653,7 +6653,7 @@ cp_oacc_check_attachments (tree c) if (TREE_CODE (type) != POINTER_TYPE) { error_at (OMP_CLAUSE_LOCATION (c), "expected pointer in %qs clause", - c_omp_map_clause_name (c, true)); + user_omp_clause_code_name (c, true)); return true; } } diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 4530bd8c2c7..f1c2b6413a3 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -2283,6 +2283,7 @@ extern const char * built_in_names[(int) END_BUILTINS]; /* Number of operands and names for each OMP_CLAUSE node. */ extern unsigned const char omp_clause_num_ops[]; extern const char * const omp_clause_code_name[]; +extern const char *user_omp_clause_code_name (tree, bool); /* A vector of all translation-units. */ extern GTY (()) vec *all_translation_units; diff --git a/gcc/tree.cc b/gcc/tree.cc index d6f900c53b4..b8017af6cfc 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -69,6 +69,7 @@ along with GCC; see the file COPYING3. If not see #include "gimple-fold.h" #include "escaped_string.h" #include "gimple-range.h" +#include "gomp-constants.h" /* Tree code classes. */ @@ -439,6 +440,41 @@ const char * const omp_clause_code_name[] = "nohost", }; +/* Unless specific to OpenACC, we tend to internally maintain OpenMP-centric + clause names, but for use in diagnostics etc. would like to use the "user" + clause names. */ + +const char * +user_omp_clause_code_name (tree clause, bool oacc) +{ + /* For OpenACC, the 'OMP_CLAUSE_MAP_KIND' of an 'OMP_CLAUSE_MAP' is used to + distinguish clauses as seen by the user. See also where front ends do + 'build_omp_clause' with 'OMP_CLAUSE_MAP'. */ + if (oacc && OMP_CLAUSE_CODE (clause) == OMP_CLAUSE_MAP) + switch (OMP_CLAUSE_MAP_KIND (clause)) + { + case GOMP_MAP_FORCE_ALLOC: + case GOMP_MAP_ALLOC: return "create"; + case GOMP_MAP_FORCE_TO: + case GOMP_MAP_TO: return "copyin"; + case GOMP_MAP_FORCE_FROM: + case GOMP_MAP_FROM: return "copyout"; + case GOMP_MAP_FORCE_TOFROM: + case GOMP_MAP_TOFROM: return "copy"; + case GOMP_MAP_RELEASE: return "delete"; + case GOMP_MAP_FORCE_PRESENT: return "present"; + case GOMP_MAP_ATTACH: return "attach"; + case GOMP_MAP_FORCE_DETACH: + case GOMP_MAP_DETACH: return "detach"; + case GOMP_MAP_DEVICE_RESIDENT: return "device_resident"; + case GOMP_MAP_LINK: return "link"; + case GOMP_MAP_FORCE_DEVICEPTR: return "deviceptr"; + default: break; + } + + return omp_clause_code_name[OMP_CLAUSE_CODE (clause)]; +} + /* Return the tree node structure used by tree code CODE. */ -- 2.34.1