diff options
author | Harald Anlauf <anlauf@gmx.de> | 2021-03-05 20:57:54 +0100 |
---|---|---|
committer | Harald Anlauf <anlauf@gmx.de> | 2021-03-05 20:58:51 +0100 |
commit | b1bee29167df6b0fbc9a4c8d06e2acbf3367af47 (patch) | |
tree | 8aae97a3dafec5216e08b79398a9edbc57c3363e /libgfortran/generated/matmul_i4.c | |
parent | 1e5cdb9f896fb220b26fd2080406504c4badf5af (diff) | |
download | gcc-b1bee29167df6b0fbc9a4c8d06e2acbf3367af47.tar.gz |
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.
Diffstat (limited to 'libgfortran/generated/matmul_i4.c')
-rw-r--r-- | libgfortran/generated/matmul_i4.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c index b5f83d5453c..a33bb6afaa6 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 @@ -2635,7 +2639,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 |