From patchwork Thu Jun 4 18:22:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1303684 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49dDdx4g0nz9sSc for ; Fri, 5 Jun 2020 04:22:29 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8B1E0388F043; Thu, 4 Jun 2020 18:22:25 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 04539385DC14 for ; Thu, 4 Jun 2020 18:22:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 04539385DC14 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Thomas_Schwinge@mentor.com IronPort-SDR: qUX23sCd5sEa7RzACJYhf+A7vrs235bt2jjHuMSIu91ZwlbYI+M0NlCe5LdNoOa4YkdFBH4uXm 4b/iqKGsUiCMMF6eEtPrZHQt3EYL59PotB5mPgQ//ZSRCY3AQ8Dvjm3Lo7TpC6tX2S1CzOcsCb tw0wyBDaB3qNXLCGncYOivEAKuOEWW8tNz7DNerFznVJIJL8JntqcHojDraJLJvKIosYYdQfbA /Y7YoBHIDDgLMUb1hAtEGi1qTt8SE+/mATQcSS5RauOKTLFj0brvX/9P4pZ2A2teTUpAbjE4GJ pJs= X-IronPort-AV: E=Sophos;i="5.73,472,1583222400"; d="scan'208,223";a="49517942" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 04 Jun 2020 10:22:20 -0800 IronPort-SDR: R6jwO5v5+LNYnjrRLS7aJKPOw7Wb9WvurSTRhqoxozA5T+AvOeCrbBVKe5zJSLunr+/QIYPPSa uaSUpYgJQCCNTQoAP97y9ofExaKimbN6+gnq4eQ0dvWnCsPxTmPWJceInjmmOezhgSXYDvYvtK EY4K3adI1sgNsL7o+5yDRcg0THv5ZlGGN0zBi6uEb92pqWjNtrv1jIBvueOjEMAB1Ha5iiXylj vVXtssL3w4SZfTzewuOP5AazUyUX7p9SlJJ3YSy5JeWv+nzvYDoXb7ECXwRsYoG/Z4FDapKKMW nvo= From: Thomas Schwinge To: Subject: [OpenACC] Remove 'tgt' reference counting from 'acc_unmap_data' [PR92854] References: <87lfrl3ee5.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Thu, 4 Jun 2020 20:22:11 +0200 Message-ID: <87h7vqsncc.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LOTSOFHASH, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi! Per the discussion/conclusion in PR92854, I've now pushed "[OpenACC] Remove 'tgt' reference counting from 'acc_unmap_data' [PR92854]" to master branch in commit 4662f7fe7863b19fcc20ba58c22880f8d6661f3a, and releases/gcc-10 branch in commit 0c59837c89bd62e2addf4b34704a1ebe7e3bffab, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter From 0c59837c89bd62e2addf4b34704a1ebe7e3bffab Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 29 May 2020 14:12:16 +0200 Subject: [PATCH] [OpenACC] Remove 'tgt' reference counting from 'acc_unmap_data' [PR92854] libgomp/ PR libgomp/92854 * oacc-mem.c (acc_unmap_data): Remove 'tgt' reference counting. (cherry picked from commit 4662f7fe7863b19fcc20ba58c22880f8d6661f3a) --- libgomp/oacc-mem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c index e2fb651a2334..6314f5d8b686 100644 --- a/libgomp/oacc-mem.c +++ b/libgomp/oacc-mem.c @@ -477,13 +477,13 @@ acc_unmap_data (void *h) gomp_mutex_unlock (&acc_dev->lock); gomp_fatal ("cannot unmap target block"); } - else if (tgt->refcount > 1) - tgt->refcount--; - else - { - free (tgt->array); - free (tgt); - } + + /* Above, we've verified that the mapping must have been set up by + 'acc_map_data'. */ + assert (tgt->refcount == 1); + + free (tgt->array); + free (tgt); gomp_mutex_unlock (&acc_dev->lock); -- 2.26.2