From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 16E413858425; Wed, 1 Mar 2023 12:53:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16E413858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677675216; bh=9HZNO6dNyxMwDgLpsA4OarWBKgR7R/F+GqzzSQQyt/U=; h=From:To:Subject:Date:From; b=ePpaUsH+LdLTLTQGzcHVLydHN0AEsNcJedHsdZkjas9+fvQF7p9mRuqxDLiG1VfnM 1nrCQwX5lBfxyd7Kq/L3zqpiEX9tuR0dMfQ4M1tj8Yp/auUzfUUVTH5LEbF7lII8TD tJEHJSF0a95+rA2pdQGf8xGcpgyT3Od1XN+z4CMU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6390] OpenMP/Fortran: Fix handling of optional is_device_ptr + bind(C) [PR108546] X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: f72c8918416f67aad907752f1892c19eda12eecb X-Git-Newrev: 96ff97ff6574666a5509ae9fa596e7f2b6ad4f88 Message-Id: <20230301125336.16E413858425@sourceware.org> Date: Wed, 1 Mar 2023 12:53:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:96ff97ff6574666a5509ae9fa596e7f2b6ad4f88 commit r13-6390-g96ff97ff6574666a5509ae9fa596e7f2b6ad4f88 Author: Tobias Burnus Date: Wed Mar 1 13:53:09 2023 +0100 OpenMP/Fortran: Fix handling of optional is_device_ptr + bind(C) [PR108546] For is_device_ptr, optional checks should only be done before calling libgomp, afterwards they are NULL either because of absent or, by chance, because it is unallocated or unassociated (for pointers/allocatables). Additionally, it fixes an issue with explicit mapping for 'type(c_ptr)'. PR middle-end/108546 gcc/fortran/ChangeLog: * trans-openmp.cc (gfc_trans_omp_clauses): Fix mapping of type(C_ptr) variables. gcc/ChangeLog: * omp-low.cc (lower_omp_target): Remove optional handling on the receiver side, i.e. inside target (data), for use_device_ptr. libgomp/ChangeLog: * testsuite/libgomp.fortran/is_device_ptr-3.f90: New test. * testsuite/libgomp.fortran/use_device_ptr-optional-4.f90: New test. Diff: --- gcc/fortran/trans-openmp.cc | 4 +- gcc/omp-low.cc | 3 +- .../testsuite/libgomp.fortran/is_device_ptr-3.f90 | 46 +++++++++++++++++++ .../libgomp.fortran/use_device_ptr-optional-4.f90 | 53 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index 2d16f3be8ea..84c0184f48e 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -3152,7 +3152,9 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, || GFC_DECL_CRAY_POINTEE (decl) || GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (TREE_TYPE (decl))) - || n->sym->ts.type == BT_DERIVED)) + || (n->sym->ts.type == BT_DERIVED + && (n->sym->ts.u.derived->ts.f90_type + != BT_VOID)))) { tree orig_decl = decl; diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc index fef41a013ec..9757592c635 100644 --- a/gcc/omp-low.cc +++ b/gcc/omp-low.cc @@ -13942,7 +13942,8 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx) } tree present; present = ((do_optional_check - && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_HAS_DEVICE_ADDR) + && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_HAS_DEVICE_ADDR + && OMP_CLAUSE_CODE (c) != OMP_CLAUSE_IS_DEVICE_PTR) ? omp_check_optional_argument (OMP_CLAUSE_DECL (c), true) : NULL_TREE); if (present) diff --git a/libgomp/testsuite/libgomp.fortran/is_device_ptr-3.f90 b/libgomp/testsuite/libgomp.fortran/is_device_ptr-3.f90 new file mode 100644 index 00000000000..ab9f00ebecb --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/is_device_ptr-3.f90 @@ -0,0 +1,46 @@ +module m + use iso_c_binding + implicit none +contains + subroutine s(x,y,z) + type(c_ptr), optional :: x + integer, pointer, optional :: y + integer, allocatable, optional :: z + logical is_present, is_null + is_present = present(x) + if (is_present) & + is_null = .not. c_associated(x) + + !$omp target is_device_ptr(x) has_device_addr(y) has_device_addr(z) + if (is_present) then + if (is_null) then + if (c_associated(x)) stop 1 + if (associated(y)) stop 2 + if (allocated(z)) stop 3 + else + if (.not. c_associated(x, c_loc(y))) stop 4 + if (y /= 7) stop 5 + if (z /= 9) stop 6 + end if + end if + !$omp end target + end +end + +use m +implicit none +integer, pointer :: p +integer, allocatable :: a +p => null() +call s() +!$omp target data map(p,a) use_device_addr(p,a) + call s(c_null_ptr, p, a) +!$omp end target data +allocate(p,a) +p = 7 +a = 9 +!$omp target data map(p,a) use_device_addr(p,a) + call s(c_loc(p), p, a) +!$omp end target data +deallocate(p,a) +end diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-4.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-4.f90 new file mode 100644 index 00000000000..b2a5c314685 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-optional-4.f90 @@ -0,0 +1,53 @@ +! PR middle-end/108546 +! +module m + use iso_c_binding + implicit none + type(c_ptr) :: p2, p3 +contains + subroutine s(x,y,z) + type(c_ptr), optional :: x + integer, pointer, optional :: y + integer, allocatable, optional, target :: z + logical is_present, is_null + is_present = present(x) + if (is_present) & + is_null = .not. c_associated(x) + + !$omp target data use_device_ptr(x) use_device_addr(y) use_device_addr(z) + if (is_present) then + if (is_null) then + if (c_associated(x)) stop 1 + if (associated(y)) stop 2 + if (allocated(z)) stop 3 + else + if (.not. c_associated(x, p2)) stop 4 + if (.not. c_associated(c_loc(y), p2)) stop 5 + if (.not. c_associated(c_loc(z), p3)) stop 6 + end if + end if + !$omp end target data + end +end + +use m +implicit none +type(c_ptr) :: cp +integer, pointer :: p +integer, allocatable, target :: a +call s() +p => null() +call s(c_null_ptr, p, a) +allocate(p,a) +p = 7 +a = 9 +cp = c_loc(p) +!$omp target enter data map(to: cp, p, a) +!$omp target map(from: p2, p3) + p2 = c_loc(p) + p3 = c_loc(a) +!$omp end target +call s(cp, p, a) +!$omp target exit data map(delete: cp, p, a) +deallocate(p,a) +end