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

Makefile.in (GTFILES): Add tree-ssa-loop-ivopts.c.

Browse Source 
* Makefile.in (GTFILES): Add tree-ssa-loop-ivopts.c.
	* tree-ssa-loop-ivopts.c (compute_max_addr_offset): Delete.
	(addr_list, addr_offset_valid_p): New.
	(split_address_groups): Check offset validity with above function.
	(gt-tree-ssa-loop-ivopts.h): Include header file.

From-SVN: r247653
This commit is contained in:
Bin Cheng 2017-05-05 18:34:45 +00:00 committed by Bin Cheng
parent 13c5654f74
commit 359b060e79
3 changed files with 52 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2017-05-05 Bin Cheng <bin.cheng@arm.com>
* Makefile.in (GTFILES): Add tree-ssa-loop-ivopts.c.
* tree-ssa-loop-ivopts.c (compute_max_addr_offset): Delete.
(addr_list, addr_offset_valid_p): New.
(split_address_groups): Check offset validity with above function.
(gt-tree-ssa-loop-ivopts.h): Include header file.
2017-05-05 Nathan Sidwell <nathan@acm.org> 2017-05-05 Nathan Sidwell <nathan@acm.org>
* config.gcc (arm*-*-*): Add missing 'fi'. * config.gcc (arm*-*-*): Add missing 'fi'.

2
gcc/Makefile.in
View File

