From 4fbef612ca1adb71c90eab0d6a682ec6af5b7c93 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Fri, 5 Mar 2021 20:57:54 +0100 Subject: [PATCH] PR libfortran/99218 - matmul on temporary array accesses invalid memory Do not invoke tuned rank-2 times rank-2 matmul if rank(b) == 1. libgfortran/ChangeLog: PR libfortran/99218 * m4/matmul_internal.m4: Invoke tuned matmul only for rank(b)>1. * generated/matmul_c10.c: Regenerated. * generated/matmul_c16.c: Likewise. * generated/matmul_c4.c: Likewise. * generated/matmul_c8.c: Likewise. * generated/matmul_i1.c: Likewise. * generated/matmul_i16.c: Likewise. * generated/matmul_i2.c: Likewise. * generated/matmul_i4.c: Likewise. * generated/matmul_i8.c: Likewise. * generated/matmul_r10.c: Likewise. * generated/matmul_r16.c: Likewise. * generated/matmul_r4.c: Likewise. * generated/matmul_r8.c: Likewise. * generated/matmulavx128_c10.c: Likewise. * generated/matmulavx128_c16.c: Likewise. * generated/matmulavx128_c4.c: Likewise. * generated/matmulavx128_c8.c: Likewise. * generated/matmulavx128_i1.c: Likewise. * generated/matmulavx128_i16.c: Likewise. * generated/matmulavx128_i2.c: Likewise. * generated/matmulavx128_i4.c: Likewise. * generated/matmulavx128_i8.c: Likewise. * generated/matmulavx128_r10.c: Likewise. * generated/matmulavx128_r16.c: Likewise. * generated/matmulavx128_r4.c: Likewise. * generated/matmulavx128_r8.c: Likewise. gcc/testsuite/ChangeLog: PR libfortran/99218 * gfortran.dg/matmul_21.f90: New test. (cherry picked from commit b1bee29167df6b0fbc9a4c8d06e2acbf3367af47) --- gcc/testsuite/gfortran.dg/matmul_21.f90 | 15 +++++++++++++++ libgfortran/generated/matmul_c10.c | 15 ++++++++++----- libgfortran/generated/matmul_c16.c | 15 ++++++++++----- libgfortran/generated/matmul_c4.c | 15 ++++++++++----- libgfortran/generated/matmul_c8.c | 15 ++++++++++----- libgfortran/generated/matmul_i1.c | 15 ++++++++++----- libgfortran/generated/matmul_i16.c | 15 ++++++++++----- libgfortran/generated/matmul_i2.c | 15 ++++++++++----- libgfortran/generated/matmul_i4.c | 15 ++++++++++----- libgfortran/generated/matmul_i8.c | 15 ++++++++++----- libgfortran/generated/matmul_r10.c | 15 ++++++++++----- libgfortran/generated/matmul_r16.c | 15 ++++++++++----- libgfortran/generated/matmul_r4.c | 15 ++++++++++----- libgfortran/generated/matmul_r8.c | 15 ++++++++++----- libgfortran/generated/matmulavx128_c10.c | 6 ++++-- libgfortran/generated/matmulavx128_c16.c | 6 ++++-- libgfortran/generated/matmulavx128_c4.c | 6 ++++-- libgfortran/generated/matmulavx128_c8.c | 6 ++++-- libgfortran/generated/matmulavx128_i1.c | 6 ++++-- libgfortran/generated/matmulavx128_i16.c | 6 ++++-- libgfortran/generated/matmulavx128_i2.c | 6 ++++-- libgfortran/generated/matmulavx128_i4.c | 6 ++++-- libgfortran/generated/matmulavx128_i8.c | 6 ++++-- libgfortran/generated/matmulavx128_r10.c | 6 ++++-- libgfortran/generated/matmulavx128_r16.c | 6 ++++-- libgfortran/generated/matmulavx128_r4.c | 6 ++++-- libgfortran/generated/matmulavx128_r8.c | 6 ++++-- libgfortran/m4/matmul_internal.m4 | 3 ++- 28 files changed, 199 insertions(+), 92 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/matmul_21.f90 diff --git a/gcc/testsuite/gfortran.dg/matmul_21.f90 b/gcc/testsuite/gfortran.dg/matmul_21.f90 new file mode 100644 index 000000000000..505f4d555f82 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_21.f90 @@ -0,0 +1,15 @@ +! { dg-do run } +! PR libfortran/99218 - matmul on temporary array accesses invalid memory + +program p + implicit none + integer, parameter :: nState = 300000 + integer, parameter :: nCon = 1 + real, parameter :: ZERO = 0.0 + real :: G(nCon,nState) = ZERO + real :: H(nState,nCon) = ZERO + real :: lambda(nCon) = ZERO + real :: f(nState) = ZERO + f = matmul (transpose (G), lambda) + if (f(1) /= ZERO) stop 1 +end program diff --git a/libgfortran/generated/matmul_c10.c b/libgfortran/generated/matmul_c10.c index 5a97ef5783c1..404b84aed818 100644 --- a/libgfortran/generated/matmul_c10.c +++ b/libgfortran/generated/matmul_c10.c @@ -276,7 +276,8 @@ matmul_c10_avx (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_c10_avx2 (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_c10_avx512f (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_c10_vanilla (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_c10 (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_c16.c b/libgfortran/generated/matmul_c16.c index 6dfef172498e..debcb3d9e5af 100644 --- a/libgfortran/generated/matmul_c16.c +++ b/libgfortran/generated/matmul_c16.c @@ -276,7 +276,8 @@ matmul_c16_avx (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_c16_avx2 (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_c16_avx512f (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_c16_vanilla (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_c16 (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c index 08f7874e42fb..e20025d7b71c 100644 --- a/libgfortran/generated/matmul_c4.c +++ b/libgfortran/generated/matmul_c4.c @@ -276,7 +276,8 @@ matmul_c4_avx (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_c4_avx2 (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_c4_avx512f (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_c4_vanilla (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_c4 (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c index 4529a0fbc76b..f7c3667de6eb 100644 --- a/libgfortran/generated/matmul_c8.c +++ b/libgfortran/generated/matmul_c8.c @@ -276,7 +276,8 @@ matmul_c8_avx (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_c8_avx2 (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_c8_avx512f (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_c8_vanilla (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_c8 (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_i1.c b/libgfortran/generated/matmul_i1.c index 9e0b80d2af3b..df852a891271 100644 --- a/libgfortran/generated/matmul_i1.c +++ b/libgfortran/generated/matmul_i1.c @@ -276,7 +276,8 @@ matmul_i1_avx (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_i1_avx2 (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_i1_avx512f (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_i1_vanilla (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_i1 (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_i16.c b/libgfortran/generated/matmul_i16.c index 7e4e30585311..67c9cdda4933 100644 --- a/libgfortran/generated/matmul_i16.c +++ b/libgfortran/generated/matmul_i16.c @@ -276,7 +276,8 @@ matmul_i16_avx (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_i16_avx2 (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_i16_avx512f (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_i16_vanilla (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_i16 (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_i2.c b/libgfortran/generated/matmul_i2.c index cf2eb3a1de3f..ff78d8d9feab 100644 --- a/libgfortran/generated/matmul_i2.c +++ b/libgfortran/generated/matmul_i2.c @@ -276,7 +276,8 @@ matmul_i2_avx (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_i2_avx2 (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_i2_avx512f (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_i2_vanilla (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_i2 (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c index 7014ee74424f..9825342f88f3 100644 --- a/libgfortran/generated/matmul_i4.c +++ b/libgfortran/generated/matmul_i4.c @@ -276,7 +276,8 @@ matmul_i4_avx (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_i4_avx2 (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_i4_avx512f (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_i4_vanilla (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_i4 (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c index ee456d0b00fd..53ac482642c5 100644 --- a/libgfortran/generated/matmul_i8.c +++ b/libgfortran/generated/matmul_i8.c @@ -276,7 +276,8 @@ matmul_i8_avx (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_i8_avx2 (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_i8_avx512f (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_i8_vanilla (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_i8 (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_r10.c b/libgfortran/generated/matmul_r10.c index a0be38e8894d..25179ebdd6eb 100644 --- a/libgfortran/generated/matmul_r10.c +++ b/libgfortran/generated/matmul_r10.c @@ -276,7 +276,8 @@ matmul_r10_avx (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_r10_avx2 (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_r10_avx512f (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_r10_vanilla (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_r10 (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_r16.c b/libgfortran/generated/matmul_r16.c index 6d050eef7e0b..29a25be6062e 100644 --- a/libgfortran/generated/matmul_r16.c +++ b/libgfortran/generated/matmul_r16.c @@ -276,7 +276,8 @@ matmul_r16_avx (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_r16_avx2 (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_r16_avx512f (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_r16_vanilla (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_r16 (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c index ed39fb3c3c57..0b471ab77ecd 100644 --- a/libgfortran/generated/matmul_r4.c +++ b/libgfortran/generated/matmul_r4.c @@ -276,7 +276,8 @@ matmul_r4_avx (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_r4_avx2 (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_r4_avx512f (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_r4_vanilla (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_r4 (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c index 53fba2faefab..25438ebe0801 100644 --- a/libgfortran/generated/matmul_r8.c +++ b/libgfortran/generated/matmul_r8.c @@ -276,7 +276,8 @@ matmul_r8_avx (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -844,7 +845,8 @@ matmul_r8_avx2 (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1412,7 +1414,8 @@ matmul_r8_avx512f (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -1994,7 +1997,8 @@ matmul_r8_vanilla (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -2636,7 +2640,8 @@ matmul_r8 (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_c10.c b/libgfortran/generated/matmulavx128_c10.c index d0b417c39fd3..be41749379d1 100644 --- a/libgfortran/generated/matmulavx128_c10.c +++ b/libgfortran/generated/matmulavx128_c10.c @@ -241,7 +241,8 @@ matmul_c10_avx128_fma3 (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_c10_avx128_fma4 (gfc_array_c10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_c16.c b/libgfortran/generated/matmulavx128_c16.c index 0137ba550e4a..5adf17fdad17 100644 --- a/libgfortran/generated/matmulavx128_c16.c +++ b/libgfortran/generated/matmulavx128_c16.c @@ -241,7 +241,8 @@ matmul_c16_avx128_fma3 (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_c16_avx128_fma4 (gfc_array_c16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_c4.c b/libgfortran/generated/matmulavx128_c4.c index 850bd2ba1db9..fa33173580a9 100644 --- a/libgfortran/generated/matmulavx128_c4.c +++ b/libgfortran/generated/matmulavx128_c4.c @@ -241,7 +241,8 @@ matmul_c4_avx128_fma3 (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_c4_avx128_fma4 (gfc_array_c4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_c8.c b/libgfortran/generated/matmulavx128_c8.c index 49d8b446ad95..50488167f513 100644 --- a/libgfortran/generated/matmulavx128_c8.c +++ b/libgfortran/generated/matmulavx128_c8.c @@ -241,7 +241,8 @@ matmul_c8_avx128_fma3 (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_c8_avx128_fma4 (gfc_array_c8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_i1.c b/libgfortran/generated/matmulavx128_i1.c index 8fc6d921b007..72b030e9a6f6 100644 --- a/libgfortran/generated/matmulavx128_i1.c +++ b/libgfortran/generated/matmulavx128_i1.c @@ -241,7 +241,8 @@ matmul_i1_avx128_fma3 (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_i1_avx128_fma4 (gfc_array_i1 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_i16.c b/libgfortran/generated/matmulavx128_i16.c index a3495570d528..872185f4be86 100644 --- a/libgfortran/generated/matmulavx128_i16.c +++ b/libgfortran/generated/matmulavx128_i16.c @@ -241,7 +241,8 @@ matmul_i16_avx128_fma3 (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_i16_avx128_fma4 (gfc_array_i16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_i2.c b/libgfortran/generated/matmulavx128_i2.c index 944eaf08cd17..3c5aecbb9ccc 100644 --- a/libgfortran/generated/matmulavx128_i2.c +++ b/libgfortran/generated/matmulavx128_i2.c @@ -241,7 +241,8 @@ matmul_i2_avx128_fma3 (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_i2_avx128_fma4 (gfc_array_i2 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_i4.c b/libgfortran/generated/matmulavx128_i4.c index a8e270dd97c1..6b7ba465ed54 100644 --- a/libgfortran/generated/matmulavx128_i4.c +++ b/libgfortran/generated/matmulavx128_i4.c @@ -241,7 +241,8 @@ matmul_i4_avx128_fma3 (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_i4_avx128_fma4 (gfc_array_i4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_i8.c b/libgfortran/generated/matmulavx128_i8.c index 9c7f4925687e..d13d4bd468f9 100644 --- a/libgfortran/generated/matmulavx128_i8.c +++ b/libgfortran/generated/matmulavx128_i8.c @@ -241,7 +241,8 @@ matmul_i8_avx128_fma3 (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_i8_avx128_fma4 (gfc_array_i8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_r10.c b/libgfortran/generated/matmulavx128_r10.c index e2a44cf7e0dd..f36a2b59b40d 100644 --- a/libgfortran/generated/matmulavx128_r10.c +++ b/libgfortran/generated/matmulavx128_r10.c @@ -241,7 +241,8 @@ matmul_r10_avx128_fma3 (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_r10_avx128_fma4 (gfc_array_r10 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_r16.c b/libgfortran/generated/matmulavx128_r16.c index 186b226ebc7e..889cf98bce32 100644 --- a/libgfortran/generated/matmulavx128_r16.c +++ b/libgfortran/generated/matmulavx128_r16.c @@ -241,7 +241,8 @@ matmul_r16_avx128_fma3 (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_r16_avx128_fma4 (gfc_array_r16 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_r4.c b/libgfortran/generated/matmulavx128_r4.c index e21ea39f1245..c6e55d96326e 100644 --- a/libgfortran/generated/matmulavx128_r4.c +++ b/libgfortran/generated/matmulavx128_r4.c @@ -241,7 +241,8 @@ matmul_r4_avx128_fma3 (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_r4_avx128_fma4 (gfc_array_r4 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/generated/matmulavx128_r8.c b/libgfortran/generated/matmulavx128_r8.c index e7efd0758899..3b7ce0b41f54 100644 --- a/libgfortran/generated/matmulavx128_r8.c +++ b/libgfortran/generated/matmulavx128_r8.c @@ -241,7 +241,8 @@ matmul_r8_avx128_fma3 (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 @@ -810,7 +811,8 @@ matmul_r8_avx128_fma4 (gfc_array_r8 * const restrict retarray, } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 diff --git a/libgfortran/m4/matmul_internal.m4 b/libgfortran/m4/matmul_internal.m4 index 13fd7696238b..0e96207a0fc0 100644 --- a/libgfortran/m4/matmul_internal.m4 +++ b/libgfortran/m4/matmul_internal.m4 @@ -192,7 +192,8 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl } } - if (rxstride == 1 && axstride == 1 && bxstride == 1) + if (rxstride == 1 && axstride == 1 && bxstride == 1 + && GFC_DESCRIPTOR_RANK (b) != 1) { /* This block of code implements a tuned matmul, derived from Superscalar GEMM-based level 3 BLAS, Beta version 0.1 -- 2.47.2