diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be9ccb246b5a9a5404763c1a3d0fea7733805abf..bf936e8178e5da7f306908b1322c35ab6d5b827c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-14 Richard Guenther <rguenther@suse.de>
+
+ * tree-ssa-dse.c (struct dse_global_data, struct dse_block_local_data):
+ Remove.
+ (dse_initialize_block_local_data, dse_leave_block,
+ record_voperand_set, get_stmt_uid): Likewise.
+ (dse_possible_dead_store_p): Allow any kind of killing stmt.
+ (dse_optimize_stmt): Remove voperand set handling code.
+ Simplify and improve to handle any kind of killing stmt.
+ (dse_record_phi): Remove.
+ (dse_enter_block): Simplify.
+ (tree_ssa_dse): Likewise.
+ * tree-ssa-alias.c (stmt_kills_ref_p_1): Handle some builtins.
+
2011-04-14 Jan Hubicka <jh@suse.cz>
* cgraph.c (dump_cgraph_node): Do not dump inline summaries.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 62c4a6c0397065157599a28237f95dddb3c9f2b4..ffca004140f85b0c25bbe6223677c74d4eb30291 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-14 Richard Guenther <rguenther@suse.de>
+
+ * gcc.dg/tree-ssa/ssa-dse-14.c: New testcase.
+
2011-04-14 Richard Guenther <rguenther@suse.de>
* gcc.dg/fold-bitand-4.c: Move ...
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c
new file mode 100644
index 0000000000000000000000000000000000000000..1c74596adbab87ce616e10e87269d7f67befec25
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-14.c
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fdump-tree-dse1-details" } */
+
+struct A { char c[4]; } a, b;
+
+void
+f1 (void)
+{
+ a.c[2] = '\0';
+ __builtin_memset (&a.c[1], 1, 2);
+}
+
+void
+f2 (void)
+{
+ __builtin_memcpy (&a.c[0], "a", 1);
+ __builtin_memcpy (&a, &b, 3);
+}
+
+/* { dg-final { scan-tree-dump-times "Deleted dead store" 2 "dse1" } } */
+/* { dg-final { cleanup-tree-dump "dse1" } } */
diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c
index 1e80f49c5a042094c0ef3cfc1bf06c4819d38d74..67ba8f1323cbed25b97a38ea580cf769e517128a 100644
--- a/gcc/tree-ssa-alias.c
+++ b/gcc/tree-ssa-alias.c
@@ -1616,21 +1616,25 @@ stmt_may_clobber_ref_p (gimple stmt, tree ref)
static bool
stmt_kills_ref_p_1 (gimple stmt, ao_ref *ref)
{
+ /* For a must-alias check we need to be able to constrain
+ the access properly. */
+ ao_ref_base (ref);
+ if (ref->max_size == -1)
+ return false;
+
if (gimple_has_lhs (stmt)
&& TREE_CODE (gimple_get_lhs (stmt)) != SSA_NAME)
{
tree base, lhs = gimple_get_lhs (stmt);
HOST_WIDE_INT size, offset, max_size;
- ao_ref_base (ref);
base = get_ref_base_and_extent (lhs, &offset, &size, &max_size);
/* We can get MEM[symbol: sZ, index: D.8862_1] here,
so base == ref->base does not always hold. */
if (base == ref->base)
{
/* For a must-alias check we need to be able to constrain
- the accesses properly. */
- if (size != -1 && size == max_size
- && ref->max_size != -1)
+ the access properly. */
+ if (size != -1 && size == max_size)
{
if (offset <= ref->offset
&& offset + size >= ref->offset + ref->max_size)
@@ -1638,6 +1642,45 @@ stmt_kills_ref_p_1 (gimple stmt, ao_ref *ref)
}
}
}
+
+ if (is_gimple_call (stmt))
+ {
+ tree callee = gimple_call_fndecl (stmt);
+ if (callee != NULL_TREE
+ && DECL_BUILT_IN_CLASS (callee) == BUILT_IN_NORMAL)
+ switch (DECL_FUNCTION_CODE (callee))
+ {
+ case BUILT_IN_MEMCPY:
+ case BUILT_IN_MEMPCPY:
+ case BUILT_IN_MEMMOVE:
+ case BUILT_IN_MEMSET:
+ {
+ tree dest = gimple_call_arg (stmt, 0);
+ tree len = gimple_call_arg (stmt, 2);
+ tree base = NULL_TREE;
+ HOST_WIDE_INT offset = 0;
+ if (!host_integerp (len, 0))
+ return false;
+ if (TREE_CODE (dest) == ADDR_EXPR)
+ base = get_addr_base_and_unit_offset (TREE_OPERAND (dest, 0),
+ &offset);
+ else if (TREE_CODE (dest) == SSA_NAME)
+ base = dest;
+ if (base
+ && base == ao_ref_base (ref))
+ {
+ HOST_WIDE_INT size = TREE_INT_CST_LOW (len);
+ if (offset <= ref->offset / BITS_PER_UNIT
+ && (offset + size
+ >= ((ref->offset + ref->max_size + BITS_PER_UNIT - 1)
+ / BITS_PER_UNIT)))
+ return true;
+ }
+ }
+ default:;
+ }
+
+ }
return false;
}
diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index 26a438d12b278a4c69da231a6157f9f3fff4a47f..6d51dabced63aeeea66bf560b24f55759338fd88 100644
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -65,84 +65,14 @@ along with GCC; see the file COPYING3. If not see
the CFG. */
-struct dse_global_data
-{
- /* This is the global bitmap for store statements.
-
- Each statement has a unique ID. When we encounter a store statement
- that we want to record, set the bit corresponding to the statement's
- unique ID in this bitmap. */
- bitmap stores;
-};
-
-/* We allocate a bitmap-per-block for stores which are encountered
- during the scan of that block. This allows us to restore the
- global bitmap of stores when we finish processing a block. */
-struct dse_block_local_data
-{
- bitmap stores;
-};
-
/* Bitmap of blocks that have had EH statements cleaned. We should
remove their dead edges eventually. */
static bitmap need_eh_cleanup;
static bool gate_dse (void);
static unsigned int tree_ssa_dse (void);
-static void dse_initialize_block_local_data (struct dom_walk_data *,
- basic_block,
- bool);
static void dse_enter_block (struct dom_walk_data *, basic_block);
-static void dse_leave_block (struct dom_walk_data *, basic_block);
-static void record_voperand_set (bitmap, bitmap *, unsigned int);
-
-/* Returns uid of statement STMT. */
-
-static unsigned
-get_stmt_uid (gimple stmt)
-{
- if (gimple_code (stmt) == GIMPLE_PHI)
- return SSA_NAME_VERSION (gimple_phi_result (stmt))
- + gimple_stmt_max_uid (cfun);
-
- return gimple_uid (stmt);
-}
-
-/* Set bit UID in bitmaps GLOBAL and *LOCAL, creating *LOCAL as needed. */
-
-static void
-record_voperand_set (bitmap global, bitmap *local, unsigned int uid)
-{
- /* Lazily allocate the bitmap. Note that we do not get a notification
- when the block local data structures die, so we allocate the local
- bitmap backed by the GC system. */
- if (*local == NULL)
- *local = BITMAP_GGC_ALLOC ();
-
- /* Set the bit in the local and global bitmaps. */
- bitmap_set_bit (*local, uid);
- bitmap_set_bit (global, uid);
-}
-
-/* Initialize block local data structures. */
-static void
-dse_initialize_block_local_data (struct dom_walk_data *walk_data,
- basic_block bb ATTRIBUTE_UNUSED,
- bool recycled)
-{
- struct dse_block_local_data *bd
- = (struct dse_block_local_data *)
- VEC_last (void_p, walk_data->block_data_stack);
-
- /* If we are given a recycled block local data structure, ensure any
- bitmap associated with the block is cleared. */
- if (recycled)
- {
- if (bd->stores)
- bitmap_clear (bd->stores);
- }
-}
/* A helper of dse_optimize_stmt.
Given a GIMPLE_ASSIGN in STMT, find a candidate statement *USE_STMT that
@@ -251,9 +181,6 @@ dse_possible_dead_store_p (gimple stmt, gimple *use_stmt)
continue walking until both stores have equal reference trees. */
while (!stmt_may_clobber_ref_p (temp, gimple_assign_lhs (stmt)));
- if (!is_gimple_assign (temp))
- return false;
-
*use_stmt = temp;
return true;
@@ -272,9 +199,7 @@ dse_possible_dead_store_p (gimple stmt, gimple *use_stmt)
post dominates the first store, then the first store is dead. */
static void
-dse_optimize_stmt (struct dse_global_data *dse_gd,
- struct dse_block_local_data *bd,
- gimple_stmt_iterator gsi)
+dse_optimize_stmt (gimple_stmt_iterator gsi)
{
gimple stmt = gsi_stmt (gsi);
@@ -295,8 +220,6 @@ dse_optimize_stmt (struct dse_global_data *dse_gd,
{
gimple use_stmt;
- record_voperand_set (dse_gd->stores, &bd->stores, gimple_uid (stmt));
-
if (!dse_possible_dead_store_p (stmt, &use_stmt))
return;
@@ -304,10 +227,10 @@ dse_optimize_stmt (struct dse_global_data *dse_gd,
stores are to the same memory location or there is a chain of
virtual uses from stmt and the stmt which stores to that same
memory location, then we may have found redundant store. */
- if (bitmap_bit_p (dse_gd->stores, get_stmt_uid (use_stmt))
- && (operand_equal_p (gimple_assign_lhs (stmt),
- gimple_assign_lhs (use_stmt), 0)
- || stmt_kills_ref_p (use_stmt, gimple_assign_lhs (stmt))))
+ if ((gimple_has_lhs (use_stmt)
+ && (operand_equal_p (gimple_assign_lhs (stmt),
+ gimple_get_lhs (use_stmt), 0)))
+ || stmt_kills_ref_p (use_stmt, gimple_assign_lhs (stmt)))
{
/* If use_stmt is or might be a nop assignment, e.g. for
struct { ... } S a, b, *p; ...
@@ -321,12 +244,7 @@ dse_optimize_stmt (struct dse_global_data *dse_gd,
acts as a use as well as definition, so store in STMT
is not dead. */
if (stmt != use_stmt
- && !is_gimple_reg (gimple_assign_rhs1 (use_stmt))
- && !is_gimple_min_invariant (gimple_assign_rhs1 (use_stmt))
- /* ??? Should {} be invariant? */
- && gimple_assign_rhs_code (use_stmt) != CONSTRUCTOR
- && refs_may_alias_p (gimple_assign_lhs (use_stmt),
- gimple_assign_rhs1 (use_stmt)))
+ && ref_maybe_used_by_stmt_p (use_stmt, gimple_assign_lhs (stmt)))
return;
if (dump_file && (dump_flags & TDF_DETAILS))
@@ -351,52 +269,14 @@ dse_optimize_stmt (struct dse_global_data *dse_gd,
}
}
-/* Record that we have seen the PHIs at the start of BB which correspond
- to virtual operands. */
-static void
-dse_record_phi (struct dse_global_data *dse_gd,
- struct dse_block_local_data *bd,
- gimple phi)
-{
- if (!is_gimple_reg (gimple_phi_result (phi)))
- record_voperand_set (dse_gd->stores, &bd->stores, get_stmt_uid (phi));
-}
-
static void
-dse_enter_block (struct dom_walk_data *walk_data, basic_block bb)
+dse_enter_block (struct dom_walk_data *walk_data ATTRIBUTE_UNUSED,
+ basic_block bb)
{
- struct dse_block_local_data *bd
- = (struct dse_block_local_data *)
- VEC_last (void_p, walk_data->block_data_stack);
- struct dse_global_data *dse_gd
- = (struct dse_global_data *) walk_data->global_data;
gimple_stmt_iterator gsi;
for (gsi = gsi_last (bb_seq (bb)); !gsi_end_p (gsi); gsi_prev (&gsi))
- dse_optimize_stmt (dse_gd, bd, gsi);
- for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
- dse_record_phi (dse_gd, bd, gsi_stmt (gsi));
-}
-
-static void
-dse_leave_block (struct dom_walk_data *walk_data,
- basic_block bb ATTRIBUTE_UNUSED)
-{
- struct dse_block_local_data *bd
- = (struct dse_block_local_data *)
- VEC_last (void_p, walk_data->block_data_stack);
- struct dse_global_data *dse_gd
- = (struct dse_global_data *) walk_data->global_data;
- bitmap stores = dse_gd->stores;
- unsigned int i;
- bitmap_iterator bi;
-
- /* Unwind the stores noted in this basic block. */
- if (bd->stores)
- EXECUTE_IF_SET_IN_BITMAP (bd->stores, 0, i, bi)
- {
- bitmap_clear_bit (stores, i);
- }
+ dse_optimize_stmt (gsi);
}
/* Main entry point. */
@@ -405,7 +285,6 @@ static unsigned int
tree_ssa_dse (void)
{
struct dom_walk_data walk_data;
- struct dse_global_data dse_gd;
need_eh_cleanup = BITMAP_ALLOC (NULL);
@@ -421,15 +300,12 @@ tree_ssa_dse (void)
/* Dead store elimination is fundamentally a walk of the post-dominator
tree and a backwards walk of statements within each block. */
walk_data.dom_direction = CDI_POST_DOMINATORS;
- walk_data.initialize_block_local_data = dse_initialize_block_local_data;
+ walk_data.initialize_block_local_data = NULL;
walk_data.before_dom_children = dse_enter_block;
- walk_data.after_dom_children = dse_leave_block;
+ walk_data.after_dom_children = NULL;
- walk_data.block_local_data_size = sizeof (struct dse_block_local_data);
-
- /* This is the main hash table for the dead store elimination pass. */
- dse_gd.stores = BITMAP_ALLOC (NULL);
- walk_data.global_data = &dse_gd;
+ walk_data.block_local_data_size = 0;
+ walk_data.global_data = NULL;
/* Initialize the dominator walker. */
init_walk_dominator_tree (&walk_data);
@@ -440,9 +316,6 @@ tree_ssa_dse (void)
/* Finalize the dominator walker. */
fini_walk_dominator_tree (&walk_data);
- /* Release the main bitmap. */
- BITMAP_FREE (dse_gd.stores);
-
/* Removal of stores may make some EH edges dead. Purge such edges from
the CFG as needed. */
if (!bitmap_empty_p (need_eh_cleanup))