From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 429843857C77; Thu, 11 Mar 2021 13:44:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 429843857C77 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Tobias_Burnus@mentor.com IronPort-SDR: 8yzFMTjxJLcNvHAYo3H/+1Abs2w31cNjMm25wWvplISrO5tDy+DovjO8M4No1IqreY/lZ3ivz6 uN0ZRJqWnLM7CIK8aFsgQcizBJ/dgheIvjTzmDSVu4C0kICx6jyaj2rVqdzcZq9hvUqs52Coda VJ2dWXNMBLQZULKOH6z3aZJz9mw8NjGI+sd0W9xY9n6EiVJTk/YMw3blH14DJMYJprtF/I6ZFQ NiFRmaN4Tl++SaueEV3PZVvr2iSpe5hHoc5IZWHFsZ9Fv9cWCEvS6wlaH4rRNk/jv7HEOk3uC1 8ys= X-IronPort-AV: E=Sophos;i="5.81,240,1610438400"; d="diff'?scan'208";a="58982665" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 11 Mar 2021 05:44:51 -0800 IronPort-SDR: ez87DM9XYo6f2Yg6fFkSDF0PTpvCXBLbkpUrBIPgO40pjAJ6LP0Tug44ileor4cD7YJdLnr301 UnNdo1N5+02FrxzpItfsRGLwxfI/6ULvUfCS+o6FKrRtnglWW0DQuhjGNYQSyH4Df8dCn9a0+d 6IuCSgCqt1EBML7tMUVuiA7g0ruMkptBmenf3UsGgQGdeuzCVox+F0v5YbGkhHIEv7iCKtsTol TMGmQtIUUDoKBu4vKxyuL2CNkeSV1U+IZIO6ohBWitJ2/4jVip+PRqE2L7D5y/0pdKn6k4rkCm Z84= To: gcc-patches , fortran , Jakub Jelinek From: Tobias Burnus Subject: [Patch] Fortran/OpenMP: Fix use_device_{ptr,addr} with assumed-size array [PR98858] Message-ID: <51c93c7c-96dd-69b5-5ebb-46de9d4c9601@codesourcery.com> Date: Thu, 11 Mar 2021 14:44:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------739CC3E47347FFD33C290F4A" Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-07.mgc.mentorg.com (139.181.222.7) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2021 13:44:54 -0000 --------------739CC3E47347FFD33C290F4A Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: quoted-printable The ICE occurs because the 't' =3D=3D NULL for assumed-size arrays. For them, the size is not known =E2=80=93 but as this should only occur for use_device_{addr,ptr}, the size is not needed. OK for mainline? Tobias ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstrasse 201, 80634 M=C3=BCnchen R= egistergericht M=C3=BCnchen HRB 106955, Gesch=C3=A4ftsf=C3=BChrer: Thomas H= eurung, Frank Th=C3=BCrauf --------------739CC3E47347FFD33C290F4A Content-Type: text/x-patch; charset="UTF-8"; name="assumed-devptr.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="assumed-devptr.diff" Fortran/OpenMP: Fix use_device_{ptr,addr} with assumed-size array [PR98858] gcc/ChangeLog: PR fortran/98858 * gimplify.c (omp_add_variable): Handle NULL_TREE as size occuring for assumed-size arrays in use_device_{ptr,addr}. libgomp/ChangeLog: PR fortran/98858 * testsuite/libgomp.fortran/use_device_ptr-3.f90: New test. gcc/gimplify.c | 2 +- .../testsuite/libgomp.fortran/use_device_ptr-3.f90 | 91 ++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/gcc/gimplify.c b/gcc/gimplify.c index caf25ccdd5c..6da66985ad6 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7078,7 +7078,7 @@ omp_add_variable (struct gimplify_omp_ctx *ctx, tree decl, unsigned int flags) if ((flags & GOVD_SHARED) == 0) { t = TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (decl))); - if (DECL_P (t)) + if (t && DECL_P (t)) omp_notice_variable (ctx, t, true); } } diff --git a/libgomp/testsuite/libgomp.fortran/use_device_ptr-3.f90 b/libgomp/testsuite/libgomp.fortran/use_device_ptr-3.f90 new file mode 100644 index 00000000000..f2b33cd5e89 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/use_device_ptr-3.f90 @@ -0,0 +1,91 @@ +! PR fortran/98858 +! +! Assumed-size array with use_device_ptr() +! +program test_use_device_ptr + use iso_c_binding, only: c_ptr, c_loc, c_f_pointer + implicit none + double precision :: alpha + integer, parameter :: lda = 10 + integer, allocatable :: mat(:, :) + integer :: i, j + + allocate(mat(lda, lda)) + do i = 1, lda + do j = 1, lda + mat(j,i) = i*100 + j + end do + end do + + !$omp target enter data map(to:mat) + call dgemm(lda, mat) + !$omp target exit data map(from:mat) + + do i = 1, lda + do j = 1, lda + if (mat(j,i) /= -(i*100 + j)) stop 1 + end do + end do + + !$omp target enter data map(to:mat) + call dgemm2(lda, mat) + !$omp target exit data map(from:mat) + + do i = 1, lda + do j = 1, lda + if (mat(j,i) /= (i*100 + j)) stop 1 + end do + end do + + contains + + subroutine dgemm(lda, a) + implicit none + integer :: lda + integer, target:: a(lda,*) ! need target attribute to use c_loc + !$omp target data use_device_ptr(a) + call negate_it(c_loc(a), lda) + !$omp end target data + end subroutine + + subroutine dgemm2(lda, a) + implicit none + integer :: lda + integer, target:: a(lda,*) ! need target attribute to use c_loc + !$omp target data use_device_addr(a) + call negate_it(c_loc(a), lda) + !$omp end target data + end subroutine + + subroutine negate_it(a, n) + type(c_ptr), value :: a + integer, value :: n + integer, pointer :: array(:,:) + + ! detour due to OpenMP 5.0 oddness + call c_f_pointer(a, array, [n,n]) + call do_offload(array, n) + end + + subroutine do_offload(aptr, n) + integer, target :: aptr(:,:) + integer, value :: n + !$omp target is_device_ptr(aptr) + call negate_it_tgt(aptr, n) + !$omp end target + end subroutine do_offload + + subroutine negate_it_tgt(array, n) + !$omp declare target + integer, value :: n + integer :: array(n,n) + integer :: i, j + !$omp parallel do collapse(2) + do i = 1, n + do j = 1, n + array(j,i) = - array(j,i) + end do + end do + !$omp end parallel do + end subroutine +end program --------------739CC3E47347FFD33C290F4A--