@ -2484,7 +2484,7 @@ GTFILES = $(CPP_ID_DATA_H) $(srcdir)/input.h $(srcdir)/coretypes.h \
$(srcdir)/gimple-ssa.h \ $(srcdir)/gimple-ssa.h \
$(srcdir)/tree-chkp.c \ $(srcdir)/tree-chkp.c \
$(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \ $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \
$(srcdir)/tree-cfg.c \ $(srcdir)/tree-cfg.c $(srcdir)/tree-ssa-loop-ivopts.c \
$(srcdir)/tree-dfa.c \ $(srcdir)/tree-dfa.c \
$(srcdir)/tree-iterator.c $(srcdir)/gimple-expr.c \ $(srcdir)/tree-iterator.c $(srcdir)/gimple-expr.c \
$(srcdir)/tree-chrec.h \ $(srcdir)/tree-chrec.h \

117
gcc/tree-ssa-loop-ivopts.c
View File

@ -2459,67 +2459,36 @@ find_interesting_uses_outside (struct ivopts_data *data, edge exit)
} }
} }
/* Compute maximum offset of [base + offset] addressing mode /* Return TRUE if OFFSET is within the range of [base + offset] addressing
for memory reference represented by USE. */ mode for memory reference represented by USE. */
static HOST_WIDE_INT static GTY (()) vec<rtx, va_gc> *addr_list;
compute_max_addr_offset (struct iv_use *use)
static bool
addr_offset_valid_p (struct iv_use *use, HOST_WIDE_INT offset)
{ {
int width;
rtx reg, addr; rtx reg, addr;
HOST_WIDE_INT i, off; unsigned list_index;
unsigned list_index, num; addr_space_t as = TYPE_ADDR_SPACE (TREE_TYPE (use->iv->base));
addr_space_t as; machine_mode addr_mode, mem_mode = TYPE_MODE (TREE_TYPE (*use->op_p));
machine_mode mem_mode, addr_mode;
static vec<HOST_WIDE_INT> max_offset_list;
as = TYPE_ADDR_SPACE (TREE_TYPE (use->iv->base));
mem_mode = TYPE_MODE (TREE_TYPE (*use->op_p));
num = max_offset_list.length ();
list_index = (unsigned) as * MAX_MACHINE_MODE + (unsigned) mem_mode; list_index = (unsigned) as * MAX_MACHINE_MODE + (unsigned) mem_mode;
if (list_index >= num) if (list_index >= vec_safe_length (addr_list))
vec_safe_grow_cleared (addr_list, list_index + MAX_MACHINE_MODE);
addr = (*addr_list)[list_index];
if (!addr)
{ {
max_offset_list.safe_grow (list_index + MAX_MACHINE_MODE); addr_mode = targetm.addr_space.address_mode (as);
for (; num < max_offset_list.length (); num++) reg = gen_raw_REG (addr_mode, LAST_VIRTUAL_REGISTER + 1);
max_offset_list[num] = -1; addr = gen_rtx_fmt_ee (PLUS, addr_mode, reg, NULL_RTX);
(*addr_list)[list_index] = addr;
} }
else
addr_mode = GET_MODE (addr);
off = max_offset_list[list_index]; XEXP (addr, 1) = gen_int_mode (offset, addr_mode);
if (off != -1) return (memory_address_addr_space_p (mem_mode, addr, as));
return off;
addr_mode = targetm.addr_space.address_mode (as);
reg = gen_raw_REG (addr_mode, LAST_VIRTUAL_REGISTER + 1);
addr = gen_rtx_fmt_ee (PLUS, addr_mode, reg, NULL_RTX);
width = GET_MODE_BITSIZE (addr_mode) - 1;
if (width > (HOST_BITS_PER_WIDE_INT - 1))
width = HOST_BITS_PER_WIDE_INT - 1;
for (i = width; i > 0; i--)
{
off = (HOST_WIDE_INT_1U << i) - 1;
XEXP (addr, 1) = gen_int_mode (off, addr_mode);
if (memory_address_addr_space_p (mem_mode, addr, as))
break;
/* For some strict-alignment targets, the offset must be naturally
aligned. Try an aligned offset if mem_mode is not QImode. */
off = (HOST_WIDE_INT_1U << i);
if (off > GET_MODE_SIZE (mem_mode) && mem_mode != QImode)
{
off -= GET_MODE_SIZE (mem_mode);
XEXP (addr, 1) = gen_int_mode (off, addr_mode);
if (memory_address_addr_space_p (mem_mode, addr, as))
break;
}
}
if (i == 0)
off = 0;
max_offset_list[list_index] = off;
return off;
} }
/* Comparison function to sort group in ascending order of addr_offset. */ /* Comparison function to sort group in ascending order of addr_offset. */
@ -2598,14 +2567,12 @@ static void
split_address_groups (struct ivopts_data *data) split_address_groups (struct ivopts_data *data)
{ {
unsigned int i, j; unsigned int i, j;
HOST_WIDE_INT max_offset = -1; /* Always split group. */
bool split_p = split_small_address_groups_p (data);
/* Reset max offset to split all small groups. */
if (split_small_address_groups_p (data))
max_offset = 0;
for (i = 0; i < data->vgroups.length (); i++) for (i = 0; i < data->vgroups.length (); i++)
{ {
struct iv_group *new_group = NULL;
struct iv_group *group = data->vgroups[i]; struct iv_group *group = data->vgroups[i];
struct iv_use *use = group->vuses[0]; struct iv_use *use = group->vuses[0];
@ -2614,29 +2581,29 @@ split_address_groups (struct ivopts_data *data)
if (group->vuses.length () == 1) if (group->vuses.length () == 1)
continue; continue;
if (max_offset != 0) gcc_assert (group->type == USE_ADDRESS);
max_offset = compute_max_addr_offset (use);
for (j = 1; j < group->vuses.length (); j++) for (j = 1; j < group->vuses.length ();)
{ {
struct iv_use *next = group->vuses[j]; struct iv_use *next = group->vuses[j];
HOST_WIDE_INT offset = next->addr_offset - use->addr_offset;
/* Only uses with offset that can fit in offset part against /* Split group if aksed to, or the offset against the first
the first use can be grouped together. */ use can't fit in offset part of addressing mode. IV uses
if (next->addr_offset - use->addr_offset having the same offset are still kept in one group. */
> (unsigned HOST_WIDE_INT) max_offset) if (offset != 0 &&
break; (split_p || !addr_offset_valid_p (use, offset)))
{
if (!new_group)
new_group = record_group (data, group->type);
group->vuses.ordered_remove (j);
new_group->vuses.safe_push (next);
continue;
}
next->id = j; next->id = j;
next->group_id = group->id; next->group_id = group->id;
} j++;
/* Split group. */
if (j < group->vuses.length ())
{
struct iv_group *new_group = record_group (data, group->type);
new_group->vuses.safe_splice (group->vuses);
new_group->vuses.block_remove (0, j);
group->vuses.truncate (j);
} }
} }
} }
@ -7853,3 +7820,5 @@ tree_ssa_iv_optimize (void)
tree_ssa_iv_optimize_finalize (&data); tree_ssa_iv_optimize_finalize (&data);
} }
#include "gt-tree-ssa-loop-ivopts.h"