ca708a2b55
2018-06-01 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/85816 PR fortran/85975 * libgfortran.h: Remove the GFC_DTYPE_COPY_SETRANK macro. * intrinsics/reshape_generic.c: Directly assign rank. * intrinsics/spread_generic.c: Ditto. * m4/iforeach-s.m4: Ditto. * m4/iforeach.m4: Ditto. * m4/ifunction-s.m4: Ditto. * m4/ifunction-s2.m4: Ditto. * m4/ifunction.m4: Ditto. * m4/ifunction_logical.m4: Ditto. * m4/reshape.m4: Ditto. * m4/spread.m4: Ditto. * generated/all_l1.c: Regenerated from m4 files. * generated/all_l16.c: Ditto. * generated/all_l2.c: Ditto. * generated/all_l4.c: Ditto. * generated/all_l8.c: Ditto. * generated/any_l1.c: Ditto. * generated/any_l16.c: Ditto. * generated/any_l2.c: Ditto. * generated/any_l4.c: Ditto. * generated/any_l8.c: Ditto. * generated/count_16_l.c: Ditto. * generated/count_1_l.c: Ditto. * generated/count_2_l.c: Ditto. * generated/count_4_l.c: Ditto. * generated/count_8_l.c: Ditto. * generated/iall_i1.c: Ditto. * generated/iall_i16.c: Ditto. * generated/iall_i2.c: Ditto. * generated/iall_i4.c: Ditto. * generated/iall_i8.c: Ditto. * generated/iany_i1.c: Ditto. * generated/iany_i16.c: Ditto. * generated/iany_i2.c: Ditto. * generated/iany_i4.c: Ditto. * generated/iany_i8.c: Ditto. * generated/iparity_i1.c: Ditto. * generated/iparity_i16.c: Ditto. * generated/iparity_i2.c: Ditto. * generated/iparity_i4.c: Ditto. * generated/iparity_i8.c: Ditto. * generated/maxloc0_16_i1.c: Ditto. * generated/maxloc0_16_i16.c: Ditto. * generated/maxloc0_16_i2.c: Ditto. * generated/maxloc0_16_i4.c: Ditto. * generated/maxloc0_16_i8.c: Ditto. * generated/maxloc0_16_r10.c: Ditto. * generated/maxloc0_16_r16.c: Ditto. * generated/maxloc0_16_r4.c: Ditto. * generated/maxloc0_16_r8.c: Ditto. * generated/maxloc0_16_s1.c: Ditto. * generated/maxloc0_16_s4.c: Ditto. * generated/maxloc0_4_i1.c: Ditto. * generated/maxloc0_4_i16.c: Ditto. * generated/maxloc0_4_i2.c: Ditto. * generated/maxloc0_4_i4.c: Ditto. * generated/maxloc0_4_i8.c: Ditto. * generated/maxloc0_4_r10.c: Ditto. * generated/maxloc0_4_r16.c: Ditto. * generated/maxloc0_4_r4.c: Ditto. * generated/maxloc0_4_r8.c: Ditto. * generated/maxloc0_4_s1.c: Ditto. * generated/maxloc0_4_s4.c: Ditto. * generated/maxloc0_8_i1.c: Ditto. * generated/maxloc0_8_i16.c: Ditto. * generated/maxloc0_8_i2.c: Ditto. * generated/maxloc0_8_i4.c: Ditto. * generated/maxloc0_8_i8.c: Ditto. * generated/maxloc0_8_r10.c: Ditto. * generated/maxloc0_8_r16.c: Ditto. * generated/maxloc0_8_r4.c: Ditto. * generated/maxloc0_8_r8.c: Ditto. * generated/maxloc0_8_s1.c: Ditto. * generated/maxloc0_8_s4.c: Ditto. * generated/maxloc1_16_i1.c: Ditto. * generated/maxloc1_16_i16.c: Ditto. * generated/maxloc1_16_i2.c: Ditto. * generated/maxloc1_16_i4.c: Ditto. * generated/maxloc1_16_i8.c: Ditto. * generated/maxloc1_16_r10.c: Ditto. * generated/maxloc1_16_r16.c: Ditto. * generated/maxloc1_16_r4.c: Ditto. * generated/maxloc1_16_r8.c: Ditto. * generated/maxloc1_16_s1.c: Ditto. * generated/maxloc1_16_s4.c: Ditto. * generated/maxloc1_4_i1.c: Ditto. * generated/maxloc1_4_i16.c: Ditto. * generated/maxloc1_4_i2.c: Ditto. * generated/maxloc1_4_i4.c: Ditto. * generated/maxloc1_4_i8.c: Ditto. * generated/maxloc1_4_r10.c: Ditto. * generated/maxloc1_4_r16.c: Ditto. * generated/maxloc1_4_r4.c: Ditto. * generated/maxloc1_4_r8.c: Ditto. * generated/maxloc1_4_s1.c: Ditto. * generated/maxloc1_4_s4.c: Ditto. * generated/maxloc1_8_i1.c: Ditto. * generated/maxloc1_8_i16.c: Ditto. * generated/maxloc1_8_i2.c: Ditto. * generated/maxloc1_8_i4.c: Ditto. * generated/maxloc1_8_i8.c: Ditto. * generated/maxloc1_8_r10.c: Ditto. * generated/maxloc1_8_r16.c: Ditto. * generated/maxloc1_8_r4.c: Ditto. * generated/maxloc1_8_r8.c: Ditto. * generated/maxloc1_8_s1.c: Ditto. * generated/maxloc1_8_s4.c: Ditto. * generated/maxval1_s1.c: Ditto. * generated/maxval1_s4.c: Ditto. * generated/maxval_i1.c: Ditto. * generated/maxval_i16.c: Ditto. * generated/maxval_i2.c: Ditto. * generated/maxval_i4.c: Ditto. * generated/maxval_i8.c: Ditto. * generated/maxval_r10.c: Ditto. * generated/maxval_r16.c: Ditto. * generated/maxval_r4.c: Ditto. * generated/maxval_r8.c: Ditto. * generated/minloc0_16_i1.c: Ditto. * generated/minloc0_16_i16.c: Ditto. * generated/minloc0_16_i2.c: Ditto. * generated/minloc0_16_i4.c: Ditto. * generated/minloc0_16_i8.c: Ditto. * generated/minloc0_16_r10.c: Ditto. * generated/minloc0_16_r16.c: Ditto. * generated/minloc0_16_r4.c: Ditto. * generated/minloc0_16_r8.c: Ditto. * generated/minloc0_16_s1.c: Ditto. * generated/minloc0_16_s4.c: Ditto. * generated/minloc0_4_i1.c: Ditto. * generated/minloc0_4_i16.c: Ditto. * generated/minloc0_4_i2.c: Ditto. * generated/minloc0_4_i4.c: Ditto. * generated/minloc0_4_i8.c: Ditto. * generated/minloc0_4_r10.c: Ditto. * generated/minloc0_4_r16.c: Ditto. * generated/minloc0_4_r4.c: Ditto. * generated/minloc0_4_r8.c: Ditto. * generated/minloc0_4_s1.c: Ditto. * generated/minloc0_4_s4.c: Ditto. * generated/minloc0_8_i1.c: Ditto. * generated/minloc0_8_i16.c: Ditto. * generated/minloc0_8_i2.c: Ditto. * generated/minloc0_8_i4.c: Ditto. * generated/minloc0_8_i8.c: Ditto. * generated/minloc0_8_r10.c: Ditto. * generated/minloc0_8_r16.c: Ditto. * generated/minloc0_8_r4.c: Ditto. * generated/minloc0_8_r8.c: Ditto. * generated/minloc0_8_s1.c: Ditto. * generated/minloc0_8_s4.c: Ditto. * generated/minloc1_16_i1.c: Ditto. * generated/minloc1_16_i16.c: Ditto. * generated/minloc1_16_i2.c: Ditto. * generated/minloc1_16_i4.c: Ditto. * generated/minloc1_16_i8.c: Ditto. * generated/minloc1_16_r10.c: Ditto. * generated/minloc1_16_r16.c: Ditto. * generated/minloc1_16_r4.c: Ditto. * generated/minloc1_16_r8.c: Ditto. * generated/minloc1_16_s1.c: Ditto. * generated/minloc1_16_s4.c: Ditto. * generated/minloc1_4_i1.c: Ditto. * generated/minloc1_4_i16.c: Ditto. * generated/minloc1_4_i2.c: Ditto. * generated/minloc1_4_i4.c: Ditto. * generated/minloc1_4_i8.c: Ditto. * generated/minloc1_4_r10.c: Ditto. * generated/minloc1_4_r16.c: Ditto. * generated/minloc1_4_r4.c: Ditto. * generated/minloc1_4_r8.c: Ditto. * generated/minloc1_4_s1.c: Ditto. * generated/minloc1_4_s4.c: Ditto. * generated/minloc1_8_i1.c: Ditto. * generated/minloc1_8_i16.c: Ditto. * generated/minloc1_8_i2.c: Ditto. * generated/minloc1_8_i4.c: Ditto. * generated/minloc1_8_i8.c: Ditto. * generated/minloc1_8_r10.c: Ditto. * generated/minloc1_8_r16.c: Ditto. * generated/minloc1_8_r4.c: Ditto. * generated/minloc1_8_r8.c: Ditto. * generated/minloc1_8_s1.c: Ditto. * generated/minloc1_8_s4.c: Ditto. * generated/minval1_s1.c: Ditto. * generated/minval1_s4.c: Ditto. * generated/minval_i1.c: Ditto. * generated/minval_i16.c: Ditto. * generated/minval_i2.c: Ditto. * generated/minval_i4.c: Ditto. * generated/minval_i8.c: Ditto. * generated/minval_r10.c: Ditto. * generated/minval_r16.c: Ditto. * generated/minval_r4.c: Ditto. * generated/minval_r8.c: Ditto. * generated/norm2_r10.c: Ditto. * generated/norm2_r16.c: Ditto. * generated/norm2_r4.c: Ditto. * generated/norm2_r8.c: Ditto. * generated/parity_l1.c: Ditto. * generated/parity_l16.c: Ditto. * generated/parity_l2.c: Ditto. * generated/parity_l4.c: Ditto. * generated/parity_l8.c: Ditto. * generated/product_c10.c: Ditto. * generated/product_c16.c: Ditto. * generated/product_c4.c: Ditto. * generated/product_c8.c: Ditto. * generated/product_i1.c: Ditto. * generated/product_i16.c: Ditto. * generated/product_i2.c: Ditto. * generated/product_i4.c: Ditto. * generated/product_i8.c: Ditto. * generated/product_r10.c: Ditto. * generated/product_r16.c: Ditto. * generated/product_r4.c: Ditto. * generated/product_r8.c: Ditto. * generated/reshape_c10.c: Ditto. * generated/reshape_c16.c: Ditto. * generated/reshape_c4.c: Ditto. * generated/reshape_c8.c: Ditto. * generated/reshape_i16.c: Ditto. * generated/reshape_i4.c: Ditto. * generated/reshape_i8.c: Ditto. * generated/reshape_r10.c: Ditto. * generated/reshape_r16.c: Ditto. * generated/reshape_r4.c: Ditto. * generated/reshape_r8.c: Ditto. * generated/spread_c10.c: Ditto. * generated/spread_c16.c: Ditto. * generated/spread_c4.c: Ditto. * generated/spread_c8.c: Ditto. * generated/spread_i1.c: Ditto. * generated/spread_i16.c: Ditto. * generated/spread_i2.c: Ditto. * generated/spread_i4.c: Ditto. * generated/spread_i8.c: Ditto. * generated/spread_r10.c: Ditto. * generated/spread_r16.c: Ditto. * generated/spread_r4.c: Ditto. * generated/spread_r8.c: Ditto. * generated/sum_c10.c: Ditto. * generated/sum_c16.c: Ditto. * generated/sum_c4.c: Ditto. * generated/sum_c8.c: Ditto. * generated/sum_i1.c: Ditto. * generated/sum_i16.c: Ditto. * generated/sum_i2.c: Ditto. * generated/sum_i4.c: Ditto. * generated/sum_i8.c: Ditto. * generated/sum_r10.c: Ditto. * generated/sum_r16.c: Ditto. * generated/sum_r4.c: Ditto. * generated/sum_r8.c: Ditto. 2018-06-01 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/85816 PR fortran/85975 * gfortran.dg/pr85816.f90: New test. * gfortran.dg/pr85975.f90: New test. From-SVN: r261081
267 lines
6.7 KiB
C
267 lines
6.7 KiB
C
/* Special implementation of the SPREAD intrinsic
|
|
Copyright (C) 2008-2018 Free Software Foundation, Inc.
|
|
Contributed by Thomas Koenig <tkoenig@gcc.gnu.org>, based on
|
|
spread_generic.c written by Paul Brook <paul@nowt.org>
|
|
|
|
This file is part of the GNU Fortran runtime library (libgfortran).
|
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 3 of the License, or (at your option) any later version.
|
|
|
|
Ligbfortran 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
|
|
GNU General Public License for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "libgfortran.h"
|
|
#include <string.h>
|
|
|
|
|
|
#if defined (HAVE_GFC_COMPLEX_4)
|
|
|
|
void
|
|
spread_c4 (gfc_array_c4 *ret, const gfc_array_c4 *source,
|
|
const index_type along, const index_type pncopies)
|
|
{
|
|
/* r.* indicates the return array. */
|
|
index_type rstride[GFC_MAX_DIMENSIONS];
|
|
index_type rstride0;
|
|
index_type rdelta = 0;
|
|
index_type rrank;
|
|
index_type rs;
|
|
GFC_COMPLEX_4 *rptr;
|
|
GFC_COMPLEX_4 * restrict dest;
|
|
/* s.* indicates the source array. */
|
|
index_type sstride[GFC_MAX_DIMENSIONS];
|
|
index_type sstride0;
|
|
index_type srank;
|
|
const GFC_COMPLEX_4 *sptr;
|
|
|
|
index_type count[GFC_MAX_DIMENSIONS];
|
|
index_type extent[GFC_MAX_DIMENSIONS];
|
|
index_type n;
|
|
index_type dim;
|
|
index_type ncopies;
|
|
|
|
srank = GFC_DESCRIPTOR_RANK(source);
|
|
|
|
rrank = srank + 1;
|
|
if (rrank > GFC_MAX_DIMENSIONS)
|
|
runtime_error ("return rank too large in spread()");
|
|
|
|
if (along > rrank)
|
|
runtime_error ("dim outside of rank in spread()");
|
|
|
|
ncopies = pncopies;
|
|
|
|
if (ret->base_addr == NULL)
|
|
{
|
|
|
|
size_t ub, stride;
|
|
|
|
/* The front end has signalled that we need to populate the
|
|
return array descriptor. */
|
|
ret->dtype.rank = rrank;
|
|
|
|
dim = 0;
|
|
rs = 1;
|
|
for (n = 0; n < rrank; n++)
|
|
{
|
|
stride = rs;
|
|
if (n == along - 1)
|
|
{
|
|
ub = ncopies - 1;
|
|
rdelta = rs;
|
|
rs *= ncopies;
|
|
}
|
|
else
|
|
{
|
|
count[dim] = 0;
|
|
extent[dim] = GFC_DESCRIPTOR_EXTENT(source,dim);
|
|
sstride[dim] = GFC_DESCRIPTOR_STRIDE(source,dim);
|
|
rstride[dim] = rs;
|
|
|
|
ub = extent[dim] - 1;
|
|
rs *= extent[dim];
|
|
dim++;
|
|
}
|
|
GFC_DIMENSION_SET(ret->dim[n], 0, ub, stride);
|
|
}
|
|
ret->offset = 0;
|
|
|
|
/* xmallocarray allocates a single byte for zero size. */
|
|
ret->base_addr = xmallocarray (rs, sizeof(GFC_COMPLEX_4));
|
|
if (rs <= 0)
|
|
return;
|
|
}
|
|
else
|
|
{
|
|
int zero_sized;
|
|
|
|
zero_sized = 0;
|
|
|
|
dim = 0;
|
|
if (GFC_DESCRIPTOR_RANK(ret) != rrank)
|
|
runtime_error ("rank mismatch in spread()");
|
|
|
|
if (unlikely (compile_options.bounds_check))
|
|
{
|
|
for (n = 0; n < rrank; n++)
|
|
{
|
|
index_type ret_extent;
|
|
|
|
ret_extent = GFC_DESCRIPTOR_EXTENT(ret,n);
|
|
if (n == along - 1)
|
|
{
|
|
rdelta = GFC_DESCRIPTOR_STRIDE(ret,n);
|
|
|
|
if (ret_extent != ncopies)
|
|
runtime_error("Incorrect extent in return value of SPREAD"
|
|
" intrinsic in dimension %ld: is %ld,"
|
|
" should be %ld", (long int) n+1,
|
|
(long int) ret_extent, (long int) ncopies);
|
|
}
|
|
else
|
|
{
|
|
count[dim] = 0;
|
|
extent[dim] = GFC_DESCRIPTOR_EXTENT(source,dim);
|
|
if (ret_extent != extent[dim])
|
|
runtime_error("Incorrect extent in return value of SPREAD"
|
|
" intrinsic in dimension %ld: is %ld,"
|
|
" should be %ld", (long int) n+1,
|
|
(long int) ret_extent,
|
|
(long int) extent[dim]);
|
|
|
|
if (extent[dim] <= 0)
|
|
zero_sized = 1;
|
|
sstride[dim] = GFC_DESCRIPTOR_STRIDE(source,dim);
|
|
rstride[dim] = GFC_DESCRIPTOR_STRIDE(ret,n);
|
|
dim++;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
for (n = 0; n < rrank; n++)
|
|
{
|
|
if (n == along - 1)
|
|
{
|
|
rdelta = GFC_DESCRIPTOR_STRIDE(ret,n);
|
|
}
|
|
else
|
|
{
|
|
count[dim] = 0;
|
|
extent[dim] = GFC_DESCRIPTOR_EXTENT(source,dim);
|
|
if (extent[dim] <= 0)
|
|
zero_sized = 1;
|
|
sstride[dim] = GFC_DESCRIPTOR_STRIDE(source,dim);
|
|
rstride[dim] = GFC_DESCRIPTOR_STRIDE(ret,n);
|
|
dim++;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (zero_sized)
|
|
return;
|
|
|
|
if (sstride[0] == 0)
|
|
sstride[0] = 1;
|
|
}
|
|
sstride0 = sstride[0];
|
|
rstride0 = rstride[0];
|
|
rptr = ret->base_addr;
|
|
sptr = source->base_addr;
|
|
|
|
while (sptr)
|
|
{
|
|
/* Spread this element. */
|
|
dest = rptr;
|
|
for (n = 0; n < ncopies; n++)
|
|
{
|
|
*dest = *sptr;
|
|
dest += rdelta;
|
|
}
|
|
/* Advance to the next element. */
|
|
sptr += sstride0;
|
|
rptr += rstride0;
|
|
count[0]++;
|
|
n = 0;
|
|
while (count[n] == extent[n])
|
|
{
|
|
/* When we get to the end of a dimension, reset it and increment
|
|
the next dimension. */
|
|
count[n] = 0;
|
|
/* We could precalculate these products, but this is a less
|
|
frequently used path so probably not worth it. */
|
|
sptr -= sstride[n] * extent[n];
|
|
rptr -= rstride[n] * extent[n];
|
|
n++;
|
|
if (n >= srank)
|
|
{
|
|
/* Break out of the loop. */
|
|
sptr = NULL;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
count[n]++;
|
|
sptr += sstride[n];
|
|
rptr += rstride[n];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* This version of spread_internal treats the special case of a scalar
|
|
source. This is much simpler than the more general case above. */
|
|
|
|
void
|
|
spread_scalar_c4 (gfc_array_c4 *ret, const GFC_COMPLEX_4 *source,
|
|
const index_type along, const index_type ncopies)
|
|
{
|
|
GFC_COMPLEX_4 * restrict dest;
|
|
index_type stride;
|
|
|
|
if (GFC_DESCRIPTOR_RANK (ret) != 1)
|
|
runtime_error ("incorrect destination rank in spread()");
|
|
|
|
if (along > 1)
|
|
runtime_error ("dim outside of rank in spread()");
|
|
|
|
if (ret->base_addr == NULL)
|
|
{
|
|
ret->base_addr = xmallocarray (ncopies, sizeof (GFC_COMPLEX_4));
|
|
ret->offset = 0;
|
|
GFC_DIMENSION_SET(ret->dim[0], 0, ncopies - 1, 1);
|
|
}
|
|
else
|
|
{
|
|
if (ncopies - 1 > (GFC_DESCRIPTOR_EXTENT(ret,0) - 1)
|
|
/ GFC_DESCRIPTOR_STRIDE(ret,0))
|
|
runtime_error ("dim too large in spread()");
|
|
}
|
|
|
|
dest = ret->base_addr;
|
|
stride = GFC_DESCRIPTOR_STRIDE(ret,0);
|
|
|
|
for (index_type n = 0; n < ncopies; n++)
|
|
{
|
|
*dest = *source;
|
|
dest += stride;
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|