From c6b9e849c04bfb994b72910346cbe24cf8feabd5 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Mon, 1 May 2017 17:45:52 +0000 Subject: [PATCH] re PR fortran/37131 (inline matmul for small matrix sizes) 2017-05-01 Thomas Koenig PR fortran/37131 * frontend-passes.c (inline_matmul_assign): Also check bounds for allocatable lhs and matrix-vector-multiplication. 2017-05-01 Thomas Koenig PR fortran/37131 * gfortran.dg/matmul_bounds_11.f90: New test. From-SVN: r247441 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/frontend-passes.c | 5 +++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/matmul_bounds_11.f90 | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/matmul_bounds_11.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c5ed5071b09..1cc78c94b03 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2017-05-01 Thomas Koenig + + PR fortran/37131 + * frontend-passes.c (inline_matmul_assign): Also check bounds + for allocatable lhs and matrix-vector-multiplication. + 2017-04-23 Jerry DeLisle PR fortran/80484 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 459967d5c35..069ec286dd1 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -3066,9 +3066,10 @@ inline_matmul_assign (gfc_code **c, int *walk_subtrees, gfc_code *lhs_alloc; /* Only need to check a single dimension for the A2B2 case for - bounds checking, the rest will be allocated. */ + bounds checking, the rest will be allocated. Also check this + for A2B1. */ - if (gfc_option.rtcheck & GFC_RTCHECK_BOUNDS && m_case == A2B2) + if ((gfc_option.rtcheck & GFC_RTCHECK_BOUNDS) && (m_case == A2B2 || m_case == A2B1)) { gfc_code *test; gfc_expr *a2, *b1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e0e04f35465..584eae59c68 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-05-01 Thomas Koenig + + PR fortran/37131 + * gfortran.dg/matmul_bounds_11.f90: New test. + 2017-05-01 Martin Sebor PR tree-optimization/79715 diff --git a/gcc/testsuite/gfortran.dg/matmul_bounds_11.f90 b/gcc/testsuite/gfortran.dg/matmul_bounds_11.f90 new file mode 100644 index 00000000000..9209760e50b --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_bounds_11.f90 @@ -0,0 +1,15 @@ +! { dg-do run } +! { dg-options "-O -finline-matmul-limit=30 -fcheck=all" } +! { dg-shouldfail "Dimension of array B incorrect in MATMUL intrinsic" } +program main + real, dimension(:,:), allocatable :: a + real, dimension(:), allocatable :: b + real, dimension(:), allocatable :: res + allocate (a(2,2), b(3)) + call random_number(a) + call random_number(b) + res = matmul(a,b) + print *,res +end program main +! { dg-output "Fortran runtime error: Dimension of array B incorrect in MATMUL intrinsic.*" } + -- 2.30.2