From patchwork Fri Nov 17 08:45:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 838899 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-467089-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="n0j6iTc0"; 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 3ydWsk0VBsz9s4s for ; Fri, 17 Nov 2017 19:45:45 +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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=qWyLXbMRI50uoQ43xtlzszUG/JGfOUduOfStjnYl8bXNs+Wr5u q42Mtz3Xl5Va6iwik3LDaHgYNBfXPJ3HrFCOMMiwqtO0rLhnIkbk+J2NIGg8zm4D 0K0o4u4NCKlFpFaTx77Num6t29KZOOwqhIALR2qL0eueN3WuS4tmrKxNE= 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:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=ksXI0BeRJqBKQfmZ3bEPdz8FFRI=; b=n0j6iTc0NUeFbUTZuXqb t0RFiLzYqgStH2/pA3DWNLH7taebrbVa9cJPBQva0UEr+HdYbub7XvCbQ9w2VdfQ F8/z7qsaZp61uYRkCYtwamo+TrTnohuqEh135x1BVMRwlfJ1KZSJWNaQ55gEiruL Tnk0cU6srcwh+15cy3MmAW8= Received: (qmail 111700 invoked by alias); 17 Nov 2017 08:45:33 -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 111672 invoked by uid 89); 17 Nov 2017 08:45:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= 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, 17 Nov 2017 08:45:28 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1eFcH7-0006A9-9K from Tom_deVries@mentor.com ; Fri, 17 Nov 2017 00:45:25 -0800 Received: from [172.30.72.60] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Fri, 17 Nov 2017 08:45:21 +0000 To: Jakub Jelinek , Thomas Schwinge CC: GCC Patches From: Tom de Vries Subject: [PATCH, libgomp, openacc] Use GOMP_ASYNC_SYNC in GOACC_declare Message-ID: <286d95c2-dbf3-c4d8-3a79-f1dbb7e650b2@mentor.com> Date: Fri, 17 Nov 2017 09:45:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) Hi, GOACC_enter_exit_data has this prototype: ... void GOACC_enter_exit_data (int device, size_t mapnum, void **hostaddrs, size_t *sizes, unsigned short *kinds, int async, int num_waits, ...) ... And GOACC_declare calls GOACC_enter_exit_data with async arg zero: ... case GOMP_MAP_DELETE: GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i], &kinds[i], 0, 0); ... Async arg zero means some async queue (see openacc 2.0a, 2.14.1 "async clause" for more details). The declare directive has no async clause, so the arg should be GOMP_ASYNC_SYNC. Tested libgomp testsuite on x86_64 with nvptx accelerator. OK for trunk? Thanks, - Tom Use GOMP_ASYNC_SYNC in GOACC_declare Fix for PR82901 - "GOACC_declare calls GOACC_enter_exit_data with async arg 0" --- libgomp/oacc-parallel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c index a8cff9e..d82d500 100644 --- a/libgomp/oacc-parallel.c +++ b/libgomp/oacc-parallel.c @@ -524,7 +524,7 @@ GOACC_declare (int device, size_t mapnum, case GOMP_MAP_POINTER: case GOMP_MAP_DELETE: GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i], - &kinds[i], 0, 0); + &kinds[i], GOMP_ASYNC_SYNC, 0); break; case GOMP_MAP_FORCE_DEVICEPTR: @@ -533,19 +533,19 @@ GOACC_declare (int device, size_t mapnum, case GOMP_MAP_ALLOC: if (!acc_is_present (hostaddrs[i], sizes[i])) GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i], - &kinds[i], 0, 0); + &kinds[i], GOMP_ASYNC_SYNC, 0); break; case GOMP_MAP_TO: GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i], - &kinds[i], 0, 0); + &kinds[i], GOMP_ASYNC_SYNC, 0); break; case GOMP_MAP_FROM: kinds[i] = GOMP_MAP_FORCE_FROM; GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i], - &kinds[i], 0, 0); + &kinds[i], GOMP_ASYNC_SYNC, 0); break; case GOMP_MAP_FORCE_PRESENT: