From 270bfaf9addc79163a7f170e8da01c2579bc5a5f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 10 May 2022 14:43:56 +0200 Subject: [PATCH] Fix up 'libgomp.fortran/use_device_addr-5.f90' multi-device testing Fix-up for recent commit r13-116-g3f8c389fe90bf565a6221a46bb7fb745dd4c1510 "OpenMP: Fix use_device_{addr,ptr} with in-data-sharing arg", where we currently get: libgomp: use_device_ptr pointer wasn't mapped FAIL: libgomp.fortran/use_device_addr-5.f90 -O execution test libgomp/ * testsuite/libgomp.fortran/use_device_addr-5.f90: Fix up multi-device testing. (cherry picked from commit 798152475559a6be8049692932cc747c6499e7f5) --- libgomp/ChangeLog.omp | 8 ++++++++ libgomp/testsuite/libgomp.fortran/use_device_addr-5.f90 | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index d8a7ac2c8ef8..b5557c5e9519 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-05-10 Thomas Schwinge + + Backport from mainline: + 2022-05-10 Thomas Schwinge + + * testsuite/libgomp.fortran/use_device_addr-5.f90: Fix up + multi-device testing. + 2022-05-06 Marcel Vollweiler Backport from mainline: diff --git a/libgomp/testsuite/libgomp.fortran/use_device_addr-5.f90 b/libgomp/testsuite/libgomp.fortran/use_device_addr-5.f90 index 1def70a1bc06..3124d60fe9be 100644 --- a/libgomp/testsuite/libgomp.fortran/use_device_addr-5.f90 +++ b/libgomp/testsuite/libgomp.fortran/use_device_addr-5.f90 @@ -8,7 +8,7 @@ program main aaa(:,:,:) = reshape ([(i, i = 1, size(aaa))], shape(aaa)) do i = 0, omp_get_num_devices() - !$omp target data map(to: aaa) + !$omp target data map(to: aaa) device(i) call test_addr (aaa, i) call test_ptr (aaa, i) !$omp end target data -- 2.47.2