Hi! On 2023-12-14T15:26:38+0100, Tobias Burnus <tob...@codesourcery.com> 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üße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
>From bc7546e32c5a942e240ef97776352d21105ef291 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> 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