Skip to content

R
riscv-gcc-1
Commit 02ce5d90 by Richard Sandiford Committed by Richard Sandiford
Options

poly_int: dse.c 

This patch makes RTL DSE use poly_int for offsets and sizes.
The local phase can optimise them normally but the global phase
treats them as wild accesses.

2017-12-20  Richard Sandiford  <richard.sandiford@linaro.org>
	    Alan Hayward  <alan.hayward@arm.com>
	    David Sherwood  <david.sherwood@arm.com>

gcc/
	* dse.c (store_info): Change offset and width from HOST_WIDE_INT
	to poly_int64.  Update commentary for positions_needed.large.
	(read_info_type): Change offset and width from HOST_WIDE_INT
	to poly_int64.
	(set_usage_bits): Likewise.
	(canon_address): Return the offset as a poly_int64 rather than
	a HOST_WIDE_INT.  Use strip_offset_and_add.
	(set_all_positions_unneeded, any_positions_needed_p): Use
	positions_needed.large to track stores with non-constant widths.
	(all_positions_needed_p): Likewise.  Take the offset and width
	as poly_int64s rather than ints.  Assert that rhs is nonnull.
	(record_store): Cope with non-constant offsets and widths.
	Nullify the rhs of an earlier store if we can't tell which bytes
	of it are needed.
	(find_shift_sequence): Take the access_size and shift as poly_int64s
	rather than ints.
	(get_stored_val): Take the read_offset and read_width as poly_int64s
	rather than HOST_WIDE_INTs.
	(check_mem_read_rtx, scan_stores, scan_reads, dse_step5): Handle
	non-constant offsets and widths.

Co-Authored-By: Alan Hayward <alan.hayward@arm.com>
Co-Authored-By: David Sherwood <david.sherwood@arm.com>

From-SVN: r255873
parent b9c25734
Showing with 186 additions and 78 deletions
gcc/ChangeLog
...@@ -2,6 +2,31 @@ ...@@ -2,6 +2,31 @@
Alan Hayward <alan.hayward@arm.com> Alan Hayward <alan.hayward@arm.com>
David Sherwood <david.sherwood@arm.com> David Sherwood <david.sherwood@arm.com>
* dse.c (store_info): Change offset and width from HOST_WIDE_INT
to poly_int64. Update commentary for positions_needed.large.
(read_info_type): Change offset and width from HOST_WIDE_INT
to poly_int64.
(set_usage_bits): Likewise.
(canon_address): Return the offset as a poly_int64 rather than
a HOST_WIDE_INT. Use strip_offset_and_add.
(set_all_positions_unneeded, any_positions_needed_p): Use
positions_needed.large to track stores with non-constant widths.
(all_positions_needed_p): Likewise. Take the offset and width
as poly_int64s rather than ints. Assert that rhs is nonnull.
(record_store): Cope with non-constant offsets and widths.
Nullify the rhs of an earlier store if we can't tell which bytes
of it are needed.
(find_shift_sequence): Take the access_size and shift as poly_int64s
rather than ints.
(get_stored_val): Take the read_offset and read_width as poly_int64s
rather than HOST_WIDE_INTs.
(check_mem_read_rtx, scan_stores, scan_reads, dse_step5): Handle
non-constant offsets and widths.
2017-12-20 Richard Sandiford <richard.sandiford@linaro.org>
Alan Hayward <alan.hayward@arm.com>
David Sherwood <david.sherwood@arm.com>
* inchash.h (inchash::hash::add_poly_int): New function. * inchash.h (inchash::hash::add_poly_int): New function.
* tree-ssa-alias.h (ao_ref::offset, ao_ref::size, ao_ref::max_size): * tree-ssa-alias.h (ao_ref::offset, ao_ref::size, ao_ref::max_size):
Use poly_int64 rather than HOST_WIDE_INT. Use poly_int64 rather than HOST_WIDE_INT.
gcc/dse.c
...@@ -244,11 +244,11 @@ struct store_info ...@@ -244,11 +244,11 @@ struct store_info
rtx mem_addr; rtx mem_addr;
/* The offset of the first byte associated with the operation. */ /* The offset of the first byte associated with the operation. */
HOST_WIDE_INT offset; poly_int64 offset;
/* The number of bytes covered by the operation. This is always exact /* The number of bytes covered by the operation. This is always exact
and known (rather than -1). */ and known (rather than -1). */
HOST_WIDE_INT width; poly_int64 width;
union union
{ {
...@@ -259,12 +259,19 @@ struct store_info ...@@ -259,12 +259,19 @@ struct store_info
struct struct
{ {
/* A bitmap with one bit per byte. Cleared bit means the position /* A bitmap with one bit per byte, or null if the number of
is needed. Used if IS_LARGE is false. */ bytes isn't known at compile time. A cleared bit means
the position is needed. Used if IS_LARGE is true. */
bitmap bmap; bitmap bmap;
/* Number of set bits (i.e. unneeded bytes) in BITMAP. If it is /* When BITMAP is nonnull, this counts the number of set bits
equal to WIDTH, the whole store is unused. */ (i.e. unneeded bytes) in the bitmap. If it is equal to
WIDTH, the whole store is unused.
When BITMAP is null:
- the store is definitely not needed when COUNT == 1
- all the store is needed when COUNT == 0 and RHS is nonnull
- otherwise we don't know which parts of the store are needed. */
int count; int count;
} large; } large;
} positions_needed; } positions_needed;
...@@ -308,10 +315,10 @@ struct read_info_type ...@@ -308,10 +315,10 @@ struct read_info_type
int group_id; int group_id;
/* The offset of the first byte associated with the operation. */ /* The offset of the first byte associated with the operation. */
HOST_WIDE_INT offset; poly_int64 offset;
/* The number of bytes covered by the operation, or -1 if not known. */ /* The number of bytes covered by the operation, or -1 if not known. */
HOST_WIDE_INT width; poly_int64 width;
/* The mem being read. */ /* The mem being read. */
rtx mem; rtx mem;
...@@ -940,13 +947,18 @@ can_escape (tree expr) ...@@ -940,13 +947,18 @@ can_escape (tree expr)
OFFSET and WIDTH. */ OFFSET and WIDTH. */
static void static void
set_usage_bits (group_info *group, HOST_WIDE_INT offset, HOST_WIDE_INT width, set_usage_bits (group_info *group, poly_int64 offset, poly_int64 width,
tree expr) tree expr)
{ {
HOST_WIDE_INT i; /* Non-constant offsets and widths act as global kills, so there's no point
trying to use them to derive global DSE candidates. */
HOST_WIDE_INT i, const_offset, const_width;
bool expr_escapes = can_escape (expr); bool expr_escapes = can_escape (expr);
if (offset > -MAX_OFFSET && offset + width < MAX_OFFSET) if (offset.is_constant (&const_offset)
for (i=offset; i<offset+width; i++) && width.is_constant (&const_width)
&& const_offset > -MAX_OFFSET
&& const_offset + const_width < MAX_OFFSET)
for (i = const_offset; i < const_offset + const_width; ++i)
{ {
bitmap store1; bitmap store1;
bitmap store2; bitmap store2;
...@@ -1080,7 +1092,7 @@ const_or_frame_p (rtx x) ...@@ -1080,7 +1092,7 @@ const_or_frame_p (rtx x)
static bool static bool
canon_address (rtx mem, canon_address (rtx mem,
int *group_id, int *group_id,
HOST_WIDE_INT *offset, poly_int64 *offset,
cselib_val **base) cselib_val **base)
{ {
machine_mode address_mode = get_address_mode (mem); machine_mode address_mode = get_address_mode (mem);
...@@ -1147,12 +1159,7 @@ canon_address (rtx mem, ...@@ -1147,12 +1159,7 @@ canon_address (rtx mem,
if (GET_CODE (address) == CONST) if (GET_CODE (address) == CONST)
address = XEXP (address, 0); address = XEXP (address, 0);
if (GET_CODE (address) == PLUS address = strip_offset_and_add (address, offset);
&& CONST_INT_P (XEXP (address, 1)))
{
*offset = INTVAL (XEXP (address, 1));
address = XEXP (address, 0);
}
if (ADDR_SPACE_GENERIC_P (MEM_ADDR_SPACE (mem)) if (ADDR_SPACE_GENERIC_P (MEM_ADDR_SPACE (mem))
&& const_or_frame_p (address)) && const_or_frame_p (address))
...@@ -1160,8 +1167,11 @@ canon_address (rtx mem, ...@@ -1160,8 +1167,11 @@ canon_address (rtx mem,
group_info *group = get_group_info (address); group_info *group = get_group_info (address);
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, " gid=%d offset=%d \n", {
group->id, (int)*offset); fprintf (dump_file, " gid=%d offset=", group->id);
print_dec (*offset, dump_file);
fprintf (dump_file, "\n");
}
*base = NULL; *base = NULL;
*group_id = group->id; *group_id = group->id;
return true; return true;
...@@ -1178,8 +1188,12 @@ canon_address (rtx mem, ...@@ -1178,8 +1188,12 @@ canon_address (rtx mem,
return false; return false;
} }
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, " varying cselib base=%u:%u offset = %d\n", {
(*base)->uid, (*base)->hash, (int)*offset); fprintf (dump_file, " varying cselib base=%u:%u offset = ",
(*base)->uid, (*base)->hash);
print_dec (*offset, dump_file);
fprintf (dump_file, "\n");
}
return true; return true;
} }
...@@ -1228,9 +1242,17 @@ set_all_positions_unneeded (store_info *s_info) ...@@ -1228,9 +1242,17 @@ set_all_positions_unneeded (store_info *s_info)
{ {
if (__builtin_expect (s_info->is_large, false)) if (__builtin_expect (s_info->is_large, false))
{ {
bitmap_set_range (s_info->positions_needed.large.bmap, HOST_WIDE_INT width;
0, s_info->width); if (s_info->width.is_constant (&width))
s_info->positions_needed.large.count = s_info->width; {
bitmap_set_range (s_info->positions_needed.large.bmap, 0, width);
s_info->positions_needed.large.count = width;
}
else
{
gcc_checking_assert (!s_info->positions_needed.large.bmap);
s_info->positions_needed.large.count = 1;
}
} }
else else
s_info->positions_needed.small_bitmask = HOST_WIDE_INT_0U; s_info->positions_needed.small_bitmask = HOST_WIDE_INT_0U;
...@@ -1242,35 +1264,64 @@ static inline bool ...@@ -1242,35 +1264,64 @@ static inline bool
any_positions_needed_p (store_info *s_info) any_positions_needed_p (store_info *s_info)
{ {
if (__builtin_expect (s_info->is_large, false)) if (__builtin_expect (s_info->is_large, false))
return s_info->positions_needed.large.count < s_info->width; {
HOST_WIDE_INT width;
if (s_info->width.is_constant (&width))
{
gcc_checking_assert (s_info->positions_needed.large.bmap);
return s_info->positions_needed.large.count < width;
}
else
{
gcc_checking_assert (!s_info->positions_needed.large.bmap);
return s_info->positions_needed.large.count == 0;
}
}
else else
return (s_info->positions_needed.small_bitmask != HOST_WIDE_INT_0U); return (s_info->positions_needed.small_bitmask != HOST_WIDE_INT_0U);
} }
/* Return TRUE if all bytes START through START+WIDTH-1 from S_INFO /* Return TRUE if all bytes START through START+WIDTH-1 from S_INFO
store are needed. */ store are known to be needed. */
static inline bool static inline bool
all_positions_needed_p (store_info *s_info, int start, int width) all_positions_needed_p (store_info *s_info, poly_int64 start,
poly_int64 width)
{ {
gcc_assert (s_info->rhs);
if (!s_info->width.is_constant ())
{
gcc_assert (s_info->is_large
&& !s_info->positions_needed.large.bmap);
return s_info->positions_needed.large.count == 0;
}
/* Otherwise, if START and WIDTH are non-constant, we're asking about
a non-constant region of a constant-sized store. We can't say for
sure that all positions are needed. */
HOST_WIDE_INT const_start, const_width;
if (!start.is_constant (&const_start)
|| !width.is_constant (&const_width))
return false;
if (__builtin_expect (s_info->is_large, false)) if (__builtin_expect (s_info->is_large, false))
{ {
int end = start + width; for (HOST_WIDE_INT i = const_start; i < const_start + const_width; ++i)
while (start < end) if (bitmap_bit_p (s_info->positions_needed.large.bmap, i))
if (bitmap_bit_p (s_info->positions_needed.large.bmap, start++))
return false; return false;
return true; return true;
} }
else else
{ {
unsigned HOST_WIDE_INT mask = lowpart_bitmask (width) << start; unsigned HOST_WIDE_INT mask
= lowpart_bitmask (const_width) << const_start;
return (s_info->positions_needed.small_bitmask & mask) == mask; return (s_info->positions_needed.small_bitmask & mask) == mask;
} }
} }
static rtx get_stored_val (store_info *, machine_mode, HOST_WIDE_INT, static rtx get_stored_val (store_info *, machine_mode, poly_int64,
HOST_WIDE_INT, basic_block, bool); poly_int64, basic_block, bool);
/* BODY is an instruction pattern that belongs to INSN. Return 1 if /* BODY is an instruction pattern that belongs to INSN. Return 1 if
...@@ -1281,8 +1332,8 @@ static int ...@@ -1281,8 +1332,8 @@ static int
record_store (rtx body, bb_info_t bb_info) record_store (rtx body, bb_info_t bb_info)
{ {
rtx mem, rhs, const_rhs, mem_addr; rtx mem, rhs, const_rhs, mem_addr;
HOST_WIDE_INT offset = 0; poly_int64 offset = 0;
HOST_WIDE_INT width = 0; poly_int64 width = 0;
insn_info_t insn_info = bb_info->last_insn; insn_info_t insn_info = bb_info->last_insn;
store_info *store_info = NULL; store_info *store_info = NULL;
int group_id; int group_id;
...@@ -1356,7 +1407,7 @@ record_store (rtx body, bb_info_t bb_info) ...@@ -1356,7 +1407,7 @@ record_store (rtx body, bb_info_t bb_info)
else else
width = GET_MODE_SIZE (GET_MODE (mem)); width = GET_MODE_SIZE (GET_MODE (mem));
if (offset > HOST_WIDE_INT_MAX - width) if (!endpoint_representable_p (offset, width))
{ {
clear_rhs_from_active_local_stores (); clear_rhs_from_active_local_stores ();
return 0; return 0;
...@@ -1443,7 +1494,7 @@ record_store (rtx body, bb_info_t bb_info) ...@@ -1443,7 +1494,7 @@ record_store (rtx body, bb_info_t bb_info)
group_info *group = rtx_group_vec[group_id]; group_info *group = rtx_group_vec[group_id];
mem_addr = group->canon_base_addr; mem_addr = group->canon_base_addr;
} }
if (offset) if (maybe_ne (offset, 0))
mem_addr = plus_constant (get_address_mode (mem), mem_addr, offset); mem_addr = plus_constant (get_address_mode (mem), mem_addr, offset);
while (ptr) while (ptr)
...@@ -1503,18 +1554,27 @@ record_store (rtx body, bb_info_t bb_info) ...@@ -1503,18 +1554,27 @@ record_store (rtx body, bb_info_t bb_info)
} }
} }
HOST_WIDE_INT begin_unneeded, const_s_width, const_width;
if (known_subrange_p (s_info->offset, s_info->width, offset, width)) if (known_subrange_p (s_info->offset, s_info->width, offset, width))
/* The new store touches every byte that S_INFO does. */ /* The new store touches every byte that S_INFO does. */
set_all_positions_unneeded (s_info); set_all_positions_unneeded (s_info);
else else if ((offset - s_info->offset).is_constant (&begin_unneeded)
&& s_info->width.is_constant (&const_s_width)
&& width.is_constant (&const_width))
{ {
HOST_WIDE_INT begin_unneeded = offset - s_info->offset; HOST_WIDE_INT end_unneeded = begin_unneeded + const_width;
HOST_WIDE_INT end_unneeded = begin_unneeded + width;
begin_unneeded = MAX (begin_unneeded, 0); begin_unneeded = MAX (begin_unneeded, 0);
end_unneeded = MIN (end_unneeded, s_info->width); end_unneeded = MIN (end_unneeded, const_s_width);
for (i = begin_unneeded; i < end_unneeded; ++i) for (i = begin_unneeded; i < end_unneeded; ++i)
set_position_unneeded (s_info, i); set_position_unneeded (s_info, i);
} }
else
{
/* We don't know which parts of S_INFO are needed and
which aren't, so invalidate the RHS. */
s_info->rhs = NULL;
s_info->const_rhs = NULL;
}
} }
else if (s_info->rhs) else if (s_info->rhs)
/* Need to see if it is possible for this store to overwrite /* Need to see if it is possible for this store to overwrite
...@@ -1560,7 +1620,14 @@ record_store (rtx body, bb_info_t bb_info) ...@@ -1560,7 +1620,14 @@ record_store (rtx body, bb_info_t bb_info)
store_info->mem = mem; store_info->mem = mem;
store_info->mem_addr = mem_addr; store_info->mem_addr = mem_addr;
store_info->cse_base = base; store_info->cse_base = base;
if (width > HOST_BITS_PER_WIDE_INT) HOST_WIDE_INT const_width;
if (!width.is_constant (&const_width))
{
store_info->is_large = true;
store_info->positions_needed.large.count = 0;
store_info->positions_needed.large.bmap = NULL;
}
else if (const_width > HOST_BITS_PER_WIDE_INT)
{ {
store_info->is_large = true; store_info->is_large = true;
store_info->positions_needed.large.count = 0; store_info->positions_needed.large.count = 0;
...@@ -1569,7 +1636,8 @@ record_store (rtx body, bb_info_t bb_info) ...@@ -1569,7 +1636,8 @@ record_store (rtx body, bb_info_t bb_info)
else else
{ {
store_info->is_large = false; store_info->is_large = false;
store_info->positions_needed.small_bitmask = lowpart_bitmask (width); store_info->positions_needed.small_bitmask
= lowpart_bitmask (const_width);
} }
store_info->group_id = group_id; store_info->group_id = group_id;
store_info->offset = offset; store_info->offset = offset;
...@@ -1604,10 +1672,10 @@ dump_insn_info (const char * start, insn_info_t insn_info) ...@@ -1604,10 +1672,10 @@ dump_insn_info (const char * start, insn_info_t insn_info)
shift. */ shift. */
static rtx static rtx
find_shift_sequence (int access_size, find_shift_sequence (poly_int64 access_size,
store_info *store_info, store_info *store_info,
machine_mode read_mode, machine_mode read_mode,
int shift, bool speed, bool require_cst) poly_int64 shift, bool speed, bool require_cst)
{ {
machine_mode store_mode = GET_MODE (store_info->mem); machine_mode store_mode = GET_MODE (store_info->mem);
scalar_int_mode new_mode; scalar_int_mode new_mode;
...@@ -1743,11 +1811,11 @@ look_for_hardregs (rtx x, const_rtx pat ATTRIBUTE_UNUSED, void *data) ...@@ -1743,11 +1811,11 @@ look_for_hardregs (rtx x, const_rtx pat ATTRIBUTE_UNUSED, void *data)
static rtx static rtx
get_stored_val (store_info *store_info, machine_mode read_mode, get_stored_val (store_info *store_info, machine_mode read_mode,
HOST_WIDE_INT read_offset, HOST_WIDE_INT read_width, poly_int64 read_offset, poly_int64 read_width,
basic_block bb, bool require_cst) basic_block bb, bool require_cst)
{ {
machine_mode store_mode = GET_MODE (store_info->mem); machine_mode store_mode = GET_MODE (store_info->mem);
HOST_WIDE_INT gap; poly_int64 gap;
rtx read_reg; rtx read_reg;
/* To get here the read is within the boundaries of the write so /* To get here the read is within the boundaries of the write so
...@@ -1761,10 +1829,10 @@ get_stored_val (store_info *store_info, machine_mode read_mode, ...@@ -1761,10 +1829,10 @@ get_stored_val (store_info *store_info, machine_mode read_mode,
else else
gap = read_offset - store_info->offset; gap = read_offset - store_info->offset;
if (gap != 0) if (maybe_ne (gap, 0))
{ {
HOST_WIDE_INT shift = gap * BITS_PER_UNIT; poly_int64 shift = gap * BITS_PER_UNIT;
HOST_WIDE_INT access_size = GET_MODE_SIZE (read_mode) + gap; poly_int64 access_size = GET_MODE_SIZE (read_mode) + gap;
read_reg = find_shift_sequence (access_size, store_info, read_mode, read_reg = find_shift_sequence (access_size, store_info, read_mode,
shift, optimize_bb_for_speed_p (bb), shift, optimize_bb_for_speed_p (bb),
require_cst); require_cst);
...@@ -1983,8 +2051,8 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info) ...@@ -1983,8 +2051,8 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info)
{ {
rtx mem = *loc, mem_addr; rtx mem = *loc, mem_addr;
insn_info_t insn_info; insn_info_t insn_info;
HOST_WIDE_INT offset = 0; poly_int64 offset = 0;
HOST_WIDE_INT width = 0; poly_int64 width = 0;
cselib_val *base = NULL; cselib_val *base = NULL;
int group_id; int group_id;
read_info_t read_info; read_info_t read_info;
...@@ -2019,9 +2087,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info) ...@@ -2019,9 +2087,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info)
else else
width = GET_MODE_SIZE (GET_MODE (mem)); width = GET_MODE_SIZE (GET_MODE (mem));
if (width == -1 if (!endpoint_representable_p (offset, known_eq (width, -1) ? 1 : width))
? offset == HOST_WIDE_INT_MIN
: offset > HOST_WIDE_INT_MAX - width)
{ {
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, " adding wild read, due to overflow.\n"); fprintf (dump_file, " adding wild read, due to overflow.\n");
...@@ -2043,7 +2109,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info) ...@@ -2043,7 +2109,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info)
group_info *group = rtx_group_vec[group_id]; group_info *group = rtx_group_vec[group_id];
mem_addr = group->canon_base_addr; mem_addr = group->canon_base_addr;
} }
if (offset) if (maybe_ne (offset, 0))
mem_addr = plus_constant (get_address_mode (mem), mem_addr, offset); mem_addr = plus_constant (get_address_mode (mem), mem_addr, offset);
if (group_id >= 0) if (group_id >= 0)
...@@ -2055,7 +2121,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info) ...@@ -2055,7 +2121,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info)
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
{ {
if (width == -1) if (!known_size_p (width))
fprintf (dump_file, " processing const load gid=%d[BLK]\n", fprintf (dump_file, " processing const load gid=%d[BLK]\n",
group_id); group_id);
else else
...@@ -2089,7 +2155,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info) ...@@ -2089,7 +2155,7 @@ check_mem_read_rtx (rtx *loc, bb_info_t bb_info)
{ {
/* This is a block mode load. We may get lucky and /* This is a block mode load. We may get lucky and
canon_true_dependence may save the day. */ canon_true_dependence may save the day. */
if (width == -1) if (!known_size_p (width))
remove remove
= canon_true_dependence (store_info->mem, = canon_true_dependence (store_info->mem,
GET_MODE (store_info->mem), GET_MODE (store_info->mem),
...@@ -2820,13 +2886,17 @@ scan_stores (store_info *store_info, bitmap gen, bitmap kill) ...@@ -2820,13 +2886,17 @@ scan_stores (store_info *store_info, bitmap gen, bitmap kill)
{ {
while (store_info) while (store_info)
{ {
HOST_WIDE_INT i; HOST_WIDE_INT i, offset, width;
group_info *group_info group_info *group_info
= rtx_group_vec[store_info->group_id]; = rtx_group_vec[store_info->group_id];
if (group_info->process_globally) /* We can (conservatively) ignore stores whose bounds aren't known;
they simply don't generate new global dse opportunities. */
if (group_info->process_globally
&& store_info->offset.is_constant (&offset)
&& store_info->width.is_constant (&width))
{ {
HOST_WIDE_INT end = store_info->offset + store_info->width; HOST_WIDE_INT end = offset + width;
for (i = store_info->offset; i < end; i++) for (i = offset; i < end; i++)
{ {
int index = get_bitmap_index (group_info, i); int index = get_bitmap_index (group_info, i);
if (index != 0) if (index != 0)
...@@ -2886,7 +2956,12 @@ scan_reads (insn_info_t insn_info, bitmap gen, bitmap kill) ...@@ -2886,7 +2956,12 @@ scan_reads (insn_info_t insn_info, bitmap gen, bitmap kill)
{ {
if (i == read_info->group_id) if (i == read_info->group_id)
{ {
if (!known_size_p (read_info->width)) HOST_WIDE_INT offset, width;
/* Reads with non-constant size kill all DSE opportunities
in the group. */
if (!read_info->offset.is_constant (&offset)
|| !read_info->width.is_constant (&width)
|| !known_size_p (width))
{ {
/* Handle block mode reads. */ /* Handle block mode reads. */
if (kill) if (kill)
...@@ -2898,8 +2973,8 @@ scan_reads (insn_info_t insn_info, bitmap gen, bitmap kill) ...@@ -2898,8 +2973,8 @@ scan_reads (insn_info_t insn_info, bitmap gen, bitmap kill)
/* The groups are the same, just process the /* The groups are the same, just process the
offsets. */ offsets. */
HOST_WIDE_INT j; HOST_WIDE_INT j;
HOST_WIDE_INT end = read_info->offset + read_info->width; HOST_WIDE_INT end = offset + width;
for (j = read_info->offset; j < end; j++) for (j = offset; j < end; j++)
{ {
int index = get_bitmap_index (group, j); int index = get_bitmap_index (group, j);
if (index != 0) if (index != 0)
...@@ -3315,22 +3390,30 @@ dse_step5 (void) ...@@ -3315,22 +3390,30 @@ dse_step5 (void)
while (!store_info->is_set) while (!store_info->is_set)
store_info = store_info->next; store_info = store_info->next;
HOST_WIDE_INT i; HOST_WIDE_INT i, offset, width;
group_info *group_info = rtx_group_vec[store_info->group_id]; group_info *group_info = rtx_group_vec[store_info->group_id];
HOST_WIDE_INT end = store_info->offset + store_info->width; if (!store_info->offset.is_constant (&offset)
for (i = store_info->offset; i < end; i++) || !store_info->width.is_constant (&width))
deleted = false;
else
{ {
int index = get_bitmap_index (group_info, i); HOST_WIDE_INT end = offset + width;
for (i = offset; i < end; i++)
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "i = %d, index = %d\n", (int)i, index);
if (index == 0 || !bitmap_bit_p (v, index))
{ {
int index = get_bitmap_index (group_info, i);
if (dump_file && (dump_flags & TDF_DETAILS)) if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "failing at i = %d\n", (int)i); fprintf (dump_file, "i = %d, index = %d\n",
deleted = false; (int) i, index);
break; if (index == 0 || !bitmap_bit_p (v, index))
{
if (dump_file && (dump_flags & TDF_DETAILS))
fprintf (dump_file, "failing at i = %d\n",
(int) i);
deleted = false;
break;
}
} }
} }
if (deleted) if (deleted)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment