[5/7,og10] Fortran: %re/%im fixes for OpenMP/OpenACC + gfc_is_simplify_contiguous

Message ID	20210224215838.130807-1-julian@codesourcery.com
State	New
Headers	show Return-Path: <gcc-patches-bounces@gcc.gnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 811FD3959E65 IronPort-SDR: XZyj+xBlVqA6/bEgsVnPkGyqkXiQudE7OD1Gb7OQzruqjdm6t3iR+Qf1oNXQbpChd1ArH+J7Ru hdqs+CvIZnOf9n/IxpsMCu+Ouh5KEVjawBQKoG6dweeq6cVrEwwO07DZyu6TjqrvpGN5zafslT piyoJ2OCaApmtvluBaqZHqWtpqeJNR8GLr7Gmq4GYslrIZcOj00Zt5NKF8jnnC7J2BfGjy9y5s rrwbNrc5kKH2o6Kvbc2532RaLhvaXIkosC/vmwVAvMRvMcjw0ZPq4ddSiuUfPa59kQNkFvDE6i fSo= IronPort-SDR: B/r9P0Dk051v64whwU5NuzvJNzTAl1sVPBp7ysZRgGkdp3e7KhMeg6F0YeLosSlshc0RUXgTCT E8c/4O6lwvyRT4pSt/hJfYc9l8W2FbUpdZArXOJTkVim9lDnQR9fG1C1CMWL6c7NMQZ3um22XO cvuDNjZMn88COyvEYLv3YID5JDg2HwoaMoxUR9xQI9yv6xN/hkdaarOvbEXs3ej6jXwiNDUVhK 93WlfcwTY+4RCHdUMMgK2KoT1rGwtKx5ZEHA1QaTYAFKbLvp7rDxfBcNaAlMW+WPKnRSGlo3oc T1M= From: Julian Brown <julian@codesourcery.com> To: <gcc-patches@gcc.gnu.org> Subject: [PATCH 5/7] [og10] Fortran: %re/%im fixes for OpenMP/OpenACC + gfc_is_simplify_contiguous Date: Wed, 24 Feb 2021 13:58:36 -0800 Message-ID: <20210224215838.130807-1-julian@codesourcery.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Cc: Tobias Burnus <tobias@codesourcery.com>, fortran@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces@gcc.gnu.org>
Series	openacc: Arrays/derived types/character type backports \| expand [0/7,og10] openacc: Arrays/derived types/character type backports [1/7,og10] openacc: Dereference BT_CLASS data pointers but not BT_DERIVED pointers [2/7,og10] openacc: Use class_pointer instead of pointer attribute for class types [3/7,og10] openacc: Character types and mixed arrays/derived type tests [4/7,og10] Fortran: OpenMP/OpenACC diagnose substring rejections better [5/7,og10] Fortran: %re/%im fixes for OpenMP/OpenACC + gfc_is_simplify_contiguous [6/7,og10] openacc: Fix lowering for derived-type mappings through array elements [7/7,og10] openacc: Strided array sections and components of derived-type arrays

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index 09c2bb855c88..f99a11316f52 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,11 @@ +2021-02-24 Tobias Burnus <tobias@codesourcery.com> + + Backport from mainline + + * expr.c (gfc_is_simplify_contiguous): Handle REF_INQUIRY, i.e. + %im and %re which are EXPR_VARIABLE. + * openmp.c (resolve_omp_clauses): Diagnose %re/%im explicitly. + 2021-02-24 Tobias Burnus <tobias@codesourcery.com> Backport from mainline diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 569f4d9bf066..6cda947cd568 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -5837,6 +5837,8 @@ gfc_is_simply_contiguous (gfc_expr *expr, bool strict, bool permit_element) part_ref = ref; else if (ref->type == REF_SUBSTRING) return false; + else if (ref->type == REF_INQUIRY) + return false; else if (ref->u.ar.type != AR_ELEMENT) ar = &ref->u.ar; } diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index a7592f0545d9..8d77f9e73510 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -4984,6 +4984,14 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, && array_ref->next->type == REF_SUBSTRING))) gfc_error ("Unexpected substring reference in %s clause " "at %L", name, &n->where); + else if (array_ref && array_ref->type == REF_INQUIRY) + { + gcc_assert (array_ref->u.i == INQUIRY_RE + || array_ref->u.i == INQUIRY_IM); + gfc_error ("Unexpected complex-parts designator " + "reference in %s clause at %L", + name, &n->where); + } else if (!resolved || n->expr->expr_type != EXPR_VARIABLE || array_ref->next diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index d012e9e75b4e..257981890982 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,10 @@ +2021-02-24 Tobias Burnus <tobias@codesourcery.com> + + Backport from mainline + + * gfortran.dg/goacc/ref_inquiry.f90: New test. + * gfortran.dg/gomp/ref_inquiry.f90: New test. + 2021-02-24 Tobias Burnus <tobias@codesourcery.com> Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/goacc/ref_inquiry.f90 b/gcc/testsuite/gfortran.dg/goacc/ref_inquiry.f90 new file mode 100644 index 000000000000..69dd38e51974 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/ref_inquiry.f90 @@ -0,0 +1,56 @@ +! Check for <var>%re, ...%im, ...%kind, ...%len +! Cf. also OpenMP's ../gomp/ref_inquiry.f90 +! Cf. OpenACC spec issue 346 +! +implicit none +type t + integer :: i + character :: c + complex :: z + complex :: zz(5) +end type t + +integer :: i +character(kind=4, len=5) :: c +complex :: z, zz(5) +type(t) :: x + +print *, is_contiguous(zz(:)%re) + +! inquiry function; expr_type != EXPR_VARIABLE: +!$acc enter data copyin(i%kind, c%len) ! { dg-error "not a proper array section" } +!$acc enter data copyin(x%i%kind) ! { dg-error "not a proper array section" } +!$acc enter data copyin(x%c%len) ! { dg-error "not a proper array section" } +!$acc update self(i%kind, c%len) ! { dg-error "not a proper array section" } +!$acc update self(x%i%kind) ! { dg-error "not a proper array section" } +!$acc update self(x%c%len) ! { dg-error "not a proper array section" } + +! EXPR_VARIABLE +!$acc enter data copyin(z%re) ! { dg-error "Unexpected complex-parts designator" } +!$acc enter data copyin(z%im) ! { dg-error "Unexpected complex-parts designator" } +!$acc enter data copyin(zz%re) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$acc enter data copyin(zz%im) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } + +!$acc enter data copyin(x%z%re) ! { dg-error "Unexpected complex-parts designator" } +!$acc enter data copyin(x%z%im) ! { dg-error "Unexpected complex-parts designator" } +!$acc enter data copyin(x%zz%re) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$acc enter data copyin(x%zz%im) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } + +!$acc update self(z%re) ! { dg-error "Unexpected complex-parts designator" } +!$acc update self(z%im) ! { dg-error "Unexpected complex-parts designator" } +!$acc update self(zz%re) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$acc update self(zz%im) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } + +!$acc update self(x%z%re) ! { dg-error "Unexpected complex-parts designator" } +!$acc update self(x%z%im) ! { dg-error "Unexpected complex-parts designator" } +!$acc update self(x%zz%re) ! { dg-error "is not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$acc update self(x%zz%im) ! { dg-error "is not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +end diff --git a/gcc/testsuite/gfortran.dg/gomp/ref_inquiry.f90 b/gcc/testsuite/gfortran.dg/gomp/ref_inquiry.f90 new file mode 100644 index 000000000000..374610405601 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/ref_inquiry.f90 @@ -0,0 +1,39 @@ +! Check for <var>%re, ...%im, ...%kind, ...%len +! Cf. also OpenACC's ../goacc/ref_inquiry.f90 +! Cf. also OpenMP spec issue 2661 +implicit none +type t + integer :: i + character :: c + complex :: z + complex :: zz(5) +end type t + +integer :: i +character(kind=4, len=5) :: c +complex :: z, zz(5) +type(t) :: x + +print *, is_contiguous(zz(:)%re) + +! inquiry function; expr_type != EXPR_VARIABLE: +!$omp target enter data map(to: i%kind, c%len) ! { dg-error "not a proper array section" } +!$omp target enter data map(to: x%i%kind) ! { dg-error "not a proper array section" } +!$omp target enter data map(to: x%c%len) ! { dg-error "not a proper array section" } + +! EXPR_VARIABLE +!$omp target enter data map(to: z%re) ! { dg-error "Unexpected complex-parts designator" } +!$omp target enter data map(to: z%im) ! { dg-error "Unexpected complex-parts designator" } +!$omp target enter data map(to: zz%re) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$omp target enter data map(to: zz%im) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } + +!$omp target enter data map(to: x%z%re) ! { dg-error "Unexpected complex-parts designator" } +!$omp target enter data map(to: x%z%im) ! { dg-error "Unexpected complex-parts designator" } +!$omp target enter data map(to: x%zz%re) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } +!$omp target enter data map(to: x%zz%im) ! { dg-error "not a proper array section" } + ! { dg-error "Array is not contiguous" "" { target *-*-* } .-1 } + +end

[5/7,og10] Fortran: %re/%im fixes for OpenMP/OpenACC + gfc_is_simplify_contiguous

Commit Message

Patch