From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 2F27F38618E5; Fri, 15 Dec 2023 13:00:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2F27F38618E5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2F27F38618E5 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.129.153 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702645249; cv=none; b=DcV2OlO0u+nqsEPtajBH6iS6rCOoNy0qGGEcNgcENMbjLfr7BLLc/xT0G0nt84M8ooaLaXrBZKdOnJfCoeznNlMQtWycUhILyk/ohL5lQI256E7k1UhXIAoXHYU0yAu63lYAJSSmS58qeTNvmizDzywyr6IvH0ByGPdMbed1AjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702645249; c=relaxed/simple; bh=qzmZZYTS0kU1Qi8oHIWTB9rWSm/Yu/VPDGovz9ojgsI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=h960tyzyS3oCkL17bnR/l4zgy6+Ggf0DLCI5MCiz0Td7CFtctNQOUbHLi47AQiqG+/gBcsI0pjzTLW8ev4xrKNTKHrJ5b4Rq/sqI02mlfI3fsVllLT/y38A3S44XcNHutDI6eIak3R0ObIK4ffSkyw097IVI/w8GdpTWG8l5IOA= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: XL0wgKTzSa2Y5JmKhVZ57w== X-CSE-MsgGUID: BLpiM/q+RRePkzDFaBcaFg== X-IronPort-AV: E=Sophos;i="6.04,278,1695715200"; d="scan'208,223";a="28665600" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 15 Dec 2023 05:00:46 -0800 IronPort-SDR: OM/Uyg1zS6MS1pIMZnXuID6lD9tDlsXf2fg2n9VrdEdFhGHvKJ4tm8586eLhzQwTwFAQWifIiS KEMDc7qVjNteoBYIoyAJzgyIsMT0BBJbQTpx4EPKorVk+fA6VXCpbtvhjmmR/DJYz5VqR2H0ES AwbhKWItBC4oR5pKYoeBiM5ByCXDL8wNrbDyoAhtJHAqy+aqik7nZ7tZdS6MURAgl2niP+1G7M KHFZXwg7yw6DHOLyQ/C61nZQXM++d2LfUI0H3rFAK/Hvlt/d3ZusBE+tjjcjnOKgAi79PCIGhh 5/8= From: Thomas Schwinge To: Julian Brown , CC: Tobias Burnus , , Subject: Re: [PATCH v7 4/5] OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic In-Reply-To: References: <81839b2435cb8b4ae46c09f2ff240eb9f679d389.1692398074.git.julian@codesourcery.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Fri, 15 Dec 2023 14:00:41 +0100 Message-ID: <87o7ersjra.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2023-12-14T15:26:38+0100, Tobias Burnus wrote: > On 19.08.23 00:47, Julian Brown wrote: >> This patch adds support for non-constant component offsets in "map" >> clauses for OpenMP (and the equivalants for OpenACC) [...] Should eventually also add some OpenACC test cases? > LGTM with: > > - inclusion of your follow-up fix for shared-memory systems (see email > of August 21) This was applied here: >> --- /dev/null >> +++ b/libgomp/testsuite/libgomp.c-c++-common/map-arrayofstruct-2.c >> +/* { dg-output "(\n|\r|\r\n)" } */ >> +/* { dg-output "libgomp: Mapped array elements must be the same .*(\n|\= r|\r\n)+" } */ >> +/* { dg-shouldfail "" { offload_device_nonshared_as } } */ ..., and here: >> --- /dev/null >> +++ b/libgomp/testsuite/libgomp.c-c++-common/map-arrayofstruct-3.c >> +/* { dg-output "(\n|\r|\r\n)" } */ >> +/* { dg-output "libgomp: Mapped array elements must be the same .*(\n|\= r|\r\n)+" } */ >> +/* { dg-shouldfail "" { offload_device_nonshared_as } } */ ..., but not here: >> --- /dev/null >> +++ b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 >> +! { dg-output "(\n|\r|\r\n)" } >> +! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r= |\r\n)+" } >> +! { dg-shouldfail "" { offload_device_nonshared_as } } Pushed to master branch commit bc7546e32c5a942e240ef97776352d21105ef291 "In 'libgomp.fortran/map-subarray-5.f90', restrict 'dg-output's to 'target = offload_device_nonshared_as'", see attached. Gr=C3=BC=C3=9Fe Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-In-libgomp.fortran-map-subarray-5.f90-restrict-dg-ou.patch" >From bc7546e32c5a942e240ef97776352d21105ef291 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 15 Dec 2023 13:05:24 +0100 Subject: [PATCH] In 'libgomp.fortran/map-subarray-5.f90', restrict 'dg-output's to 'target offload_device_nonshared_as' ..., as in 'libgomp.c-c++-common/map-arrayofstruct-{2,3}.c'. Minor fix-up for commit f5745dc1426bdb1a53ebaf7af758b2250ccbff02 "OpenMP/OpenACC: Unordered/non-constant component offset runtime diagnostic". libgomp/ * testsuite/libgomp.fortran/map-subarray-5.f90: Restrict 'dg-output's to 'target offload_device_nonshared_as'. --- libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 index e7cdf11e610..59ad01ab76b 100644 --- a/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/map-subarray-5.f90 @@ -49,6 +49,6 @@ end do end -! { dg-output "(\n|\r|\r\n)" } -! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" } +! { dg-output "(\n|\r|\r\n)" { target offload_device_nonshared_as } } +! { dg-output "libgomp: Mapped array elements must be the same .*(\n|\r|\r\n)+" { target offload_device_nonshared_as } } ! { dg-shouldfail "" { offload_device_nonshared_as } } -- 2.34.1 --=-=-=--