This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch, libfortran] Fix PR 34566
- From: Thomas Koenig <tkoenig at netcologne dot de>
- To: fortran at gcc dot gnu dot org
- Cc: gcc-patches at gcc dot gnu dot org
- Date: Mon, 24 Dec 2007 01:06:28 +0100
- Subject: [patch, libfortran] Fix PR 34566
:ADDPATCH fortran:
Hello world,
this fixes PR 34566, a wrong-code regression. Regression-tested
on i686-pc-linux-gnu.
OK for trunk?
Thomas
2007-12-24 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/34566
* m4/matmull.m4: Multiply xstride and ystride by correct kind.
* generated/matmul_l4.c: Regenerated.
* generated/matmul_l8.c: Regenerated.
* generated/matmul_l16.c: Regenerated.
2007-12-24 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/34566
* gfortran.dg/matmul_6.f90: New test.
Index: m4/matmull.m4
===================================================================
--- m4/matmull.m4 (revision 131146)
+++ m4/matmull.m4 (working copy)
@@ -154,7 +154,7 @@ sinclude(`matmul_asm_'rtype_code`.m4')dn
{
astride = a->dim[1].stride * a_kind;
count = a->dim[1].ubound + 1 - a->dim[1].lbound;
- xstride = a->dim[0].stride;
+ xstride = a->dim[0].stride * a_kind;
xcount = a->dim[0].ubound + 1 - a->dim[0].lbound;
}
if (GFC_DESCRIPTOR_RANK (b) == 1)
@@ -169,7 +169,7 @@ sinclude(`matmul_asm_'rtype_code`.m4')dn
{
bstride = b->dim[0].stride * b_kind;
assert(count == b->dim[0].ubound + 1 - b->dim[0].lbound);
- ystride = b->dim[1].stride;
+ ystride = b->dim[1].stride * b_kind;
ycount = b->dim[1].ubound + 1 - b->dim[1].lbound;
}
! { dg-do run }
! PR 34566 - logical matmul used to give the wrong result.
! We check this by running through every permutation in
! multiplying two 3*3 matrices, and all permutations of multiplying
! a 3-vector and a 3*3 matrices and checking against equivalence
! with integer matrix multiply.
program main
implicit none
integer, parameter :: ki=4
integer, parameter :: dimen=3
integer :: i, j, k
real, dimension(dimen,dimen) :: r1, r2
integer, dimension(dimen,dimen) :: m1, m2
logical(kind=ki), dimension(dimen,dimen) :: l1, l2
logical(kind=ki), dimension(dimen*dimen) :: laux
logical(kind=ki), dimension(dimen) :: lv
integer, dimension(dimen) :: iv
do i=0,2**(dimen*dimen)-1
forall (k=1:dimen*dimen)
laux(k) = btest(i, k-1)
end forall
l1 = reshape(laux,shape(l1))
m1 = ltoi(l1)
! Check matrix*matrix multiply
do j=0,2**(dimen*dimen)-1
forall (k=1:dimen*dimen)
laux(k) = btest(i, k-1)
end forall
l2 = reshape(laux,shape(l2))
m2 = ltoi(l2)
if (any(matmul(l1,l2) .neqv. (matmul(m1,m2) /= 0))) then
print *,l1
print *,l2
stop
end if
end do
! Check vector*matrix and matrix*vector multiply.
do j=0,2**dimen-1
forall (k=1:dimen)
lv(k) = btest(j, k-1)
end forall
iv = ltoi(lv)
if (any(matmul(lv,l1) .neqv. (matmul(iv,m1) /=0))) then
print *,lv
print *,l1
end if
if (any(matmul(l1,lv) .neqv. (matmul(m1,iv) /= 0))) then
print *,l1
print *,lv
end if
end do
end do
contains
elemental function ltoi(v)
implicit none
integer :: ltoi
real :: rtoi
logical(kind=4), intent(in) :: v
if (v) then
ltoi = 1
else
ltoi = 0
end if
end function ltoi
end program main