From 6a97d9eae4543a995f895e6739530f55f5d039a7 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 31 Jan 2020 15:54:21 +0100 Subject: [PATCH] [Fortran] Disable front-end optimization for OpenACC atomic (PR93462) PR fortran/93462 * frontend-passes.c (gfc_code_walker): For EXEC_OACC_ATOMIC, set in_omp_atomic to true prevent front-end optimization. PR fortran/93462 * gfortran.dg/goacc/atomic-1.f90: New. --- gcc/fortran/ChangeLog | 16 +++++++++++----- gcc/fortran/frontend-passes.c | 1 + gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b8f70e6140f..9b17daf15f9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2020-01-31 Tobias Burnus + + PR fortran/93462 + * frontend-passes.c (gfc_code_walker): For EXEC_OACC_ATOMIC, set + in_omp_atomic to true prevent front-end optimization. + 2020-01-30 Bernhard Reutner-Fischer PR fortran/87103 @@ -25,11 +31,11 @@ 2020-01-28 Andrew Benson - PR fortran/93461 - * trans.h: Increase GFC_MAX_MANGLED_SYMBOL_LEN to - GFC_MAX_SYMBOL_LEN*3+5 to allow for inclusion of submodule name, - plus the "." between module and submodule names. - * gfortran.dg/pr93461.f90: New test. + PR fortran/93461 + * trans.h: Increase GFC_MAX_MANGLED_SYMBOL_LEN to + GFC_MAX_SYMBOL_LEN*3+5 to allow for inclusion of submodule name, + plus the "." between module and submodule names. + * gfortran.dg/pr93461.f90: New test. 2020-01-28 Andrew Benson diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index de11524ba14..bbe34d61c99 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -5258,6 +5258,7 @@ gfc_code_walker (gfc_code **c, walk_code_fn_t codefn, walk_expr_fn_t exprfn, WALK_SUBEXPR (co->ext.dt->extra_comma); break; + case EXEC_OACC_ATOMIC: case EXEC_OMP_ATOMIC: in_omp_atomic = true; break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8b1dcf23855..f95d2d4e069 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-01-31 Tobias Burnus + + PR fortran/93462 + * gfortran.dg/goacc/atomic-1.f90: New. + 2020-01-31 Tamar Christina PR rtl-optimization/91838 diff --git a/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 b/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 new file mode 100644 index 00000000000..579f0494b78 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/goacc/atomic-1.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! +! PR fortran/93462 +! +! Contributed by G. Steinmetz +! +program p + integer :: n = 1 + integer :: a +!$acc atomic write + a = f(n) - f(n) +contains + integer function f(x) + integer, intent(in) :: x + f = x + end +end -- 2.30.2