From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9B5AE3858C60 for ; Wed, 15 Feb 2023 10:17:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B5AE3858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676456251; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=CxWFJVnC3TgFvQEL7IraV20zX7wSNXGFQex+F1UZusI=; b=KNjWHTcjhsoTOkuzho0fMLDpFFvIkUDgCMcnAL+hgIkkrZYbWxebVT8vOnH2XEx2olR61q HkPtE9zST29sotgd6bwT57qxitlIdJdjL/XiVfWTmaRY8oBJUWRpDc1infioL8leEsLTUS Dwjj3UxSbERvgv07O5rDYUrWxkK7mbo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-1e7AjFW_PSqtn1743ORs6Q-1; Wed, 15 Feb 2023 05:17:28 -0500 X-MC-Unique: 1e7AjFW_PSqtn1743ORs6Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 48C351C06EDC; Wed, 15 Feb 2023 10:17:28 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.193.203]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A0B51121314; Wed, 15 Feb 2023 10:17:27 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 31FAHPvm755822 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 15 Feb 2023 11:17:25 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 31FAHOro755821; Wed, 15 Feb 2023 11:17:24 +0100 Date: Wed, 15 Feb 2023 11:17:24 +0100 From: Jakub Jelinek To: Tobias Burnus Cc: Thomas Schwinge , gcc-patches@gcc.gnu.org Subject: Re: [Patch] libgomp: Fix reverse-offload for GOMP_MAP_TO_PSET Message-ID: Reply-To: Jakub Jelinek References: <85ecf108-8249-21a3-b9ee-23b89b6816bd@codesourcery.com> <87357hum1g.fsf@euler.schwinge.homeip.net> <12372b6c-1f8d-19aa-87be-99505f4712d4@codesourcery.com> MIME-Version: 1.0 In-Reply-To: <12372b6c-1f8d-19aa-87be-99505f4712d4@codesourcery.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Feb 09, 2023 at 10:23:53AM +0100, Tobias Burnus wrote: > libgomp: Fix reverse-offload for GOMP_MAP_TO_PSET > > libgomp/ > * target.c (gomp_target_rev): Dereference ptr > to get device address. > * libgomp.fortran/reverse-offload-5.f90: Add test > for unallocated allocatable. > > --- a/libgomp/target.c > +++ b/libgomp/target.c > @@ -3579,8 +3579,14 @@ gomp_target_rev (uint64_t fn_ptr, uint64_t mapnum, uint64_t devaddrs_ptr, > } > int k; > n2 = NULL; > - cdata[i].present = true; > + /* Dereference devaddrs[j] to get the device addr. */ > + assert (devaddrs[j]-sizes[j] == cdata[i].devaddr); Formatting, there should be spaces around - on both sides. > + devaddrs[j] = *(uint64_t *) (uintptr_t) (devaddrs[i] > + + sizes[j]); > + cdata[j].present = true; > cdata[j].devaddr = devaddrs[j]; > + if (devaddrs[j] == 0) > + continue; > k = gomp_map_cdata_lookup (cdata, devaddrs, kinds, sizes, j, > devaddrs[j], > devaddrs[j] + sizeof (void*), Otherwise LGTM. Jakub