From patchwork Fri Dec 21 10:41:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1017467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-492974-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="o1yADfiZ"; dkim-atps=neutral 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 43LlYG2wnhz9sML for ; Fri, 21 Dec 2018 21:41:37 +1100 (AEDT) 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=QJnNgVEWGFQXCoRJ cIrnPJ+SYXgUqqG2+rkvOlhqAkHEES2ZJZmh+Fqbaiyxsj2nY/zV+8wG+XP60OvQ /cgYCYb6FX1eCWrXTzBwfz70PfSdqfEQDizOgwvxVKsltudxBpFdOazcEYjR1E7J vwMMSoakK7bMoIKcIhrbRypHd1w= 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=gk/aC+syWkPKEIC0bQBOtn nFs4o=; b=o1yADfiZlbt0cGYF9wQEgdtyCuWG+NELntdC6/vSbqht0V3+6jVrhc gaSnmnMHPcIIrZCiyXB42EjCNN7s/KbvlNUzhvdBc27qOVnxmo6jCyJO1hCh52F9 Z59tO11mSG5WibfUXmHPFpilVKmCnx1BvlImWQzkYlvz8Z5BP/5zI= Received: (qmail 24426 invoked by alias); 21 Dec 2018 10:41:29 -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 24407 invoked by uid 89); 21 Dec 2018 10:41:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Brown, brown, recorded, Reviewedby 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; Fri, 21 Dec 2018 10:41:23 +0000 Received: from svr-orw-mbx-03.mgc.mentorg.com ([147.34.90.203]) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1gaIF4-00037u-My from Thomas_Schwinge@mentor.com ; Fri, 21 Dec 2018 02:41:18 -0800 Received: from svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) by svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Fri, 21 Dec 2018 02:41:16 -0800 Received: from tftp-cs (147.34.91.1) by svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) with Microsoft SMTP Server id 15.0.1320.4 via Frontend Transport; Fri, 21 Dec 2018 02:41:16 -0800 Received: by tftp-cs (Postfix, from userid 49978) id A6F11C220A; Fri, 21 Dec 2018 02:41:15 -0800 (PST) From: Thomas Schwinge To: Julian Brown , , CC: Subject: libgomp/target.c magic constants self-documentation In-Reply-To: <8340b3d7685106871b060c54f894105f20cdc052.1541863637.git.julian@codesourcery.com> References: <8340b3d7685106871b060c54f894105f20cdc052.1541863637.git.julian@codesourcery.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/25.2.2 (x86_64-pc-linux-gnu) Date: Fri, 21 Dec 2018 11:41:07 +0100 Message-ID: <871s6bqi0s.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Sat, 10 Nov 2018 09:11:18 -0800, Julian Brown wrote: > This patch (by Cesar, with some minor additional changes) Cesar's changes we're handling separately (already approved; will commit soon), so it remains here: > replaces usage > of several magic constants in target.c with named macros > --- a/libgomp/libgomp.h > +++ b/libgomp/libgomp.h > @@ -902,6 +902,11 @@ struct target_mem_desc { > artificial pointer to "omp declare target link" object. */ > #define REFCOUNT_LINK (~(uintptr_t) 1) > > +/* Special offset values. */ > +#define OFFSET_INLINED (~(uintptr_t) 0) > +#define OFFSET_POINTER (~(uintptr_t) 1) > +#define OFFSET_STRUCT (~(uintptr_t) 2) > + > struct splay_tree_key_s { > /* Address of the host object. */ > uintptr_t host_start; I'd move these close to the struct they apply to. > --- a/libgomp/target.c > +++ b/libgomp/target.c > @@ -45,6 +45,8 @@ > #include "plugin-suffix.h" > #endif > > +#define FIELD_TGT_EMPTY (~(size_t) 0) > + > static void gomp_target_init (void); > > /* The whole initialization code for offloading plugins is only run one. */ As it's only used there, I'd actually move that one into "gomp_map_vars", as a "const size_t field_tgt_empty". And, you'd missed to use it in the initialization of "field_tgt_clear". ;-) > --- a/libgomp/target.c > +++ b/libgomp/target.c > @@ -876,6 +892,8 @@ gomp_map_vars_async (struct gomp_device_descr *devicep, > else > k->host_end = k->host_start + sizeof (void *); > splay_tree_key n = splay_tree_lookup (mem_map, k); > + /* Need to account for the case where a struct field hasn't been > + mapped onto the accelerator yet. */ > if (n && n->refcount != REFCOUNT_LINK) > gomp_map_vars_existing (devicep, aq, n, k, &tgt->list[i], > kind & typemask, cbufp); We usually talk about "device", not "accelerator". All that I'm changing with the incremental patch attached. I'm also again attaching the complete patch that we'd like to commit to trunk; Jakub, OK? If approving this patch, please respond with "Reviewed-by: NAME " so that your effort will be recorded in the commit log, see . Grüße Thomas From 3bc6c5ad05479678367400431847bf139f661375 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 21 Dec 2018 11:32:24 +0100 Subject: [PATCH] libgomp/target.c magic constants self-documentation libgomp/ * libgomp.h (OFFSET_INLINED, OFFSET_POINTER, OFFSET_STRUCT): Define. * target.c (gomp_map_val): Use OFFSET_* macros instead of magic constants. Write as switch instead of list of ifs. (gomp_map_vars_async): Use OFFSET_* macros. Clarify field_tgt_clear magic constant. --- libgomp/libgomp.h | 5 +++++ libgomp/target.c | 49 +++++++++++++++++++++++++++++------------------ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h index 8105e640e32d..eef380d7b0fc 100644 --- a/libgomp/libgomp.h +++ b/libgomp/libgomp.h @@ -873,6 +873,11 @@ struct target_var_desc { uintptr_t length; }; +/* Special values for struct target_var_desc's offset. */ +#define OFFSET_INLINED (~(uintptr_t) 0) +#define OFFSET_POINTER (~(uintptr_t) 1) +#define OFFSET_STRUCT (~(uintptr_t) 2) + struct target_mem_desc { /* Reference count. */ uintptr_t refcount; diff --git a/libgomp/target.c b/libgomp/target.c index 0b4e0107f75d..201da567d73a 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -470,17 +470,25 @@ gomp_map_val (struct target_mem_desc *tgt, void **hostaddrs, size_t i) return tgt->list[i].key->tgt->tgt_start + tgt->list[i].key->tgt_offset + tgt->list[i].offset; - if (tgt->list[i].offset == ~(uintptr_t) 0) - return (uintptr_t) hostaddrs[i]; - if (tgt->list[i].offset == ~(uintptr_t) 1) - return 0; - if (tgt->list[i].offset == ~(uintptr_t) 2) - return tgt->list[i + 1].key->tgt->tgt_start - + tgt->list[i + 1].key->tgt_offset - + tgt->list[i + 1].offset - + (uintptr_t) hostaddrs[i] - - (uintptr_t) hostaddrs[i + 1]; - return tgt->tgt_start + tgt->list[i].offset; + + switch (tgt->list[i].offset) + { + case OFFSET_INLINED: + return (uintptr_t) hostaddrs[i]; + + case OFFSET_POINTER: + return 0; + + case OFFSET_STRUCT: + return tgt->list[i + 1].key->tgt->tgt_start + + tgt->list[i + 1].key->tgt_offset + + tgt->list[i + 1].offset + + (uintptr_t) hostaddrs[i] + - (uintptr_t) hostaddrs[i + 1]; + + default: + return tgt->tgt_start + tgt->list[i].offset; + } } attribute_hidden struct target_mem_desc * @@ -546,7 +554,7 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, || (kind & typemask) == GOMP_MAP_FIRSTPRIVATE_INT) { tgt->list[i].key = NULL; - tgt->list[i].offset = ~(uintptr_t) 0; + tgt->list[i].offset = OFFSET_INLINED; continue; } else if ((kind & typemask) == GOMP_MAP_USE_DEVICE_PTR) @@ -564,7 +572,7 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, = (void *) (n->tgt->tgt_start + n->tgt_offset + cur_node.host_start); tgt->list[i].key = NULL; - tgt->list[i].offset = ~(uintptr_t) 0; + tgt->list[i].offset = OFFSET_INLINED; continue; } else if ((kind & typemask) == GOMP_MAP_STRUCT) @@ -575,7 +583,7 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, cur_node.host_end = (uintptr_t) hostaddrs[last] + sizes[last]; tgt->list[i].key = NULL; - tgt->list[i].offset = ~(uintptr_t) 2; + tgt->list[i].offset = OFFSET_STRUCT; splay_tree_key n = splay_tree_lookup (mem_map, &cur_node); if (n == NULL) { @@ -608,7 +616,7 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, else if ((kind & typemask) == GOMP_MAP_ALWAYS_POINTER) { tgt->list[i].key = NULL; - tgt->list[i].offset = ~(uintptr_t) 1; + tgt->list[i].offset = OFFSET_POINTER; has_firstprivate = true; continue; } @@ -638,7 +646,7 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, if (!n) { tgt->list[i].key = NULL; - tgt->list[i].offset = ~(uintptr_t) 1; + tgt->list[i].offset = OFFSET_POINTER; continue; } } @@ -738,7 +746,8 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, if (not_found_cnt) tgt->array = gomp_malloc (not_found_cnt * sizeof (*tgt->array)); splay_tree_node array = tgt->array; - size_t j, field_tgt_offset = 0, field_tgt_clear = ~(size_t) 0; + const size_t field_tgt_empty = ~(size_t) 0; + size_t j, field_tgt_offset = 0, field_tgt_clear = field_tgt_empty; uintptr_t field_tgt_base = 0; for (i = 0; i < mapnum; i++) @@ -830,6 +839,8 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, else k->host_end = k->host_start + sizeof (void *); splay_tree_key n = splay_tree_lookup (mem_map, k); + /* Need to account for the case where a struct field hasn't been + mapped onto the device yet. */ if (n && n->refcount != REFCOUNT_LINK) gomp_map_vars_existing (devicep, n, k, &tgt->list[i], kind & typemask, cbufp); @@ -846,12 +857,12 @@ gomp_map_vars (struct gomp_device_descr *devicep, size_t mapnum, size_t align = (size_t) 1 << (kind >> rshift); tgt->list[i].key = k; k->tgt = tgt; - if (field_tgt_clear != ~(size_t) 0) + if (field_tgt_clear != field_tgt_empty) { k->tgt_offset = k->host_start - field_tgt_base + field_tgt_offset; if (i == field_tgt_clear) - field_tgt_clear = ~(size_t) 0; + field_tgt_clear = field_tgt_empty; } else { -- 2.17.1