OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans.h (gfc_loopinfo): Remove codimen field. 

* trans.h (gfc_loopinfo): Remove codimen field.
	* trans-array.c (gfc_set_vector_loop_bounds,
	gfc_trans_scalarizing_loops, gfc_conv_loop_setup): Update loop upper
	limit.
	(gfc_set_loop_bounds_from_array_spec): Ditto. Remove skip on last
	codimension.
	(gfc_start_scalarized_body): Update loop lower limit.
	(gfc_conv_ss_startstride): Don't set loop's codimen field.
	(gfc_conv_loop_setup): Remove unnecessary condition.
	(gfc_conv_expr_descriptor): Don't use loop's codimen field as corank.

From-SVN: r179689
This commit is contained in:
Mikael Morin 2011-10-07 22:14:44 +02:00 committed by Mikael Morin
parent 8e50858e07
commit c6d741b85b
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/fortran/ChangeLog
View File

@ -1,3 +1,16 @@
2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
* trans.h (gfc_loopinfo): Remove codimen field.
* trans-array.c (gfc_set_vector_loop_bounds,
gfc_trans_scalarizing_loops, gfc_conv_loop_setup): Update loop upper
limit.
(gfc_set_loop_bounds_from_array_spec): Ditto. Remove skip on last
codimension.
(gfc_start_scalarized_body): Update loop lower limit.
(gfc_conv_ss_startstride): Don't set loop's codimen field.
(gfc_conv_loop_setup): Remove unnecessary condition.
(gfc_conv_expr_descriptor): Don't use loop's codimen field as corank.
2011-10-07 Mikael Morin <mikael.morin@sfr.fr> 2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
* trans.h (gfc_ss): Remove data.temp.codimen field. * trans.h (gfc_ss): Remove data.temp.codimen field.

41
gcc/fortran/trans-array.c
View File

@ -641,7 +641,7 @@ gfc_set_loop_bounds_from_array_spec (gfc_interface_mapping * mapping,
tree tmp; tree tmp;
if (as && as->type == AS_EXPLICIT) if (as && as->type == AS_EXPLICIT)
for (n = 0; n < se->loop->dimen + se->loop->codimen; n++) for (n = 0; n < se->loop->dimen; n++)
{ {
dim = se->ss->data.info.dim[n]; dim = se->ss->data.info.dim[n];
gcc_assert (dim < as->rank); gcc_assert (dim < as->rank);
@ -655,22 +655,18 @@ gfc_set_loop_bounds_from_array_spec (gfc_interface_mapping * mapping,
gfc_add_block_to_block (&se->post, &tmpse.post); gfc_add_block_to_block (&se->post, &tmpse.post);
lower = fold_convert (gfc_array_index_type, tmpse.expr); lower = fold_convert (gfc_array_index_type, tmpse.expr);
if (se->loop->codimen == 0 /* ...and the upper bound. */
|| n < se->loop->dimen + se->loop->codimen - 1) gfc_init_se (&tmpse, NULL);
{ gfc_apply_interface_mapping (mapping, &tmpse, as->upper[dim]);
/* ...and the upper bound. */ gfc_add_block_to_block (&se->pre, &tmpse.pre);
gfc_init_se (&tmpse, NULL); gfc_add_block_to_block (&se->post, &tmpse.post);
gfc_apply_interface_mapping (mapping, &tmpse, as->upper[dim]); upper = fold_convert (gfc_array_index_type, tmpse.expr);
gfc_add_block_to_block (&se->pre, &tmpse.pre);
gfc_add_block_to_block (&se->post, &tmpse.post);
upper = fold_convert (gfc_array_index_type, tmpse.expr);
/* Set the upper bound of the loop to UPPER - LOWER. */ /* Set the upper bound of the loop to UPPER - LOWER. */
tmp = fold_build2_loc (input_location, MINUS_EXPR, tmp = fold_build2_loc (input_location, MINUS_EXPR,
gfc_array_index_type, upper, lower); gfc_array_index_type, upper, lower);
tmp = gfc_evaluate_now (tmp, &se->pre); tmp = gfc_evaluate_now (tmp, &se->pre);
se->loop->to[n] = tmp; se->loop->to[n] = tmp;
}
} }
} }
} }
@ -2116,7 +2112,7 @@ gfc_set_vector_loop_bounds (gfc_loopinfo * loop, gfc_ss_info * info)
int n; int n;
int dim; int dim;
for (n = 0; n < loop->dimen + loop->codimen; n++) for (n = 0; n < loop->dimen; n++)
{ {
dim = info->dim[n]; dim = info->dim[n];
if (info->ref->u.ar.dimen_type[dim] == DIMEN_VECTOR if (info->ref->u.ar.dimen_type[dim] == DIMEN_VECTOR
@ -2948,7 +2944,7 @@ gfc_start_scalarized_body (gfc_loopinfo * loop, stmtblock_t * pbody)
gcc_assert (!loop->array_parameter); gcc_assert (!loop->array_parameter);
for (dim = loop->dimen + loop->codimen - 1; dim >= 0; dim--) for (dim = loop->dimen - 1; dim >= 0; dim--)
{ {
n = loop->order[dim]; n = loop->order[dim];
@ -3102,7 +3098,7 @@ gfc_trans_scalarizing_loops (gfc_loopinfo * loop, stmtblock_t * body)
pblock = body; pblock = body;
/* Generate the loops. */ /* Generate the loops. */
for (dim = 0; dim < loop->dimen + loop->codimen; dim++) for (dim = 0; dim < loop->dimen; dim++)
{ {
n = loop->order[dim]; n = loop->order[dim];
gfc_trans_scalarized_loop_end (loop, n, pblock); gfc_trans_scalarized_loop_end (loop, n, pblock);
@ -3288,7 +3284,6 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
case GFC_SS_FUNCTION: case GFC_SS_FUNCTION:
case GFC_SS_COMPONENT: case GFC_SS_COMPONENT:
loop->dimen = ss->data.info.dimen; loop->dimen = ss->data.info.dimen;
loop->codimen = ss->data.info.codimen;
goto done; goto done;
/* As usual, lbound and ubound are exceptions!. */ /* As usual, lbound and ubound are exceptions!. */
@ -3298,14 +3293,12 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop)
case GFC_ISYM_LBOUND: case GFC_ISYM_LBOUND:
case GFC_ISYM_UBOUND: case GFC_ISYM_UBOUND:
loop->dimen = ss->data.info.dimen; loop->dimen = ss->data.info.dimen;
loop->codimen = 0;
goto done; goto done;
case GFC_ISYM_LCOBOUND: case GFC_ISYM_LCOBOUND:
case GFC_ISYM_UCOBOUND: case GFC_ISYM_UCOBOUND:
case GFC_ISYM_THIS_IMAGE: case GFC_ISYM_THIS_IMAGE:
loop->dimen = ss->data.info.dimen; loop->dimen = ss->data.info.dimen;
loop->codimen = ss->data.info.codimen;
goto done; goto done;
default: default:
@ -3888,7 +3881,7 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
mpz_t i; mpz_t i;
mpz_init (i); mpz_init (i);
for (n = 0; n < loop->dimen + loop->codimen; n++) for (n = 0; n < loop->dimen; n++)
{ {
loopspec[n] = NULL; loopspec[n] = NULL;
dynamic[n] = false; dynamic[n] = false;
@ -3997,7 +3990,7 @@ gfc_conv_loop_setup (gfc_loopinfo * loop, locus * where)
/* Set the extents of this range. */ /* Set the extents of this range. */
cshape = loopspec[n]->shape; cshape = loopspec[n]->shape;
if (n < loop->dimen && cshape && INTEGER_CST_P (info->start[dim]) if (cshape && INTEGER_CST_P (info->start[dim])
&& INTEGER_CST_P (info->stride[dim])) && INTEGER_CST_P (info->stride[dim]))
{ {
loop->from[n] = info->start[dim]; loop->from[n] = info->start[dim];

2
gcc/fortran/trans.h
View File

@ -245,7 +245,7 @@ typedef struct gfc_loopinfo
stmtblock_t pre; stmtblock_t pre;
stmtblock_t post; stmtblock_t post;
int dimen, codimen; int dimen;
/* All the SS involved with this loop. */ /* All the SS involved with this loop. */
gfc_ss *ss; gfc_ss *ss;