* to their closest copy while introducing phis as necessary.
*
* Algorithm: Mark all blocks in the iterated dominance frontiers of the value
- * and it's copies. Link the copies ordered by dominance to the blocks. The
- * we search for each use all all definitions in the current block, if none is
+ * and it's copies. Link the copies ordered by dominance to the blocks. Then
+ * we search for each use all definitions in the current block, if none is
* found, then we search one in the immediate dominator. If we are in a block
- * of the dominance frontier, create a phi and search do the same search for
- * the phi arguments.
+ * of the dominance frontier, create a phi and do the same search for all
+ * phi arguments.
*
* A copy in this context means, that you want to introduce several new
* abstract values (in Firm: nodes) for which you know, that they
* This function reroutes all uses of the original value to the copies in the
* corresponding dominance subtrees and creates Phi functions where necessary.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
+
+/* statev in this file is extensive, so only enable if needed */
+#define DISABLE_STATEV
#include "bessaconstr.h"
#include "bemodule.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
-static INLINE int is_inside(unsigned what, unsigned low, unsigned hi)
-{
- return what - low < hi;
-}
-
/**
* Calculates the iterated dominance frontier of a set of blocks. Marks the
* blocks as visited. Sets the link fields of the blocks in the dominance
stat_ev_cnt_decl(blocks);
DBG((dbg, LEVEL_3, "Dominance Frontier:"));
stat_ev_tim_push();
- while (!pdeq_empty(env->worklist)) {
+ while (!waitq_empty(env->worklist)) {
int i;
ir_node *block = waitq_get(env->worklist);
ir_node **domfront = be_get_dominance_frontier(env->domfronts, block);
if (Block_block_visited(y))
continue;
- /*
- * It makes no sense to add phi-functions to blocks
- * that are not dominated by any definition;
- * all uses are dominated, hence the paths reaching the uses
- * have to stay in the dominance subtrees of the given definitions.
- */
-
- if (!is_inside(get_Block_dom_tree_pre_num(y), env->min_dom, env->max_dom))
- continue;
-
if (!irn_visited(y)) {
set_irn_link(y, NULL);
waitq_put(env->worklist, y);
{
int i, n_preds = get_Block_n_cfgpreds(block);
ir_graph *irg = get_irn_irg(block);
- ir_node *phi;
- ir_node **ins = alloca(n_preds * sizeof(ins[0]));
+ ir_node **ins = ALLOCAN(ir_node*, n_preds);
+ ir_node *phi;
assert(n_preds > 1);
return get_def_at_idom(env, block);
}
-static
-void update_domzone(be_ssa_construction_env_t *env, const ir_node *bl)
-{
- int start = get_Block_dom_tree_pre_num(bl);
- int end = get_Block_dom_max_subtree_pre_num(bl) + 1;
-
- env->min_dom = MIN(env->min_dom, start);
- env->max_dom = MAX(env->max_dom, end);
-}
-
/**
* Adds a definition into the link field of the block. The definitions are
* sorted by dominance. A non-visited block means no definition has been
static
void introduce_def_at_block(ir_node *block, ir_node *def)
{
- if(irn_visited(block)) {
+ if (irn_visited_else_mark(block)) {
ir_node *node = block;
ir_node *current_def;
} else {
set_irn_link(block, def);
set_irn_link(def, NULL);
- mark_irn_visited(block);
}
}
env->domfronts = be_get_birg_dom_front(birg);
env->new_phis = NEW_ARR_F(ir_node*, 0);
env->worklist = new_waitq();
- env->min_dom = INT_MAX;
- env->max_dom = 0;
- set_using_irn_visited(irg);
- set_using_block_visited(irg);
- set_using_irn_link(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED
+ | IR_RESOURCE_BLOCK_VISITED | IR_RESOURCE_IRN_LINK);
/* we use the visited flag to indicate blocks in the dominance frontier
* and blocks that already have the relevant value at the end calculated */
del_waitq(env->worklist);
DEL_ARR_F(env->new_phis);
- clear_using_irn_visited(env->irg);
- clear_using_block_visited(env->irg);
- clear_using_irn_link(env->irg);
+ ir_free_resources(env->irg, IR_RESOURCE_IRN_VISITED
+ | IR_RESOURCE_BLOCK_VISITED | IR_RESOURCE_IRN_LINK);
stat_ev_tim_pop("bessaconstr_total_time");
stat_ev_ctx_pop("bessaconstr");
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
- update_domzone(env, block);
}
void be_ssa_construction_add_copies(be_ssa_construction_env_t *env,
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
- update_domzone(env, block);
}
}
void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
ir_node **nodes, size_t nodes_len)
{
- stat_ev_cnt_decl(uses);
const ir_edge_t *edge, *next;
size_t i;
+ stat_ev_cnt_decl(uses);
BE_TIMER_PUSH(t_ssa_constr);
env->iterated_domfront_calculated = 1;
}
- stat_ev_int("bessaconstr_domzone", env->max_dom - env->min_dom);
stat_ev_tim_push();
for(i = 0; i < nodes_len; ++i) {
ir_node *value = nodes[i];
def = search_def(env, at);
if(def == NULL) {
- panic("no definition found for %+F at position %d\n", use, pos);
+ panic("no definition found for %+F at position %d", use, pos);
}
DBG((dbg, LEVEL_2, "\t%+F(%d) -> %+F\n", use, pos, def));
projects / libfirm / blobdiff