From patchwork Mon Dec 9 11:44:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1206143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515501-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="wuDicPOT"; 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 47WhDq1JX7z9sP6 for ; Mon, 9 Dec 2019 22:44:25 +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=YRVhx8O3h5nNpDXh ZJoJheYbLq+NhM0f9vVXR9hm7P+YreWJV4uS4zebKP69Hx2KPUs06RqDb77bSv8A lFUw4QDs5Ribyophn5z6FEOkxVZBCgEI9cXzYsZ8AytQwkyDYf20dH4uy4jRyG63 QsH+N/aY07i7MtGmOD/LMLXytVA= 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=tLceM12ieOJzxjhiiJuABB 7LUAg=; b=wuDicPOTreeT451KYafkOJHOvOwlTaxjzaqlw2+NCmD7oqp7NKeT7L JlKn7lcnScjGTJ6kUuwg/Oeevph8DrevnwDrkluq3Jz+L5M8e8OCLBzro4fK3ria t5U6xpT2rpZ1gmT62TXJUHKeFxYL6jXrIUJ0JCjmyI+0PdOO7fOuA= Received: (qmail 45012 invoked by alias); 9 Dec 2019 11:44:18 -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 44999 invoked by uid 89); 9 Dec 2019 11:44:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: =?iso-8859-1?q?No=2C_score=3D-18=2E4_required=3D5=2E?= =?iso-8859-1?q?0_tests=3DAWL=2CBAYES_00=2CGIT_PATCH_0=2CGIT_PATCH_?= =?iso-8859-1?q?1=2CGIT_PATCH_2=2CGIT_PATCH_3=2CSPF_PASS_autolearn?= =?iso-8859-1?q?=3Dham_version=3D3=2E3=2E1_spammy=3Dgr=2C_gr=C3=BC?= =?iso-8859-1?q?=C3=2C_H*UA=3Ahttps=2C_Cesar?= X-HELO: esa2.mentor.iphmx.com Received: from esa2.mentor.iphmx.com (HELO esa2.mentor.iphmx.com) (68.232.141.98) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Dec 2019 11:44:16 +0000 IronPort-SDR: 1H33UTGd28BTT0QowalSUW6b3A6SMzh+5K+h2wtAWW+sRTuRmze/9JFJcCWNmEIpqqtkTXt6hE 0T1iU+cuv3+6fmkqG4EDk+84AgOQzqN2MitJ9hmE2sLhlnTEpGYgf5gVJhFPH+W3hHZYdDewj2 cJohbDRUDAUQi9lPdLwTXbWHkK0UO4v+Da7YWD2GIqAU39lNOSqXbdV5tkDn6gcUuEAFMcAuPA hhMKGCJLBR5kbsfeZYpLD7hvwsgAYKQfpZhPRntHEWWErK2BFk5dAzWPQfhaGJSHn02hMEZoom iog= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 09 Dec 2019 03:44:14 -0800 IronPort-SDR: FCxFTGsUKfkD3HXmx0UKhAW3WyWTJxEgrXBmOGg6U0jnEnAzhpkIrny5AuFsLtyth17b7h62BZ jsG2ithSSXTKe3Dk2I3zeTQST9ZgGVemeM7FhL52v1SnP8C6xDHf1q8C+Ls3HT5YiB3GBacmzo 50oBg05NCYjsJvJ2dm+Wn+itXkGFfebnnsJF8wXhUU399fGPeAb/pTpS/kJvBiKpixBbCoLCjr cyBy0MZ9AeyUqXSyLEWJBQfoDK1iZbJ4p8N0SFh/sMtAz2nQJA0OSUMSSWxJY1CzeLia9Z5+J9 04g= From: Thomas Schwinge To: , Jakub Jelinek CC: Julian Brown Subject: In 'libgomp/target.c:gomp_exit_data', remove open-coded 'gomp_remove_var' (was: [OpenACC] Update OpenACC data clause semantics to the 2.5 behavior - runtime) In-Reply-To: References: <7fa7637f-e7f5-d43d-13f1-706c77e8e957@codesourcery.com> <836f376f-513d-dd29-9133-6526bfb59866@codesourcery.com> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Mon, 9 Dec 2019 12:44:00 +0100 Message-ID: <87tv693erj.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On 2018-06-19T10:01:20-0700, Cesar Philippidis wrote: > --- a/libgomp/target.c > +++ b/libgomp/target.c > +attribute_hidden bool > +gomp_remove_var (struct gomp_device_descr *devicep, splay_tree_key k) > +{ > + bool is_tgt_unmapped = false; > + splay_tree_remove (&devicep->mem_map, k); > + if (k->link_key) > + splay_tree_insert (&devicep->mem_map, (splay_tree_node) k->link_key); > + if (k->tgt->refcount > 1) > + k->tgt->refcount--; > + else > + { > + is_tgt_unmapped = true; > + gomp_unmap_tgt (k->tgt); > + } > + return is_tgt_unmapped; This new function, can, like done here: > @@ -1059,16 +1077,7 @@ gomp_unmap_vars (struct target_mem_desc *tgt, bool do_copyfrom) > + tgt->list[i].offset), > tgt->list[i].length); > if (do_unmap) > - { > - splay_tree_remove (&devicep->mem_map, k); > - if (k->link_key) > - splay_tree_insert (&devicep->mem_map, > - (splay_tree_node) k->link_key); > - if (k->tgt->refcount > 1) > - k->tgt->refcount--; > - else > - gomp_unmap_tgt (k->tgt); > - } > + gomp_remove_var (devicep, k); > } ..., and here: > @@ -1298,17 +1307,7 @@ gomp_unload_image_from_device (struct gomp_device_descr *devicep, > else > { > splay_tree_key n = splay_tree_lookup (&devicep->mem_map, &k); > - splay_tree_remove (&devicep->mem_map, n); > - if (n->link_key) > - { > - if (n->tgt->refcount > 1) > - n->tgt->refcount--; > - else > - { > - is_tgt_unmapped = true; > - gomp_unmap_tgt (n->tgt); > - } > - } > + is_tgt_unmapped = gomp_remove_var (devicep, n); > } ..., also be used in 'gomp_exit_data', see attached "In 'libgomp/target.c:gomp_exit_data', remove open-coded 'gomp_remove_var'", committed to trunk in r279118. Grüße Thomas From bbfdb255a0b5cb6e183e11026c2a482d4eeba981 Mon Sep 17 00:00:00 2001 From: tschwinge Date: Mon, 9 Dec 2019 11:39:57 +0000 Subject: [PATCH] In 'libgomp/target.c:gomp_exit_data', remove open-coded 'gomp_remove_var' libgomp/ * target.c (gomp_exit_data): Use 'gomp_remove_var'. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@279118 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 4 ++++ libgomp/target.c | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a0bd25177d1..c5541bcec81 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,7 @@ +2019-12-09 Thomas Schwinge + + * target.c (gomp_exit_data): Use 'gomp_remove_var'. + 2019-12-09 Tobias Burnus * testsuite/libgomp.fortran/use_device_addr-3.f90: Make 'stop' codes diff --git a/libgomp/target.c b/libgomp/target.c index 84d6daa76ca..13f7921651f 100644 --- a/libgomp/target.c +++ b/libgomp/target.c @@ -2095,16 +2095,7 @@ gomp_exit_data (struct gomp_device_descr *devicep, size_t mapnum, - k->host_start), cur_node.host_end - cur_node.host_start); if (k->refcount == 0) - { - splay_tree_remove (&devicep->mem_map, k); - if (k->link_key) - splay_tree_insert (&devicep->mem_map, - (splay_tree_node) k->link_key); - if (k->tgt->refcount > 1) - k->tgt->refcount--; - else - gomp_unmap_tgt (k->tgt); - } + gomp_remove_var (devicep, k); break; default: -- 2.17.1