diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-12-25 10:12:41 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-12-25 10:12:41 +0000 |
| commit | 83fc1a28ee38afd5df7e7c87939d5a32e17fee96 (patch) | |
| tree | c1fe36d9fd32f8ae0900595a250297afb4db485e /gcc | |
| parent | 9c609d26c786f370ad281e2f808baa3cd867a51a (diff) | |
| download | gcc-83fc1a28ee38afd5df7e7c87939d5a32e17fee96.tar.gz | |
2007-12-25 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-25 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/34566
* gfortran.dg/matmul_6.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131167 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/matmul_6.f90 | 66 |
2 files changed, 71 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9f5aa260888..4bfd5232c20 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-12-25 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR libfortran/34566 + * gfortran.dg/matmul_6.f90: New test. + 2007-12-23 Tobias Burnus <burnus@net-b.de> PR fortran/34421 diff --git a/gcc/testsuite/gfortran.dg/matmul_6.f90 b/gcc/testsuite/gfortran.dg/matmul_6.f90 new file mode 100644 index 00000000000..737c5c43759 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/matmul_6.f90 @@ -0,0 +1,66 @@ +! { 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 + call abort + 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 + call abort + end if + if (any(matmul(l1,lv) .neqv. (matmul(m1,iv) /= 0))) then + call abort + 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 |