public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7609] Fortran: OpenMP/OpenACC avoid uninit access in size calc for mapping Date: Fri, 11 Mar 2022 07:49:23 +0000 (GMT) [thread overview] Message-ID: <20220311074923.BFEA83857C41@sourceware.org> (raw) https://gcc.gnu.org/g:41bda0036ce81e7ac513f325e7b0f41ccf11cbab commit r12-7609-g41bda0036ce81e7ac513f325e7b0f41ccf11cbab Author: Tobias Burnus <tobias@codesourcery.com> Date: Fri Mar 11 08:48:58 2022 +0100 Fortran: OpenMP/OpenACC avoid uninit access in size calc for mapping gcc/fortran/ChangeLog: * trans-openmp.cc (gfc_trans_omp_clauses, gfc_omp_finish_clause): Obtain size for mapping only if allocatable array is allocated. gcc/testsuite/ChangeLog: * gfortran.dg/goacc/array-with-dt-1.f90: Update/add comments; remove dg-warning for 'is used uninitialized'. * gfortran.dg/goacc/pr93464.f90: Likewise. * gfortran.dg/goacc/array-with-dt-1a.f90: New; copied from gfortran.dg/goacc/array-with-dt-1.f90 but run with -O0. Update dg-warning for 'may be used uninitialized'. * gfortran.dg/goacc/pr93464-2.f90: Likewise; copied from gfortran.dg/goacc/pr93464.f90. Diff: --- gcc/fortran/trans-openmp.cc | 6 +++-- .../gfortran.dg/goacc/array-with-dt-1.f90 | 18 ++++++++++++--- .../gfortran.dg/goacc/array-with-dt-1a.f90 | 27 ++++++++++++++++++++++ gcc/testsuite/gfortran.dg/goacc/pr93464-2.f90 | 26 +++++++++++++++++++++ gcc/testsuite/gfortran.dg/goacc/pr93464.f90 | 12 ++++++---- 5 files changed, 80 insertions(+), 9 deletions(-) diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index 4d56a771349..fad76a4791f 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -1597,7 +1597,8 @@ gfc_omp_finish_clause (tree c, gimple_seq *pre_p, bool openacc) tree size = create_tmp_var (gfc_array_index_type); tree elemsz = TYPE_SIZE_UNIT (gfc_get_element_type (type)); elemsz = fold_convert (gfc_array_index_type, elemsz); - if (GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_POINTER + if (GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_ALLOCATABLE + || GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_POINTER || GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_POINTER_CONT) { stmtblock_t cond_block; @@ -3208,7 +3209,8 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, /* We have to check for n->sym->attr.dimension because of scalar coarrays. */ - if (n->sym->attr.pointer && n->sym->attr.dimension) + if ((n->sym->attr.pointer || n->sym->attr.allocatable) + && n->sym->attr.dimension) { stmtblock_t cond_block; tree size diff --git a/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1.f90 b/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1.f90 index 136e42acd59..fb27f6e4058 100644 --- a/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1.f90 @@ -1,15 +1,27 @@ ! { dg-additional-options -Wuninitialized } +! Purpose of this testcase (from the commit log): +! This patch fixes lowering of derived-type mappings which select elements +! of arrays of derived types, and similar. These would previously lead +! to ICEs. + +! This testcase does not show any uninitialized warnings when compiled with -O +! (as done). For -O0, see testcase file 'array-with-dt-1a.f90'. + type t integer, allocatable :: A(:,:) end type t type(t), allocatable :: b(:) -! { dg-note {'b' declared here} {} { target *-*-* } .-1 } + +! Remark: Semantically, the following line requires that 'b' +! is already present on the device. !$acc update host(b) -! { dg-warning {'b\.dim\[0\]\.ubound' is used uninitialized} {} { target *-*-* } .-1 } -! { dg-warning {'b\.dim\[0\]\.lbound' is used uninitialized} {} { target *-*-* } .-2 } + +! Remark: Semantically, the following lines require that b is allocated +! and present on the device. The last line also requires the same for 'A'. + !$acc update host(b(:)) !$acc update host(b(1)%A) !$acc update host(b(1)%A(:,:)) diff --git a/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1a.f90 b/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1a.f90 new file mode 100644 index 00000000000..8beaeb45e2e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/array-with-dt-1a.f90 @@ -0,0 +1,27 @@ +! { dg-additional-options "-Wuninitialized -O0" } +! +! With -O0 only, 'may be uninitalized' warnings show up. +! For the original testcase, compiled with '-O', +! see testcase file 'array-with-dt-1a.f90' + +type t + integer, allocatable :: A(:,:) +end type t + +type(t), allocatable :: b(:) +! { dg-note {'b' declared here} {} { target *-*-* } .-1 } + +! Remark: Semantically, the following line requires that 'b' +! is already present on the device. + +!$acc update host(b) +! { dg-warning {'b\.dim\[0\]\.ubound' may be used uninitialized} {} { target *-*-* } .-1 } +! { dg-warning {'b\.dim\[0\]\.lbound' may be used uninitialized} {} { target *-*-* } .-2 } + +! Remark: Semantically, the following lines require that b is allocated +! and present on the device. The last line also requires the same for 'A'. + +!$acc update host(b(:)) +!$acc update host(b(1)%A) +!$acc update host(b(1)%A(:,:)) +end diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93464-2.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93464-2.f90 new file mode 100644 index 00000000000..5da6a4eb7b0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/pr93464-2.f90 @@ -0,0 +1,26 @@ +! { dg-additional-options "-Wuninitialized -O0" } +! +! PR fortran/93464 +! +! Contributed by G. Steinmetz +! +! Did before ICE in gfc_omp_check_optional_argument + +! Additionally, check for uninitialized warnings. There are +! none with -O (cf. original testcase file 'pr93464.f90'). +! For -O0, see below: + +program p + character :: c(2) = 'a' + character, allocatable :: z(:) + ! { dg-note {'z' declared here} {} { target *-*-* } .-1 } + !$acc parallel + ! { dg-warning {'z\.dim\[0\]\.ubound' may be used uninitialized} {} { target *-*-* } .-1 } + ! { dg-warning {'z\.dim\[0\]\.lbound' may be used uninitialized} {} { target *-*-* } .-2 } + !$omp target + ! Remark: As run-time check, required either 'c' being allocated or if(allocated(c)': + z = c + !$acc end parallel + !$omp end target + print *, z +end diff --git a/gcc/testsuite/gfortran.dg/goacc/pr93464.f90 b/gcc/testsuite/gfortran.dg/goacc/pr93464.f90 index c92f1d3d8b2..1b5ca7d1c76 100644 --- a/gcc/testsuite/gfortran.dg/goacc/pr93464.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/pr93464.f90 @@ -1,17 +1,21 @@ +! { dg-additional-options -Wuninitialized } +! ! PR fortran/93464 ! ! Contributed by G. Steinmetz +! +! Did before ICE in gfc_omp_check_optional_argument -! { dg-additional-options -Wuninitialized } +! Additionally, check for uninitialized warnings. +! Compiled with -O (as done here), no show up; +! for -O0, see testcase file 'pr93464-1.f90'. program p character :: c(2) = 'a' character, allocatable :: z(:) - ! { dg-note {'z' declared here} {} { target *-*-* } .-1 } !$acc parallel - ! { dg-warning {'z\.dim\[0\]\.ubound' is used uninitialized} {} { target *-*-* } .-1 } - ! { dg-warning {'z\.dim\[0\]\.lbound' is used uninitialized} {} { target *-*-* } .-2 } !$omp target + ! Remark: As run-time check, required either 'c' being allocated or if(allocated(c)': z = c !$acc end parallel !$omp end target
reply other threads:[~2022-03-11 7:49 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220311074923.BFEA83857C41@sourceware.org \ --to=burnus@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).