2004-05-13 08:41:07 +02:00
|
|
|
`/* Implementation of the MATMUL intrinsic
|
normalize.c (almostone_r4, [...]): Fix parameter list.
* runtime/normalize.c (almostone_r4, almostone_r8): Fix parameter
list.
* intrinsics/random.c (KISS_DEFAULT_SEED): Remove extra semicolon.
* io/transfer.c: Do not use empty initializers for global objects.
Add missing initializers.
* io/lock.c: Do not use empty initializers for global objects.
* io/close.c: Add missing initializers.
* runtime/environ.c: Add missing initializers. Do not use empty
initializers for global object.
(init_string): Mark argument as unused.
* runtime/main.c (cleanup): Fix parameter list.
* io/io.h: Fix parameter lists.
* m4/transpose.m4, m4/matmul.m4: Fix pointer cast to avoid
warning.
* generated/transpose_c4.c, generated/transpose_c8.c,
generated/transpose_i4.c, generated/transpose_i8.c,
generated/matmul_c4.c, generated/matmul_c8.c,
generated/matmul_i4.c, generated/matmul_i8.c,
generated/matmul_r4.c, generated/matmul_r8.c: Regenerated.
* io/write.c (nml_write_obj): Fix 64-bit problem.
* io/list_read.c (nml_get_obj_data): Add missing braces around
initializer to avoid warnings.
* intrinsics/etime.c (etime_sub): Remove unused variable.
From-SVN: r99719
2005-05-15 14:44:42 +02:00
|
|
|
Copyright 2002, 2005 Free Software Foundation, Inc.
|
2004-05-13 08:41:07 +02:00
|
|
|
Contributed by Paul Brook <paul@nowt.org>
|
|
|
|
|
2004-08-09 16:34:39 +02:00
|
|
|
This file is part of the GNU Fortran 95 runtime library (libgfortran).
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
2005-01-12 22:27:33 +01:00
|
|
|
modify it under the terms of the GNU General Public
|
2004-05-13 08:41:07 +02:00
|
|
|
License as published by the Free Software Foundation; either
|
2005-01-12 22:27:33 +01:00
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
|
|
compiled version of this file into combinations with other programs,
|
|
|
|
and to distribute those combinations without any restriction coming
|
|
|
|
from the use of this file. (The General Public License restrictions
|
|
|
|
do apply in other respects; for example, they cover modification of
|
|
|
|
the file, and distribution when not linked into a combine
|
|
|
|
executable.)
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
Libgfortran is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2005-01-12 22:27:33 +01:00
|
|
|
GNU General Public License for more details.
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2005-01-12 22:27:33 +01:00
|
|
|
You should have received a copy of the GNU General Public
|
|
|
|
License along with libgfortran; see the file COPYING. If not,
|
2004-05-13 08:41:07 +02:00
|
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
2004-11-18 09:45:11 +01:00
|
|
|
#include <string.h>
|
2004-05-13 08:41:07 +02:00
|
|
|
#include <assert.h>
|
|
|
|
#include "libgfortran.h"'
|
Makefile.am: Remove references to types.m4.
* Makefile.am: Remove references to types.m4.
* m4/iparm.m4: Merge with types.m4.
* m4/types.m4: Remove.
* m4/cshift1.m4, m4/dotprod.m4, m4/dotprodc.m4, m4/dotprodl.m4,
m4/eoshift1.m4, m4/eoshift3.m4, m4/iforeach.m4, m4/ifunction.m4,
m4/in_pack.m4, m4/in_unpack.m4, m4/iparm.m4, m4/matmul.m4,
m4/matmull.m4, m4/maxloc0.m4, m4/maxloc1.m4, m4/maxval.m4,
m4/minloc0.m4, m4/minloc1.m4, m4/minval.m4, m4/reshape.m4,
m4/shape.m4, m4/specific.m4, m4/specific2.m4, m4/transpose.m4):
Update to use new iparm.m4.
* generated/*.c: Regenerate.
From-SVN: r82003
2004-05-18 21:03:26 +02:00
|
|
|
include(iparm.m4)dnl
|
2004-05-13 08:41:07 +02:00
|
|
|
|
2004-11-18 09:45:11 +01:00
|
|
|
/* This is a C version of the following fortran pseudo-code. The key
|
|
|
|
point is the loop order -- we access all arrays column-first, which
|
|
|
|
improves the performance enough to boost galgel spec score by 50%.
|
|
|
|
|
|
|
|
DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
|
|
|
|
C = 0
|
|
|
|
DO J=1,N
|
|
|
|
DO K=1,COUNT
|
|
|
|
DO I=1,M
|
|
|
|
C(I,J) = C(I,J)+A(I,K)*B(K,J)
|
|
|
|
*/
|
|
|
|
|
iresolve.c (gfc_resolve_all, [...]): Use PREFIX.
gcc/fortran/
* iresolve.c (gfc_resolve_all, gfc_resolve_any, gfc_resolve_count,
gfc_resolve_cshift, gfc_resolve_dot_product, gfc_resolve_eoshift,
gfc_resolve_matmul, gfc_resolve_maxloc, gfc_resolve_maxval,
gfc_resolve_minloc, gfc_resolve_minval, gfc_resolve_pack,
gfc_resolve_product, gfc_resolve_reshape, gfc_resolve_shape,
gfc_resolve_spread, gfc_resolve_sum, gfc_resolve_transpose,
gfc_resolve_unpack: Use PREFIX.
libgfortran/
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/reshape_generic.c,
intrinsics/spread_generic.c, intrinsics/transpose_generic.c,
intrinsics/unpack_generic.c, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/iforeach.m4, m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4,
m4/reshape.m4, m4/shape.m4, m4/transpose.m4: Use standard prefix
instead of "__".
* generated/*: Rebuild.
From-SVN: r92075
2004-12-13 03:47:58 +01:00
|
|
|
extern void matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b);
|
|
|
|
export_proto(matmul_`'rtype_code);
|
acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
* acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
(LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT): New.
(LIBGFOR_CHECK_ATTRIBUTE_ALIAS): New.
* configure.ac: Use them.
* configure, config.h.in, aclocal.m4: Rebuild.
* libgfortran.h (prefix): Remove.
(PREFIX, IPREFIX): New.
(sym_rename, sym_rename1, sym_rename2): New.
(internal_proto, export_proto, export_proto_np): New.
(iexport_proto, iexport): New.
(iexport_data_proto, iexport_data): New.
* intrinsics/abort.c, intrinsics/args.c, intrinsics/associated.c,
intrinsics/cpu_time.c, intrinsics/cshift0.c,
intrinsics/date_and_time.c, intrinsics/env.c, intrinsics/eoshift0.c,
intrinsics/eoshift2.c, intrinsics/etime.c, intrinsics/exit.c,
intrinsics/flush.c, intrinsics/fnum.c, intrinsics/getXid.c,
intrinsics/getcwd.c, intrinsics/ishftc.c, intrinsics/mvbits.c,
intrinsics/pack_generic.c, intrinsics/rand.c, intrinsics/random.c,
intrinsics/reshape_generic.c, intrinsics/size.c,
intrinsics/spread_generic.c, intrinsics/stat.c,
intrinsics/string_intrinsics.c, intrinsics/system.c,
intrinsics/system_clock.c, intrinsics/transpose_generic.c,
intrinsics/umask.c, intrinsics/unlink.c, intrinsics/unpack_generic.c,
io/backspace.c, io/close.c, io/endfile.c, io/inquire.c, io/io.h,
io/open.c, io/rewind.c, io/transfer.c, libgfortran.h, m4/cshift1.m4,
m4/dotprod.m4, m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4,
m4/eoshift3.m4, m4/exponent.m4, m4/fraction.m4, m4/iforeach.m4,
m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4, m4/nearest.m4,
m4/pow.m4, m4/reshape.m4, m4/set_exponent.m4, m4/shape.m4,
m4/transpose.m4, runtime/environ.c, runtime/error.c,
runtime/in_pack_generic.c, runtime/in_unpack_generic.c,
runtime/main.c, runtime/memory.c, runtime/pause.c, runtime/select.c,
runtime/stop.c: Use them to mark symbols internal or external.
* generated/*: Rebuild.
From-SVN: r92045
2004-12-12 09:59:05 +01:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
void
|
iresolve.c (gfc_resolve_all, [...]): Use PREFIX.
gcc/fortran/
* iresolve.c (gfc_resolve_all, gfc_resolve_any, gfc_resolve_count,
gfc_resolve_cshift, gfc_resolve_dot_product, gfc_resolve_eoshift,
gfc_resolve_matmul, gfc_resolve_maxloc, gfc_resolve_maxval,
gfc_resolve_minloc, gfc_resolve_minval, gfc_resolve_pack,
gfc_resolve_product, gfc_resolve_reshape, gfc_resolve_shape,
gfc_resolve_spread, gfc_resolve_sum, gfc_resolve_transpose,
gfc_resolve_unpack: Use PREFIX.
libgfortran/
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/reshape_generic.c,
intrinsics/spread_generic.c, intrinsics/transpose_generic.c,
intrinsics/unpack_generic.c, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/iforeach.m4, m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4,
m4/reshape.m4, m4/shape.m4, m4/transpose.m4: Use standard prefix
instead of "__".
* generated/*: Rebuild.
From-SVN: r92075
2004-12-13 03:47:58 +01:00
|
|
|
matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
|
|
|
rtype_name *abase;
|
|
|
|
rtype_name *bbase;
|
|
|
|
rtype_name *dest;
|
2004-11-18 09:45:11 +01:00
|
|
|
|
|
|
|
index_type rxstride, rystride, axstride, aystride, bxstride, bystride;
|
|
|
|
index_type x, y, n, count, xcount, ycount;
|
2004-05-13 08:41:07 +02:00
|
|
|
|
|
|
|
assert (GFC_DESCRIPTOR_RANK (a) == 2
|
|
|
|
|| GFC_DESCRIPTOR_RANK (b) == 2);
|
2004-08-09 16:34:39 +02:00
|
|
|
|
2004-11-18 09:45:11 +01:00
|
|
|
/* C[xcount,ycount] = A[xcount, count] * B[count,ycount]
|
|
|
|
|
|
|
|
Either A or B (but not both) can be rank 1:
|
|
|
|
|
|
|
|
o One-dimensional argument A is implicitly treated as a row matrix
|
|
|
|
dimensioned [1,count], so xcount=1.
|
|
|
|
|
|
|
|
o One-dimensional argument B is implicitly treated as a column matrix
|
|
|
|
dimensioned [count, 1], so ycount=1.
|
|
|
|
*/
|
|
|
|
|
2004-08-09 16:34:39 +02:00
|
|
|
if (retarray->data == NULL)
|
|
|
|
{
|
|
|
|
if (GFC_DESCRIPTOR_RANK (a) == 1)
|
|
|
|
{
|
|
|
|
retarray->dim[0].lbound = 0;
|
|
|
|
retarray->dim[0].ubound = b->dim[1].ubound - b->dim[1].lbound;
|
|
|
|
retarray->dim[0].stride = 1;
|
|
|
|
}
|
|
|
|
else if (GFC_DESCRIPTOR_RANK (b) == 1)
|
|
|
|
{
|
|
|
|
retarray->dim[0].lbound = 0;
|
|
|
|
retarray->dim[0].ubound = a->dim[0].ubound - a->dim[0].lbound;
|
|
|
|
retarray->dim[0].stride = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
retarray->dim[0].lbound = 0;
|
|
|
|
retarray->dim[0].ubound = a->dim[0].ubound - a->dim[0].lbound;
|
|
|
|
retarray->dim[0].stride = 1;
|
2005-05-15 14:49:45 +02:00
|
|
|
|
2004-08-09 16:34:39 +02:00
|
|
|
retarray->dim[1].lbound = 0;
|
|
|
|
retarray->dim[1].ubound = b->dim[1].ubound - b->dim[1].lbound;
|
|
|
|
retarray->dim[1].stride = retarray->dim[0].ubound+1;
|
|
|
|
}
|
2005-05-15 14:49:45 +02:00
|
|
|
|
cshift0.c, [...]: Use internal_malloc_size instead of internal_malloc.
* intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
intrinsics/pack_generic.c, intrinsics/string_intrinsics.c,
intrinsics/transpose_generic.c, m4/ifunction.m4, m4/matmul.m4,
m4/matmull.m4, m4/transpose.m4: Use internal_malloc_size instead
of internal_malloc.
* generated/*: Rebuild.
From-SVN: r91799
2004-12-07 01:24:44 +01:00
|
|
|
retarray->data
|
normalize.c (almostone_r4, [...]): Fix parameter list.
* runtime/normalize.c (almostone_r4, almostone_r8): Fix parameter
list.
* intrinsics/random.c (KISS_DEFAULT_SEED): Remove extra semicolon.
* io/transfer.c: Do not use empty initializers for global objects.
Add missing initializers.
* io/lock.c: Do not use empty initializers for global objects.
* io/close.c: Add missing initializers.
* runtime/environ.c: Add missing initializers. Do not use empty
initializers for global object.
(init_string): Mark argument as unused.
* runtime/main.c (cleanup): Fix parameter list.
* io/io.h: Fix parameter lists.
* m4/transpose.m4, m4/matmul.m4: Fix pointer cast to avoid
warning.
* generated/transpose_c4.c, generated/transpose_c8.c,
generated/transpose_i4.c, generated/transpose_i8.c,
generated/matmul_c4.c, generated/matmul_c8.c,
generated/matmul_i4.c, generated/matmul_i8.c,
generated/matmul_r4.c, generated/matmul_r8.c: Regenerated.
* io/write.c (nml_write_obj): Fix 64-bit problem.
* io/list_read.c (nml_get_obj_data): Add missing braces around
initializer to avoid warnings.
* intrinsics/etime.c (etime_sub): Remove unused variable.
From-SVN: r99719
2005-05-15 14:44:42 +02:00
|
|
|
= internal_malloc_size (sizeof (rtype_name) * size0 ((array_t *) retarray));
|
2004-08-09 16:34:39 +02:00
|
|
|
retarray->base = 0;
|
|
|
|
}
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
abase = a->data;
|
|
|
|
bbase = b->data;
|
|
|
|
dest = retarray->data;
|
|
|
|
|
|
|
|
if (retarray->dim[0].stride == 0)
|
|
|
|
retarray->dim[0].stride = 1;
|
|
|
|
if (a->dim[0].stride == 0)
|
|
|
|
a->dim[0].stride = 1;
|
|
|
|
if (b->dim[0].stride == 0)
|
|
|
|
b->dim[0].stride = 1;
|
|
|
|
|
|
|
|
sinclude(`matmul_asm_'rtype_code`.m4')dnl
|
|
|
|
|
|
|
|
if (GFC_DESCRIPTOR_RANK (retarray) == 1)
|
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
/* One-dimensional result may be addressed in the code below
|
|
|
|
either as a row or a column matrix. We want both cases to
|
|
|
|
work. */
|
|
|
|
rxstride = rystride = retarray->dim[0].stride;
|
2004-05-13 08:41:07 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rxstride = retarray->dim[0].stride;
|
|
|
|
rystride = retarray->dim[1].stride;
|
|
|
|
}
|
|
|
|
|
2004-11-18 09:45:11 +01:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
if (GFC_DESCRIPTOR_RANK (a) == 1)
|
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
/* Treat it as a a row matrix A[1,count]. */
|
|
|
|
axstride = a->dim[0].stride;
|
|
|
|
aystride = 1;
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
xcount = 1;
|
2004-11-18 09:45:11 +01:00
|
|
|
count = a->dim[0].ubound + 1 - a->dim[0].lbound;
|
2004-05-13 08:41:07 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
axstride = a->dim[0].stride;
|
|
|
|
aystride = a->dim[1].stride;
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
count = a->dim[1].ubound + 1 - a->dim[1].lbound;
|
|
|
|
xcount = a->dim[0].ubound + 1 - a->dim[0].lbound;
|
|
|
|
}
|
2004-11-18 09:45:11 +01:00
|
|
|
|
|
|
|
assert(count == b->dim[0].ubound + 1 - b->dim[0].lbound);
|
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
if (GFC_DESCRIPTOR_RANK (b) == 1)
|
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
/* Treat it as a column matrix B[count,1] */
|
|
|
|
bxstride = b->dim[0].stride;
|
|
|
|
|
|
|
|
/* bystride should never be used for 1-dimensional b.
|
|
|
|
in case it is we want it to cause a segfault, rather than
|
|
|
|
an incorrect result. */
|
2005-05-15 14:49:45 +02:00
|
|
|
bystride = 0xDEADBEEF;
|
2004-05-13 08:41:07 +02:00
|
|
|
ycount = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
bxstride = b->dim[0].stride;
|
|
|
|
bystride = b->dim[1].stride;
|
2004-05-13 08:41:07 +02:00
|
|
|
ycount = b->dim[1].ubound + 1 - b->dim[1].lbound;
|
|
|
|
}
|
|
|
|
|
2004-11-18 09:45:11 +01:00
|
|
|
abase = a->data;
|
|
|
|
bbase = b->data;
|
|
|
|
dest = retarray->data;
|
|
|
|
|
|
|
|
if (rxstride == 1 && axstride == 1 && bxstride == 1)
|
2004-05-13 08:41:07 +02:00
|
|
|
{
|
2004-11-18 09:45:11 +01:00
|
|
|
rtype_name *bbase_y;
|
|
|
|
rtype_name *dest_y;
|
|
|
|
rtype_name *abase_n;
|
|
|
|
rtype_name bbase_yn;
|
|
|
|
|
normalize.c (almostone_r4, [...]): Fix parameter list.
* runtime/normalize.c (almostone_r4, almostone_r8): Fix parameter
list.
* intrinsics/random.c (KISS_DEFAULT_SEED): Remove extra semicolon.
* io/transfer.c: Do not use empty initializers for global objects.
Add missing initializers.
* io/lock.c: Do not use empty initializers for global objects.
* io/close.c: Add missing initializers.
* runtime/environ.c: Add missing initializers. Do not use empty
initializers for global object.
(init_string): Mark argument as unused.
* runtime/main.c (cleanup): Fix parameter list.
* io/io.h: Fix parameter lists.
* m4/transpose.m4, m4/matmul.m4: Fix pointer cast to avoid
warning.
* generated/transpose_c4.c, generated/transpose_c8.c,
generated/transpose_i4.c, generated/transpose_i8.c,
generated/matmul_c4.c, generated/matmul_c8.c,
generated/matmul_i4.c, generated/matmul_i8.c,
generated/matmul_r4.c, generated/matmul_r8.c: Regenerated.
* io/write.c (nml_write_obj): Fix 64-bit problem.
* io/list_read.c (nml_get_obj_data): Add missing braces around
initializer to avoid warnings.
* intrinsics/etime.c (etime_sub): Remove unused variable.
From-SVN: r99719
2005-05-15 14:44:42 +02:00
|
|
|
memset (dest, 0, (sizeof (rtype_name) * size0((array_t *) retarray)));
|
2004-11-18 09:45:11 +01:00
|
|
|
|
|
|
|
for (y = 0; y < ycount; y++)
|
|
|
|
{
|
|
|
|
bbase_y = bbase + y*bystride;
|
|
|
|
dest_y = dest + y*rystride;
|
|
|
|
for (n = 0; n < count; n++)
|
|
|
|
{
|
|
|
|
abase_n = abase + n*aystride;
|
|
|
|
bbase_yn = bbase_y[n];
|
|
|
|
for (x = 0; x < xcount; x++)
|
|
|
|
{
|
|
|
|
dest_y[x] += abase_n[x] * bbase_yn;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (y = 0; y < ycount; y++)
|
|
|
|
for (x = 0; x < xcount; x++)
|
|
|
|
dest[x*rxstride + y*rystride] = (rtype_name)0;
|
|
|
|
|
|
|
|
for (y = 0; y < ycount; y++)
|
|
|
|
for (n = 0; n < count; n++)
|
|
|
|
for (x = 0; x < xcount; x++)
|
|
|
|
/* dest[x,y] += a[x,n] * b[n,y] */
|
|
|
|
dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
|
2004-05-13 08:41:07 +02:00
|
|
|
}
|
|
|
|
}
|