diff mbox series

[committed,Fortran] Disable front-end optimization for OpenACC atomic (PR93462)

Message ID eda5a121-fca8-e378-0f30-4e6f57edd7d5@codesourcery.com
State New
Headers show
Series [committed,Fortran] Disable front-end optimization for OpenACC atomic (PR93462) | expand

Commit Message

Tobias Burnus Jan. 31, 2020, 2:55 p.m. UTC 
The OpenACC code
!$acc atomic write
    a = f(n) - f(n)
got -ffrontend-optimize'd such that it ICEed in gfc_trans_omp_atomic.

The same issue occurred for OpenMP in PR 92977 and was solved by
disabling the optimization for EXEC_OMP_ATOMIC.

This patch does now the same for OpenACC (EXEC_OACC_ATOMIC).

Committed as obvious to the trunk.

Tobias
diff mbox series

Patch

commit 6a97d9eae4543a995f895e6739530f55f5d039a7
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Fri Jan 31 15:54:21 2020 +0100

    [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(-)

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  <tobias@codesourcery.com>
+
+	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  <aldot@gcc.gnu.org>
 
 	PR fortran/87103
@@ -25,11 +31,11 @@ 
 
 2020-01-28  Andrew Benson  <abensonca@gmail.com>
 
-        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  <abensonca@gmail.com>
 
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  <tobias@codesourcery.com>
+
+	PR fortran/93462
+	* gfortran.dg/goacc/atomic-1.f90: New.
+
 2020-01-31  Tamar Christina  <tamar.christina@arm.com>
 
 	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