diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2006-09-10 17:21:44 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2006-09-10 17:21:44 +0000 |
| commit | f0e871d647e8ccdf048be36ba9196f410adc677a (patch) | |
| tree | 8042aa969d343b56b5ee82785eb2c28922abe06c /libgfortran/m4 | |
| parent | 380bfbbd61795428e53826d379ce1f4bfe1768f0 (diff) | |
| download | gcc-f0e871d647e8ccdf048be36ba9196f410adc677a.zip gcc-f0e871d647e8ccdf048be36ba9196f410adc677a.tar.gz gcc-f0e871d647e8ccdf048be36ba9196f410adc677a.tar.bz2 | |
re PR fortran/28947 (Double MATMUL() uses wrong array elements)
2006-09-10 Paul Thomas <pault@gcc.gnu.org>
PR libfortran/28947
* m4/matmul.m4: For the case where the second input argument is
transposed, ensure that the case with rank (a) == 1 is
correctly calculated.
* generated/matmul_r4.c: Regenerate.
* generated/matmul_r8.c: Regenerate.
* generated/matmul_r10.c: Regenerate.
* generated/matmul_r16.c: Regenerate.
* generated/matmul_c4.c: Regenerate.
* generated/matmul_c8.c: Regenerate.
* generated/matmul_c10.c: Regenerate.
* generated/matmul_c16.c: Regenerate.
* generated/matmul_i4.c: Regenerate.
* generated/matmul_i8.c: Regenerate.
* generated/matmul_i16.c: Regenerate.
2006-09-10 Paul Thomas <pault@gcc.gnu.org>
PR libfortran/28947
gfortran.dg/matmul_4.f90: New test.
From-SVN: r116817
Diffstat (limited to 'libgfortran/m4')
| -rw-r--r-- | libgfortran/m4/matmul.m4 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libgfortran/m4/matmul.m4 b/libgfortran/m4/matmul.m4 index f55e2cf..3678c63 100644 --- a/libgfortran/m4/matmul.m4 +++ b/libgfortran/m4/matmul.m4 @@ -260,6 +260,20 @@ sinclude(`matmul_asm_'rtype_code`.m4')dnl /* dest[x,y] += a[x,n] * b[n,y] */ dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride]; } + else if (GFC_DESCRIPTOR_RANK (a) == 1) + { + const rtype_name *restrict bbase_y; + rtype_name s; + + for (y = 0; y < ycount; y++) + { + bbase_y = &bbase[y*bystride]; + s = (rtype_name) 0; + for (n = 0; n < count; n++) + s += abase[n*axstride] * bbase_y[n*bxstride]; + dest[y*rxstride] = s; + } + } else { const rtype_name *restrict abase_x; |