/* Code sinking for trees
- Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
Contributed by Daniel Berlin <dan@dberlin.org>
This file is part of GCC.
GCC 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 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GCC is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
-#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
-#include "diagnostic.h"
+#include "gimple-pretty-print.h"
#include "tree-inline.h"
#include "tree-flow.h"
-#include "tree-gimple.h"
+#include "gimple.h"
#include "tree-dump.h"
#include "timevar.h"
#include "fibheap.h"
#include "hashtab.h"
#include "tree-iterator.h"
-#include "real.h"
#include "alloc-pool.h"
#include "tree-pass.h"
#include "flags.h"
#include "bitmap.h"
#include "langhooks.h"
#include "cfgloop.h"
+#include "params.h"
/* TODO:
1. Sinking store only using scalar promotion (IE without moving the RHS):
else
y = *q;
-
+
should become
sinktemp = p;
p = p + 1;
y = *q
}
Store copy propagation will take care of the store elimination above.
-
+
2. Sinking using Partial Dead Code Elimination. */
static struct
-{
+{
/* The number of statements sunk down the flowgraph by code sinking. */
int sunk;
-
+
} sink_stats;
-/* Given a PHI, and one of it's arguments (DEF), find the edge for
+/* Given a PHI, and one of its arguments (DEF), find the edge for
that argument and return it. If the argument occurs twice in the PHI node,
we return NULL. */
static basic_block
-find_bb_for_arg (tree phi, tree def)
+find_bb_for_arg (gimple phi, tree def)
{
- int i;
+ size_t i;
bool foundone = false;
basic_block result = NULL;
- for (i = 0; i < PHI_NUM_ARGS (phi); i++)
+ for (i = 0; i < gimple_phi_num_args (phi); i++)
if (PHI_ARG_DEF (phi, i) == def)
{
if (foundone)
return NULL;
foundone = true;
- result = PHI_ARG_EDGE (phi, i)->src;
+ result = gimple_phi_arg_edge (phi, i)->src;
}
return result;
}
used in, so that you only have one place you can sink it to. */
static bool
-all_immediate_uses_same_place (tree stmt)
+all_immediate_uses_same_place (gimple stmt)
{
- tree firstuse = NULL_TREE;
+ gimple firstuse = NULL;
ssa_op_iter op_iter;
imm_use_iterator imm_iter;
use_operand_p use_p;
{
FOR_EACH_IMM_USE_FAST (use_p, imm_iter, var)
{
- if (firstuse == NULL_TREE)
+ if (is_gimple_debug (USE_STMT (use_p)))
+ continue;
+ if (firstuse == NULL)
firstuse = USE_STMT (use_p);
else
if (firstuse != USE_STMT (use_p))
return true;
}
-/* Some global stores don't necessarily have V_MAY_DEF's of global variables,
+/* Some global stores don't necessarily have VDEF's of global variables,
but we still must avoid moving them around. */
bool
-is_hidden_global_store (tree stmt)
+is_hidden_global_store (gimple stmt)
{
- stmt_ann_t ann = stmt_ann (stmt);
- v_may_def_optype v_may_defs;
- v_must_def_optype v_must_defs;
-
/* Check virtual definitions. If we get here, the only virtual
- definitions we should see are those generated by assignment
+ definitions we should see are those generated by assignment or call
statements. */
- v_may_defs = V_MAY_DEF_OPS (ann);
- v_must_defs = V_MUST_DEF_OPS (ann);
- if (NUM_V_MAY_DEFS (v_may_defs) > 0 || NUM_V_MUST_DEFS (v_must_defs) > 0)
+ if (gimple_vdef (stmt))
{
tree lhs;
- gcc_assert (TREE_CODE (stmt) == MODIFY_EXPR);
+ gcc_assert (is_gimple_assign (stmt) || is_gimple_call (stmt));
/* Note that we must not check the individual virtual operands
here. In particular, if this is an aliased store, we could
int x;
p_1 = (i_2 > 3) ? &x : p;
- # x_4 = V_MAY_DEF <x_3>
+ # x_4 = VDEF <x_3>
*p_1 = 5;
return 2;
variable.
Therefore, we check the base address of the LHS. If the
- address is a pointer, we check if its name tag or type tag is
+ address is a pointer, we check if its name tag or symbol tag is
a global variable. Otherwise, we check if the base variable
is a global. */
- lhs = TREE_OPERAND (stmt, 0);
+ lhs = gimple_get_lhs (stmt);
+
if (REFERENCE_CLASS_P (lhs))
lhs = get_base_address (lhs);
return true;
}
- else if (INDIRECT_REF_P (lhs))
- {
- tree ptr = TREE_OPERAND (lhs, 0);
- struct ptr_info_def *pi = SSA_NAME_PTR_INFO (ptr);
- tree nmt = (pi) ? pi->name_mem_tag : NULL_TREE;
- tree tmt = var_ann (SSA_NAME_VAR (ptr))->type_mem_tag;
-
- /* If either the name tag or the type tag for PTR is a
- global variable, then the store is necessary. */
- if ((nmt && is_global_var (nmt))
- || (tmt && is_global_var (tmt)))
- {
- return true;
- }
- }
+ else if (INDIRECT_REF_P (lhs)
+ || TREE_CODE (lhs) == MEM_REF
+ || TREE_CODE (lhs) == TARGET_MEM_REF)
+ return ptr_deref_may_alias_global_p (TREE_OPERAND (lhs, 0));
+ else if (CONSTANT_CLASS_P (lhs))
+ return true;
else
gcc_unreachable ();
}
+
return false;
}
/* Find the nearest common dominator of all of the immediate uses in IMM. */
static basic_block
-nearest_common_dominator_of_uses (tree stmt)
-{
+nearest_common_dominator_of_uses (gimple stmt, bool *debug_stmts)
+{
bitmap blocks = BITMAP_ALLOC (NULL);
basic_block commondom;
unsigned int j;
{
FOR_EACH_IMM_USE_FAST (use_p, imm_iter, var)
{
- tree usestmt = USE_STMT (use_p);
+ gimple usestmt = USE_STMT (use_p);
basic_block useblock;
- if (TREE_CODE (usestmt) == PHI_NODE)
+
+ if (gimple_code (usestmt) == GIMPLE_PHI)
{
- int j;
- for (j = 0; j < PHI_NUM_ARGS (usestmt); j++)
- {
- useblock = PHI_ARG_EDGE (usestmt, j)->src;
- /* Short circuit. Nothing dominates the entry block. */
- if (useblock == ENTRY_BLOCK_PTR)
- {
- BITMAP_FREE (blocks);
- return NULL;
- }
- bitmap_set_bit (blocks, useblock->index);
- }
+ int idx = PHI_ARG_INDEX_FROM_USE (use_p);
+
+ useblock = gimple_phi_arg_edge (usestmt, idx)->src;
+ }
+ else if (is_gimple_debug (usestmt))
+ {
+ *debug_stmts = true;
+ continue;
}
else
{
- useblock = bb_for_stmt (usestmt);
+ useblock = gimple_bb (usestmt);
+ }
- /* Short circuit. Nothing dominates the entry block. */
- if (useblock == ENTRY_BLOCK_PTR)
- {
- BITMAP_FREE (blocks);
- return NULL;
- }
- bitmap_set_bit (blocks, useblock->index);
+ /* Short circuit. Nothing dominates the entry block. */
+ if (useblock == ENTRY_BLOCK_PTR)
+ {
+ BITMAP_FREE (blocks);
+ return NULL;
}
+ bitmap_set_bit (blocks, useblock->index);
}
}
commondom = BASIC_BLOCK (bitmap_first_set_bit (blocks));
EXECUTE_IF_SET_IN_BITMAP (blocks, 0, j, bi)
- commondom = nearest_common_dominator (CDI_DOMINATORS, commondom,
+ commondom = nearest_common_dominator (CDI_DOMINATORS, commondom,
BASIC_BLOCK (j));
BITMAP_FREE (blocks);
return commondom;
}
-/* Given a statement (STMT) and the basic block it is currently in (FROMBB),
+/* Given EARLY_BB and LATE_BB, two blocks in a path through the dominator
+ tree, return the best basic block between them (inclusive) to place
+ statements.
+
+ We want the most control dependent block in the shallowest loop nest.
+
+ If the resulting block is in a shallower loop nest, then use it. Else
+ only use the resulting block if it has significantly lower execution
+ frequency than EARLY_BB to avoid gratutious statement movement. We
+ consider statements with VOPS more desirable to move.
+
+ This pass would obviously benefit from PDO as it utilizes block
+ frequencies. It would also benefit from recomputing frequencies
+ if profile data is not available since frequencies often get out
+ of sync with reality. */
+
+static basic_block
+select_best_block (basic_block early_bb,
+ basic_block late_bb,
+ gimple stmt)
+{
+ basic_block best_bb = late_bb;
+ basic_block temp_bb = late_bb;
+ int threshold;
+
+ while (temp_bb != early_bb)
+ {
+ /* If we've moved into a lower loop nest, then that becomes
+ our best block. */
+ if (temp_bb->loop_depth < best_bb->loop_depth)
+ best_bb = temp_bb;
+
+ /* Walk up the dominator tree, hopefully we'll find a shallower
+ loop nest. */
+ temp_bb = get_immediate_dominator (CDI_DOMINATORS, temp_bb);
+ }
+
+ /* If we found a shallower loop nest, then we always consider that
+ a win. This will always give us the most control dependent block
+ within that loop nest. */
+ if (best_bb->loop_depth < early_bb->loop_depth)
+ return best_bb;
+
+ /* Get the sinking threshold. If the statement to be moved has memory
+ operands, then increase the threshold by 7% as those are even more
+ profitable to avoid, clamping at 100%. */
+ threshold = PARAM_VALUE (PARAM_SINK_FREQUENCY_THRESHOLD);
+ if (gimple_vuse (stmt) || gimple_vdef (stmt))
+ {
+ threshold += 7;
+ if (threshold > 100)
+ threshold = 100;
+ }
+
+ /* If BEST_BB is at the same nesting level, then require it to have
+ significantly lower execution frequency to avoid gratutious movement. */
+ if (best_bb->loop_depth == early_bb->loop_depth
+ && best_bb->frequency < (early_bb->frequency * threshold / 100.0))
+ return best_bb;
+
+ /* No better block found, so return EARLY_BB, which happens to be the
+ statement's original block. */
+ return early_bb;
+}
+
+/* Given a statement (STMT) and the basic block it is currently in (FROMBB),
determine the location to sink the statement to, if any.
- Return the basic block to sink it to, or NULL if we should not sink
- it. */
+ Returns true if there is such location; in that case, TOGSI points to the
+ statement before that STMT should be moved. */
-static tree
-statement_sink_location (tree stmt, basic_block frombb)
+static bool
+statement_sink_location (gimple stmt, basic_block frombb,
+ gimple_stmt_iterator *togsi)
{
- tree use, def;
+ gimple use;
use_operand_p one_use = NULL_USE_OPERAND_P;
basic_block sinkbb;
use_operand_p use_p;
def_operand_p def_p;
ssa_op_iter iter;
- stmt_ann_t ann;
- tree rhs;
imm_use_iterator imm_iter;
- FOR_EACH_SSA_TREE_OPERAND (def, stmt, iter, SSA_OP_ALL_DEFS)
- {
- FOR_EACH_IMM_USE_FAST (one_use, imm_iter, def)
- {
- break;
- }
- if (one_use != NULL_USE_OPERAND_P)
- break;
- }
+ /* We only can sink assignments. */
+ if (!is_gimple_assign (stmt))
+ return false;
- /* Return if there are no immediate uses of this stmt. */
- if (one_use == NULL_USE_OPERAND_P)
- return NULL;
+ /* We only can sink stmts with a single definition. */
+ def_p = single_ssa_def_operand (stmt, SSA_OP_ALL_DEFS);
+ if (def_p == NULL_DEF_OPERAND_P)
+ return false;
- if (TREE_CODE (stmt) != MODIFY_EXPR)
- return NULL;
- rhs = TREE_OPERAND (stmt, 1);
+ /* Return if there are no immediate uses of this stmt. */
+ if (has_zero_uses (DEF_FROM_PTR (def_p)))
+ return false;
/* There are a few classes of things we can't or don't move, some because we
don't have code to handle it, some because it's not profitable and some
- because it's not legal.
-
+ because it's not legal.
+
We can't sink things that may be global stores, at least not without
calculating a lot more information, because we may cause it to no longer
be seen by an external routine that needs it depending on where it gets
- moved to.
-
+ moved to.
+
We don't want to sink loads from memory.
We can't sink statements that end basic blocks without splitting the
incoming edge for the sink location to place it there.
- We can't sink statements that have volatile operands.
+ We can't sink statements that have volatile operands.
We don't want to sink dead code, so anything with 0 immediate uses is not
- sunk.
+ sunk.
+
+ Don't sink BLKmode assignments if current function has any local explicit
+ register variables, as BLKmode assignments may involve memcpy or memset
+ calls or, on some targets, inline expansion thereof that sometimes need
+ to use specific hard registers.
*/
- ann = stmt_ann (stmt);
- if (NUM_VUSES (STMT_VUSE_OPS (stmt)) != 0
- || stmt_ends_bb_p (stmt)
- || TREE_SIDE_EFFECTS (rhs)
- || TREE_CODE (rhs) == EXC_PTR_EXPR
- || TREE_CODE (rhs) == FILTER_EXPR
- || is_hidden_global_store (stmt)
- || ann->has_volatile_ops)
- return NULL;
-
- FOR_EACH_SSA_DEF_OPERAND (def_p, stmt, iter, SSA_OP_ALL_DEFS)
- {
- tree def = DEF_FROM_PTR (def_p);
- if (is_global_var (SSA_NAME_VAR (def))
- || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (def))
- return NULL;
- }
-
+ if (stmt_ends_bb_p (stmt)
+ || gimple_has_side_effects (stmt)
+ || gimple_has_volatile_ops (stmt)
+ || (gimple_vuse (stmt) && !gimple_vdef (stmt))
+ || (cfun->has_local_explicit_reg_vars
+ && TYPE_MODE (TREE_TYPE (gimple_assign_lhs (stmt))) == BLKmode))
+ return false;
+
+ if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (DEF_FROM_PTR (def_p)))
+ return false;
+
FOR_EACH_SSA_USE_OPERAND (use_p, stmt, iter, SSA_OP_ALL_USES)
{
tree use = USE_FROM_PTR (use_p);
if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (use))
- return NULL;
+ return false;
+ }
+
+ use = NULL;
+
+ /* If stmt is a store the one and only use needs to be the VOP
+ merging PHI node. */
+ if (gimple_vdef (stmt))
+ {
+ FOR_EACH_IMM_USE_FAST (use_p, imm_iter, DEF_FROM_PTR (def_p))
+ {
+ gimple use_stmt = USE_STMT (use_p);
+
+ /* A killing definition is not a use. */
+ if (gimple_assign_single_p (use_stmt)
+ && gimple_vdef (use_stmt)
+ && operand_equal_p (gimple_assign_lhs (stmt),
+ gimple_assign_lhs (use_stmt), 0))
+ continue;
+
+ if (gimple_code (use_stmt) != GIMPLE_PHI)
+ return false;
+
+ if (use
+ && use != use_stmt)
+ return false;
+
+ use = use_stmt;
+ }
+ if (!use)
+ return false;
}
-
/* If all the immediate uses are not in the same place, find the nearest
common dominator of all the immediate uses. For PHI nodes, we have to
find the nearest common dominator of all of the predecessor blocks, since
that is where insertion would have to take place. */
- if (!all_immediate_uses_same_place (stmt))
+ else if (!all_immediate_uses_same_place (stmt))
{
- basic_block commondom = nearest_common_dominator_of_uses (stmt);
-
+ bool debug_stmts = false;
+ basic_block commondom = nearest_common_dominator_of_uses (stmt,
+ &debug_stmts);
+
if (commondom == frombb)
- return NULL;
+ return false;
/* Our common dominator has to be dominated by frombb in order to be a
trivially safe place to put this statement, since it has multiple
- uses. */
+ uses. */
if (!dominated_by_p (CDI_DOMINATORS, commondom, frombb))
- return NULL;
-
- /* It doesn't make sense to move to a dominator that post-dominates
- frombb, because it means we've just moved it into a path that always
- executes if frombb executes, instead of reducing the number of
- executions . */
- if (dominated_by_p (CDI_POST_DOMINATORS, frombb, commondom))
+ return false;
+
+ commondom = select_best_block (frombb, commondom, stmt);
+
+ if (commondom == frombb)
+ return false;
+
+ *togsi = gsi_after_labels (commondom);
+
+ return true;
+ }
+ else
+ {
+ FOR_EACH_IMM_USE_FAST (one_use, imm_iter, DEF_FROM_PTR (def_p))
{
- if (dump_file && (dump_flags & TDF_DETAILS))
- fprintf (dump_file, "Not moving store, common dominator post-dominates from block.\n");
- return NULL;
+ if (is_gimple_debug (USE_STMT (one_use)))
+ continue;
+ break;
}
+ use = USE_STMT (one_use);
- if (commondom == frombb || commondom->loop_depth > frombb->loop_depth)
- return NULL;
- if (dump_file && (dump_flags & TDF_DETAILS))
+ if (gimple_code (use) != GIMPLE_PHI)
{
- fprintf (dump_file, "Common dominator of all uses is %d\n",
- commondom->index);
+ sinkbb = gimple_bb (use);
+ sinkbb = select_best_block (frombb, gimple_bb (use), stmt);
+
+ if (sinkbb == frombb)
+ return false;
+
+ *togsi = gsi_for_stmt (use);
+
+ return true;
}
- return first_stmt (commondom);
}
- use = USE_STMT (one_use);
- if (TREE_CODE (use) != PHI_NODE)
- {
- sinkbb = bb_for_stmt (use);
- if (sinkbb == frombb || sinkbb->loop_depth > frombb->loop_depth
- || sinkbb->loop_father != frombb->loop_father)
- return NULL;
- return use;
- }
+ sinkbb = find_bb_for_arg (use, DEF_FROM_PTR (def_p));
- /* Note that at this point, all uses must be in the same statement, so it
- doesn't matter which def op we choose. */
- if (STMT_DEF_OPS (stmt) == NULL)
- {
- if (STMT_V_MAY_DEF_OPS (stmt) != NULL)
- def = V_MAY_DEF_RESULT (STMT_V_MAY_DEF_OPS (stmt), 0);
- else if (STMT_V_MUST_DEF_OPS (stmt) != NULL)
- def = V_MUST_DEF_RESULT (STMT_V_MUST_DEF_OPS (stmt), 0);
- else
- gcc_unreachable ();
- }
- else
- def = DEF_OP (STMT_DEF_OPS (stmt), 0);
-
- sinkbb = find_bb_for_arg (use, def);
+ /* This can happen if there are multiple uses in a PHI. */
if (!sinkbb)
- return NULL;
-
- /* This will happen when you have
- a_3 = PHI <a_13, a_26>
-
- a_26 = V_MAY_DEF <a_3>
+ return false;
+
+ sinkbb = select_best_block (frombb, sinkbb, stmt);
+ if (!sinkbb || sinkbb == frombb)
+ return false;
- If the use is a phi, and is in the same bb as the def,
- we can't sink it. */
+ /* If the latch block is empty, don't make it non-empty by sinking
+ something into it. */
+ if (sinkbb == frombb->loop_father->latch
+ && empty_block_p (sinkbb))
+ return false;
- if (bb_for_stmt (use) == frombb)
- return NULL;
- if (sinkbb == frombb || sinkbb->loop_depth > frombb->loop_depth
- || sinkbb->loop_father != frombb->loop_father)
- return NULL;
+ *togsi = gsi_after_labels (sinkbb);
- return first_stmt (sinkbb);
+ return true;
}
/* Perform code sinking on BB */
sink_code_in_bb (basic_block bb)
{
basic_block son;
- block_stmt_iterator bsi;
+ gimple_stmt_iterator gsi;
edge_iterator ei;
edge e;
-
+ bool last = true;
+
/* If this block doesn't dominate anything, there can't be any place to sink
the statements to. */
if (first_dom_son (CDI_DOMINATORS, bb) == NULL)
if (e->flags & EDGE_ABNORMAL)
goto earlyout;
- for (bsi = bsi_last (bb); !bsi_end_p (bsi);)
+ for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi);)
{
- tree stmt = bsi_stmt (bsi);
- block_stmt_iterator tobsi;
- tree sinkstmt;
- get_stmt_operands (stmt);
-
- sinkstmt = statement_sink_location (stmt, bb);
- if (!sinkstmt)
+ gimple stmt = gsi_stmt (gsi);
+ gimple_stmt_iterator togsi;
+
+ if (!statement_sink_location (stmt, bb, &togsi))
{
- if (!bsi_end_p (bsi))
- bsi_prev (&bsi);
+ if (!gsi_end_p (gsi))
+ gsi_prev (&gsi);
+ last = false;
continue;
- }
+ }
if (dump_file)
{
fprintf (dump_file, "Sinking ");
- print_generic_expr (dump_file, stmt, TDF_VOPS);
+ print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS);
fprintf (dump_file, " from bb %d to bb %d\n",
- bb->index, bb_for_stmt (sinkstmt)->index);
+ bb->index, (gsi_bb (togsi))->index);
}
- tobsi = bsi_for_stmt (sinkstmt);
- /* Find the first non-label. */
- while (!bsi_end_p (tobsi)
- && TREE_CODE (bsi_stmt (tobsi)) == LABEL_EXPR)
- bsi_next (&tobsi);
-
+
+ /* Update virtual operands of statements in the path we
+ do not sink to. */
+ if (gimple_vdef (stmt))
+ {
+ imm_use_iterator iter;
+ use_operand_p use_p;
+ gimple vuse_stmt;
+
+ FOR_EACH_IMM_USE_STMT (vuse_stmt, iter, gimple_vdef (stmt))
+ if (gimple_code (vuse_stmt) != GIMPLE_PHI)
+ FOR_EACH_IMM_USE_ON_STMT (use_p, iter)
+ SET_USE (use_p, gimple_vuse (stmt));
+ }
+
/* If this is the end of the basic block, we need to insert at the end
of the basic block. */
- if (bsi_end_p (tobsi))
- bsi_move_to_bb_end (&bsi, bb_for_stmt (sinkstmt));
+ if (gsi_end_p (togsi))
+ gsi_move_to_bb_end (&gsi, gsi_bb (togsi));
else
- bsi_move_before (&bsi, &tobsi);
+ gsi_move_before (&gsi, &togsi);
sink_stats.sunk++;
- if (!bsi_end_p (bsi))
- bsi_prev (&bsi);
-
+
+ /* If we've just removed the last statement of the BB, the
+ gsi_end_p() test below would fail, but gsi_prev() would have
+ succeeded, and we want it to succeed. So we keep track of
+ whether we're at the last statement and pick up the new last
+ statement. */
+ if (last)
+ {
+ gsi = gsi_last_bb (bb);
+ continue;
+ }
+
+ last = false;
+ if (!gsi_end_p (gsi))
+ gsi_prev (&gsi);
+
}
earlyout:
for (son = first_dom_son (CDI_POST_DOMINATORS, bb);
{
sink_code_in_bb (son);
}
-}
+}
/* Perform code sinking.
This moves code down the flowgraph when we know it would be
executions of the statement.
IE given
-
+
a_1 = b + c;
if (<something>)
{
static void
execute_sink_code (void)
{
- struct loops *loops = loop_optimizer_init (dump_file);
+ loop_optimizer_init (LOOPS_NORMAL);
+
connect_infinite_loops_to_exit ();
memset (&sink_stats, 0, sizeof (sink_stats));
- calculate_dominance_info (CDI_DOMINATORS | CDI_POST_DOMINATORS);
- sink_code_in_bb (EXIT_BLOCK_PTR);
- if (dump_file && (dump_flags & TDF_STATS))
- fprintf (dump_file, "Sunk statements:%d\n", sink_stats.sunk);
+ calculate_dominance_info (CDI_DOMINATORS);
+ calculate_dominance_info (CDI_POST_DOMINATORS);
+ sink_code_in_bb (EXIT_BLOCK_PTR);
+ statistics_counter_event (cfun, "Sunk statements", sink_stats.sunk);
free_dominance_info (CDI_POST_DOMINATORS);
remove_fake_exit_edges ();
- loop_optimizer_finalize (loops, dump_file);
+ loop_optimizer_finalize ();
}
/* Gate and execute functions for PRE. */
-static void
+static unsigned int
do_sink (void)
{
execute_sink_code ();
+ return 0;
}
static bool
return flag_tree_sink != 0;
}
-struct tree_opt_pass pass_sink_code =
+struct gimple_opt_pass pass_sink_code =
{
+ {
+ GIMPLE_PASS,
"sink", /* name */
gate_sink, /* gate */
do_sink, /* execute */
0, /* static_pass_number */
TV_TREE_SINK, /* tv_id */
PROP_no_crit_edges | PROP_cfg
- | PROP_ssa | PROP_alias, /* properties_required */
+ | PROP_ssa, /* properties_required */
0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
- TODO_rename_vars | TODO_dump_func | TODO_ggc_collect | TODO_verify_ssa, /* todo_flags_finish */
- 0 /* letter */
+ TODO_update_ssa
+ | TODO_verify_ssa
+ | TODO_verify_flow
+ | TODO_ggc_collect /* todo_flags_finish */
+ }
};
OSDN Git Service
