From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 8E0EA38582B4; Wed, 15 Jun 2022 08:46:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E0EA38582B4 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1101] openmp: Fix up get-mapped-ptr-1.{c,f90} tests X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: acb1e6f43dc2bbedd1248ea61c7ab537a11fe59b X-Git-Newrev: 7bfb3f488a7ec58109a859c66bf4eddc6354065b Message-Id: <20220615084631.8E0EA38582B4@sourceware.org> Date: Wed, 15 Jun 2022 08:46:31 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 08:46:31 -0000 https://gcc.gnu.org/g:7bfb3f488a7ec58109a859c66bf4eddc6354065b commit r13-1101-g7bfb3f488a7ec58109a859c66bf4eddc6354065b Author: Jakub Jelinek Date: Wed Jun 15 10:45:04 2022 +0200 openmp: Fix up get-mapped-ptr-1.{c,f90} tests On Tue, Jun 14, 2022 at 06:41:37PM +0200, Thomas Schwinge wrote: > In an offloading configuration, I'm seeing: > > PASS: libgomp.fortran/get-mapped-ptr-1.f90 -O (test for excess errors) > [-PASS:-]{+FAIL:+} libgomp.fortran/get-mapped-ptr-1.f90 -O execution test > > Does that one need similar treatment? I assume not just that but libgomp.c-c++-common/get-mapped-ptr-1.c too? It both needs the same treatment, and in the get-mapped-ptr-1.c case there is even UB, while the Fortran version was using c_loc (q) as the host pointer, in C/C++ it was using q which was value of uninitialized pointer. 2022-06-15 Jakub Jelinek * testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c (main): Initialize q to ddress of an automatic variable. Use -5 instead of -1 in omp_get_mapped_ptr call. Add test with omp_initial_device. * testsuite/libgomp.fortran/get-mapped-ptr-1.f90 (main): Use -5 instead of -1 in omp_get_mapped_ptr call. Add test with omp_initial_device. Renumber stop arguments afterwards. Diff: --- libgomp/testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c | 10 ++++++++-- libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 | 12 ++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libgomp/testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c b/libgomp/testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c index 97a60ca9541..4708ae86bfe 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c +++ b/libgomp/testsuite/libgomp.c-c++-common/get-mapped-ptr-1.c @@ -6,7 +6,10 @@ main () { int d = omp_get_default_device (); int id = omp_get_initial_device (); - void *p , *q; + int x; + void *p, *q; + + q = (void *) &x; if (d < 0 || d >= omp_get_num_devices ()) d = id; @@ -18,7 +21,7 @@ main () if (omp_target_associate_ptr (q, p, sizeof (int), 0, d) != 0) return 0; - if (omp_get_mapped_ptr (q, -1) != NULL) + if (omp_get_mapped_ptr (q, -5) != NULL) abort (); if (omp_get_mapped_ptr (q, omp_get_num_devices () + 1) != NULL) @@ -27,6 +30,9 @@ main () if (omp_get_mapped_ptr (q, id) != q) abort (); + if (omp_get_mapped_ptr (q, omp_initial_device) != q) + abort (); + if (omp_get_mapped_ptr (q, d) != p) abort (); diff --git a/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 b/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 index de05179ce9f..9b6334f50d8 100644 --- a/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 +++ b/libgomp/testsuite/libgomp.fortran/get-mapped-ptr-1.f90 @@ -19,7 +19,7 @@ program main if (omp_target_associate_ptr (c_loc (q), p, c_sizeof (q), & 0_c_size_t, d) == 0) then - if(c_associated (omp_get_mapped_ptr (c_loc (q), -1))) & + if(c_associated (omp_get_mapped_ptr (c_loc (q), -5))) & stop 1 if(c_associated (omp_get_mapped_ptr (c_loc (q), & @@ -29,14 +29,18 @@ program main if(.not. c_associated (omp_get_mapped_ptr (c_loc (q), id), c_loc (q))) & stop 3 - if(.not. c_associated (omp_get_mapped_ptr (c_loc (q), d), p)) & + if(.not. c_associated (omp_get_mapped_ptr (c_loc (q), omp_initial_device), & + c_loc (q))) & stop 4 - if (omp_target_disassociate_ptr (c_loc (q), d) /= 0) & + if(.not. c_associated (omp_get_mapped_ptr (c_loc (q), d), p)) & stop 5 - if(c_associated (omp_get_mapped_ptr (c_loc (q), d))) & + if (omp_target_disassociate_ptr (c_loc (q), d) /= 0) & stop 6 + + if(c_associated (omp_get_mapped_ptr (c_loc (q), d))) & + stop 7 end if call omp_target_free (p, d)