Fixed with commit Rev. 265175 as attached.
Cheers
Tobias
Dominique d'Humières wrote:
Le 14 oct. 2018 à 00:43, Tobias Burnus <bur...@net-b.de> a écrit :
Dominique d'Humières wrote:
UNRESOLVED: gfortran.dg/inline_matmul_24.f90 -O0 scan-tree-dump-times optimized
"gamma5[__var_1_do \\\\* 4 \\\\+ __var_2_do]" 1
! { dg-final { scan-tree-dump-times "gamma5\[__var_1_do \\* 4 \\+ __var_2_do\]" 1
"optimized" } }
Shouldn’t -fdump-tree-original be -fdump-tree-optimized?
As it is a front-end optimization (which is explicitly enabled),
-fdump-tree-original should work (and avoids issues with further later
optimizations).
What do you get on your system? Seemingly something else than I do. Can you
look for the gamma5 line in your dump?
Tobias
Then
! { dg-final { scan-tree-dump-times "gamma5\[__var_1_do \\* 4 \\+ __var_2_do\]" 1
"optimized" } }
should be
! { dg-final { scan-tree-dump-times "gamma5\[__var_1_do \\* 4 \\+ __var_2_do\]" 1
"original" } }
isn’t it?
see https://gcc.gnu.org/ml/gcc-testresults/2018-10/msg01721.html for non darwin
log.
Dominique
2018-10-12 Tobias Burnus <bur...@net-b.de>
PR fortran/87597
* expr.c (gfc_simplify_expr): Avoid simplifying
the 'array' argument to lbound/ubound/lcobound/
ucobound.
PR fortran/87597
* gfortran.dg/inline_matmul_24.f90: New.
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 1cfda5fbfed..ca6f95d9d8e 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1937,7 +1937,20 @@ gfc_simplify_expr (gfc_expr *p, int type)
break;
case EXPR_FUNCTION:
- for (ap = p->value.function.actual; ap; ap = ap->next)
+ // For array-bound functions, we don't need to optimize
+ // the 'array' argument. In particular, if the argument
+ // is a PARAMETER, simplifying might convert an EXPR_VARIABLE
+ // into an EXPR_ARRAY; the latter has lbound = 1, the former
+ // can have any lbound.
+ ap = p->value.function.actual;
+ if (p->value.function.isym &&
+ (p->value.function.isym->id == GFC_ISYM_LBOUND
+ || p->value.function.isym->id == GFC_ISYM_UBOUND
+ || p->value.function.isym->id == GFC_ISYM_LCOBOUND
+ || p->value.function.isym->id == GFC_ISYM_UCOBOUND))
+ ap = ap->next;
+
+ for ( ; ap; ap = ap->next)
if (!gfc_simplify_expr (ap->expr, type))
return false;
diff --git a/gcc/testsuite/gfortran.dg/inline_matmul_24.f90 b/gcc/testsuite/gfortran.dg/inline_matmul_24.f90
new file mode 100644
index 00000000000..067f6daf200
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/inline_matmul_24.f90
@@ -0,0 +1,42 @@
+! { dg-do run }
+! { dg-options "-ffrontend-optimize -fdump-tree-original" }
+!
+! PR fortran/87597
+!
+! Contributed by gallmeister
+!
+! Before, for the inlined matmul,
+! gamma5 was converted to an EXPR_ARRAY with lbound = 1
+! instead of the lbound = 0 as declared; leading to
+! an off-by-one problem.
+!
+program testMATMUL
+ implicit none
+ complex, dimension(0:3,0:3), parameter :: gamma5 = reshape((/ 0., 0., 1., 0., &
+ 0., 0., 0., 1., &
+ 1., 0., 0., 0., &
+ 0., 1., 0., 0. /),(/4,4/))
+ complex, dimension(0:3,0:3) :: A, B, D
+ integer :: i
+
+ A = 0.0
+ do i=0,3
+ A(i,i) = i*1.0
+ end do
+
+ B = cmplx(7,-9)
+ B = matmul(A,gamma5)
+
+ D = reshape([0, 0, 2, 0, &
+ 0, 0, 0, 3, &
+ 0, 0, 0, 0, &
+ 0, 1, 0, 0], [4, 4])
+ write(*,*) B(0,:)
+ write(*,*) B(1,:)
+ write(*,*) B(2,:)
+ write(*,*) B(3,:)
+ if (any(B /= D)) then
+ call abort()
+ end if
+end program testMATMUL
+! { dg-final { scan-tree-dump-times "gamma5\[__var_1_do \\* 4 \\+ __var_2_do\]" 1 "optimized" } }
