https://gcc.gnu.org/g:4cd0ec83ec27d8c22e25731cb49afcdb351b9712
commit 4cd0ec83ec27d8c22e25731cb49afcdb351b9712
Merge: 82c5b0610351 e0246616020e
Author: Thomas Schwinge <tschwi...@baylibre.com>
Date: Tue Feb 18 16:54:25 2025 +0100
Merge commit 'e0246616020e95e74afa9d504c8848e6e905fab4' into HEAD
Diff:
gcc/fortran/ChangeLog.omp | 17 ++
gcc/fortran/gfortran.h | 10 +-
gcc/fortran/openmp.cc | 243 +++++++++++++++++----
gcc/fortran/trans-decl.cc | 23 ++
gcc/fortran/trans-openmp.cc | 212 ++++++++++++++----
gcc/testsuite/ChangeLog.omp | 19 ++
gcc/testsuite/gfortran.dg/gomp/adjust-args-1.f90 | 8 +-
gcc/testsuite/gfortran.dg/gomp/adjust-args-11.f90 | 77 ++++++-
gcc/testsuite/gfortran.dg/gomp/adjust-args-13.f90 | 18 ++
gcc/testsuite/gfortran.dg/gomp/adjust-args-14.f90 | 85 +++++++
gcc/testsuite/gfortran.dg/gomp/adjust-args-15.f90 | 35 +++
gcc/testsuite/gfortran.dg/gomp/adjust-args-2.f90 | 3 +-
gcc/testsuite/gfortran.dg/gomp/adjust-args-2a.f90 | 8 +-
gcc/testsuite/gfortran.dg/gomp/adjust-args-3.f90 | 4 +-
gcc/testsuite/gfortran.dg/gomp/adjust-args-4.f90 | 8 +-
gcc/testsuite/gfortran.dg/gomp/adjust-args-5.f90 | 8 +-
.../gfortran.dg/gomp/declare-variant-21.f90 | 20 ++
17 files changed, 692 insertions(+), 106 deletions(-)
diff --cc gcc/testsuite/ChangeLog.omp
index 3a4394172422,c9548f594caa..3fea26738e9e
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@@ -1,269 -1,22 +1,288 @@@
+2025-02-18 Thomas Schwinge <tho...@codesourcery.com>
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * lib/gcc-dg.exp (gcc-dg-prune): Turn
+ 'sorry, unimplemented: exception handling not supported' into
+ UNSUPPORTED.
+ * gcc.dg/pr104464.c: Remove GCN XFAIL.
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * gcc.dg/cleanup-12.c: Don't 'dg-skip-if "" { ! nonlocal_goto }'.
+ * gcc.dg/cleanup-13.c: Likewise.
+ * gcc.dg/cleanup-5.c: Likewise.
+ * gcc.dg/gimplefe-44.c: Don't
+ 'dg-require-effective-target nonlocal_goto'.
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * lib/target-supports.exp (check_effective_target_exceptions):
+ 'return 0' for '[istarget nvptx-*-*]'.
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ PR target/118772
+ * lib/target-supports.exp (check_effective_target_exceptions):
+ 'return 0' for '[istarget bpf-*-*]'.
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * lib/gcc-dg.exp (gcc-dg-prune): Clarify effective-target
+ 'exceptions_enabled'.
+ * lib/target-supports.exp
+ (check_effective_target_exceptions_enabled): Don't consider
+ effective-target 'exceptions'.
+
+ Backported from trunk:
+ 2025-02-08 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * gcc.dg/pr88870.c: Don't 'dg-require-effective-target nonlocal_goto'.
+
+ Backported from trunk:
+ 2025-02-07 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * c-c++-common/goacc/pr92793-1.c: Remove
+ '-fdump-tree-original-lineno' XFAILs.
+
+ * c-c++-common/goacc/combined-reduction.c: Adjust.
+ * c-c++-common/goacc/reduction-1.c: Likewise.
+ * c-c++-common/goacc/reduction-10.c: Likewise.
+ * c-c++-common/goacc/reduction-2.c: Likewise.
+ * c-c++-common/goacc/reduction-3.c: Likewise.
+ * c-c++-common/goacc/reduction-4.c: Likewise.
+ * gfortran.dg/goacc/loop-tree-1.f90: Likewise.
+
+ Backported from trunk:
+ 2025-01-28 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * c-c++-common/gomp/defaultmap-4.c: Adjust.
+ * c-c++-common/gomp/defaultmap-5.c: Likewise.
+ * c-c++-common/gomp/target-implicit-map-1.c: Likewise.
+ * c-c++-common/gomp/target-implicit-map-2.c: Likewise.
+ * gfortran.dg/gomp/defaultmap-8.f90: Likewise.
+ * gfortran.dg/gomp/defaultmap-9.f90: Likewise.
+ * gfortran.dg/gomp/map-subarray.f90: Likewise.
+ * gfortran.dg/gomp/target-enter-exit-data.f90: Likewise.
+
+ * gfortran.dg/goacc/loop-2-serial-tile.f95: Adjust.
+
+ Backported from trunk:
+ 2025-01-16 Thomas Schwinge <tho...@codesourcery.com>
+
+ * c-c++-common/goacc-gomp/nesting-1.c: Extend OpenACC 'serial'
+ testing.
+ * c-c++-common/goacc-gomp/nesting-fail-1.c: Likewise.
+ * c-c++-common/goacc/Wparentheses-1.c: Likewise.
+ * c-c++-common/goacc/builtin-goacc-parlevel-id-size.c: Likewise.
+ * c-c++-common/goacc/combined-directives-2.c: Likewise.
+ * c-c++-common/goacc/combined-directives-3.c: Likewise.
+ * c-c++-common/goacc/combined-directives.c: Likewise.
+ * c-c++-common/goacc/combined-reduction.c: Likewise.
+ * c-c++-common/goacc/data-clause-duplicate-1.c: Likewise.
+ * c-c++-common/goacc/default-1.c: Likewise.
+ * c-c++-common/goacc/default-2.c: Likewise.
+ * c-c++-common/goacc/default-3.c: Likewise.
+ * c-c++-common/goacc/default-4.c: Likewise.
+ * c-c++-common/goacc/default-5.c: Likewise.
+ * c-c++-common/goacc/if-clause-2.c: Likewise.
+ * c-c++-common/goacc/kernels-1.c: Likewise.
+ * c-c++-common/goacc/loop-1.c: Likewise.
+ * c-c++-common/goacc/loop-clauses.c: Likewise.
+ * c-c++-common/goacc/nesting-1.c: Likewise.
+ * c-c++-common/goacc/nesting-data-1.c: Likewise.
+ * c-c++-common/goacc/nesting-fail-1.c: Likewise.
+ * c-c++-common/goacc/parallel-1.c: Likewise.
+ * c-c++-common/goacc/private-reduction-1.c: Likewise.
+ * c-c++-common/goacc/reduction-promotions.c: Likewise.
+ * c-c++-common/goacc/routine-1.c: Likewise.
+ * c-c++-common/goacc/sb-1.c: Likewise.
+ * c-c++-common/goacc/sb-2.c: Likewise.
+ * c-c++-common/goacc/uninit-firstprivate-clause.c: Likewise.
+ * c-c++-common/goacc/uninit-if-clause.c: Likewise.
+ * c-c++-common/goacc/update-if_present-2.c: Likewise.
+ * g++.dg/goacc/template.C: Likewise.
+ * gfortran.dg/goacc/array-reduction.f90: Likewise.
+ * gfortran.dg/goacc/assumed.f95: Likewise.
+ * gfortran.dg/goacc/branch.f95: Likewise.
+ * gfortran.dg/goacc/coarray.f95: Likewise.
+ * gfortran.dg/goacc/coarray_2.f90: Likewise.
+ * gfortran.dg/goacc/combined-directives-3.f90: Likewise.
+ * gfortran.dg/goacc/combined-directives.f90: Likewise.
+ * gfortran.dg/goacc/common-block-1.f90: Likewise.
+ * gfortran.dg/goacc/common-block-2.f90: Likewise.
+ * gfortran.dg/goacc/common-block-3.f90: Likewise.
+ * gfortran.dg/goacc/cray-2.f95: Likewise.
+ * gfortran.dg/goacc/cray.f95: Likewise.
+ * gfortran.dg/goacc/critical.f95: Likewise.
+ * gfortran.dg/goacc/data-clauses.f95: Likewise.
+ * gfortran.dg/goacc/default-1.f95: Likewise.
+ * gfortran.dg/goacc/default-2.f: Likewise.
+ * gfortran.dg/goacc/default-3.f95: Likewise.
+ * gfortran.dg/goacc/default-4.f: Likewise.
+ * gfortran.dg/goacc/default-5.f: Likewise.
+ * gfortran.dg/goacc/default_none.f95: Likewise.
+ * gfortran.dg/goacc/derived-types.f90: Likewise.
+ * gfortran.dg/goacc/firstprivate-1.f95: Likewise.
+ * gfortran.dg/goacc/gang-static.f95: Likewise.
+ * gfortran.dg/goacc/if.f95: Likewise.
+ * gfortran.dg/goacc/list.f95: Likewise.
+ * gfortran.dg/goacc/literal.f95: Likewise.
+ * gfortran.dg/goacc/loop-1-2.f95: Likewise.
+ * gfortran.dg/goacc/loop-1.f95: Likewise.
+ * gfortran.dg/goacc/loop-2-parallel-3.f95: Likewise.
+ * gfortran.dg/goacc/loop-3-2.f95: Likewise.
+ * gfortran.dg/goacc/loop-3.f95: Likewise.
+ * gfortran.dg/goacc/multi-clause.f90: Likewise.
+ * gfortran.dg/goacc/nested-parallelism.f90: Likewise.
+ * gfortran.dg/goacc/parameter.f95: Likewise.
+ * gfortran.dg/goacc/pr71704.f90: Likewise.
+ * gfortran.dg/goacc/private-3.f95: Likewise.
+ * gfortran.dg/goacc/pure-elemental-procedures.f95: Likewise.
+ * gfortran.dg/goacc/reduction-2.f95: Likewise.
+ * gfortran.dg/goacc/reduction-3.f95: Likewise.
+ * gfortran.dg/goacc/reduction-promotions.f90: Likewise.
+ * gfortran.dg/goacc/reduction.f95: Likewise.
+ * gfortran.dg/goacc/routine-3.f90: Likewise.
+ * gfortran.dg/goacc/routine-module-1.f90: Likewise.
+ * gfortran.dg/goacc/routine-module-2.f90: Likewise.
+ * gfortran.dg/goacc/routine-module-mod-1.f90: Likewise.
+ * gfortran.dg/goacc/sie.f95: Likewise.
+ * gfortran.dg/goacc/subarrays.f95: Likewise.
+ * gfortran.dg/goacc/uninit-firstprivate-clause.f95: Likewise.
+ * gfortran.dg/goacc/uninit-if-clause.f95: Likewise.
+ * gfortran.dg/goacc/update-if_present-2.f90: Likewise.
+ * c-c++-common/goacc/loop-3.c: Rename to...
+ * c-c++-common/goacc/loop-3-parallel.c: ... this.
+ * gfortran.dg/goacc/parallel-kernels-clauses.f95: Rename to...
+ * gfortran.dg/goacc/compute_construct-clauses.f95: ... this.
+ Extend OpenACC 'serial' testing.
+ * gfortran.dg/goacc/parallel-kernels-regions.f95: Rename to...
+ * gfortran.dg/goacc/nesting-fail-1.f95: ... this. Extend OpenACC
+ 'serial' testing.
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-1.f:
+ Rename to...
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-1-parallel.f:
+ ... this.
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-2.f:
+ Rename to...
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-2-parallel.f:
+ ... this.
+ * c-c++-common/goacc/loop-2-serial.c: New.
+ * c-c++-common/goacc/loop-3-serial.c: Likewise.
+ * c-c++-common/goacc/nested-reductions-1-serial.c: Likewise.
+ * c-c++-common/goacc/nested-reductions-2-serial.c: Likewise.
+ * c-c++-common/goacc/serial-1.c: Likewise.
+ * gfortran.dg/goacc/loop-2-serial-3.f95: Likewise.
+ * gfortran.dg/goacc/loop-2-serial-nested.f95: Likewise.
+ * gfortran.dg/goacc/loop-2-serial-tile.f95: Likewise.
+ * gfortran.dg/goacc/loop-2-serial.f95: Likewise.
+ * gfortran.dg/goacc/nested-reductions-1-serial.f90: Likewise.
+ * gfortran.dg/goacc/nested-reductions-2-serial.f90: Likewise.
+ * gfortran.dg/goacc/private-explicit-serial-1.f95: Likewise.
+ * gfortran.dg/goacc/private-predetermined-serial-1.f95: Likewise.
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-1-serial.f:
+ Likewise.
+ * gfortran.dg/goacc/routine-external-level-of-parallelism-2-serial.f:
+ Likewise.
+ * gfortran.dg/goacc/serial-tree.f95: Likewise.
+
+ Backported from trunk:
+ 2025-01-16 Thomas Schwinge <tho...@codesourcery.com>
+
+ * gfortran.dg/goacc/assumed.f95: Use relative line numbers for a
+ few DejaGnu directives.
+ * gfortran.dg/goacc/list.f95: Likewise.
+ * gfortran.dg/goacc/loop-1-2.f95: Likewise.
+ * gfortran.dg/goacc/loop-1.f95: Likewise.
+ * gfortran.dg/goacc/reduction.f95: Likewise.
+
+ Backported from trunk:
+ 2025-01-10 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * gcc.target/nvptx/__builtin_frame_address_0-1.c: New.
+
+ Backported from trunk:
+ 2025-01-10 Thomas Schwinge <tschwi...@baylibre.com>
+
+ * gcc.target/nvptx/__builtin_stack_address-1.c: New.
+
+ Backported from trunk:
+ 2025-01-08 Thomas Schwinge <tho...@codesourcery.com>
+
+ * gcc.dg/torture/stackalign/global-1.c: Re-enable for nvptx.
+ * gcc.dg/torture/stackalign/inline-1.c: Likewise.
+ * gcc.dg/torture/stackalign/nested-1.c: Likewise.
+ * gcc.dg/torture/stackalign/nested-2.c: Likewise.
+ * gcc.dg/torture/stackalign/nested-4.c: Likewise.
+ * gcc.dg/torture/stackalign/pr16660-1.c: Likewise.
+ * gcc.dg/torture/stackalign/pr16660-2.c: Likewise.
+ * gcc.dg/torture/stackalign/pr16660-3.c: Likewise.
+ * gcc.dg/torture/stackalign/ret-struct-1.c: Likewise.
+ * gcc.dg/torture/stackalign/struct-1.c: Likewise.
+
+ Backported from trunk:
+ 2024-09-24 Prathamesh Kulkarni <prathame...@nvidia.com>
+ Thomas Schwinge <tschwi...@baylibre.com>
+
+ PR target/104957
+ * gcc.target/nvptx/alias-to-alias-1.c: Adjust.
+
+ Backported from trunk:
+ 2024-09-05 Thomas Schwinge <tschwi...@baylibre.com>
+
+ PR target/104957
+ * g++.target/nvptx/alias-g++.dg_init_dtor2-1.C: Un-XFAIL.
+ * gcc.target/nvptx/alias-1.c: Likewise.
+ * gcc.target/nvptx/alias-3.c: Likewise.
+ * gcc.target/nvptx/alias-to-alias-1.c: Likewise.
+
+ Backported from trunk:
+ 2024-09-05 Thomas Schwinge <tschwi...@baylibre.com>
+
+ PR target/104957
+ * g++.target/nvptx/alias-g++.dg_init_dtor2-1.C: Add.
+
+ Backported from trunk:
+ 2024-09-05 Thomas Schwinge <tschwi...@baylibre.com>
+
+ PR target/104957
+ * gcc.target/nvptx/alias-1.c: Enhance assembler scanning.
+ * gcc.target/nvptx/alias-2.c: Likewise.
+ * gcc.target/nvptx/alias-3.c: Likewise.
+ * gcc.target/nvptx/alias-4.c: Likewise.
+ * gcc.target/nvptx/alias-to-alias-1.c: Likewise.
+
+ Backported from trunk:
+ 2024-09-05 Thomas Schwinge <tho...@codesourcery.com>
+
+ PR target/104957
+ * gcc.target/nvptx/alias-2.c: Fix comment.
+
+ 2025-02-18 Tobias Burnus <tbur...@baylibre.com>
+
+ Backported from master:
+ 2025-02-17 Tobias Burnus <tbur...@baylibre.com>
+
+ PR fortran/115271
+ * gfortran.dg/gomp/adjust-args-1.f90: Update dg-.* expectations.
+ * gfortran.dg/gomp/adjust-args-2.f90: Likewise.
+ * gfortran.dg/gomp/adjust-args-2a.f90: Likewise.
+ * gfortran.dg/gomp/adjust-args-3.f90: Likewise.
+ * gfortran.dg/gomp/adjust-args-4.f90: Remove array from c_ptr.
+ * gfortran.dg/gomp/adjust-args-5.f90: Likewise.
+ * gfortran.dg/gomp/adjust-args-11.f90: Likewise. Add check that
+ INTERFACE is now handled in subroutines and in modules.
+ * gfortran.dg/gomp/adjust-args-13.f90: New test.
+ * gfortran.dg/gomp/adjust-args-14.f90: New test.
+ * gfortran.dg/gomp/adjust-args-15.f90: New test.
+ * gfortran.dg/gomp/declare-variant-21.f90: New test.
+
2025-02-12 Tobias Burnus <tbur...@baylibre.com>
Backported from master:
