X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=9d2d50e905bf08132d2b55f5a25f531b9df7f4c7;hb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;hp=a25e7fbd17851bf48cb5833b1f3eef33d137008c;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index a25e7fbd1..9d2d50e90 100644 --- a/ir/ana/irconsconfirm.c +++ b/ir/ana/irconsconfirm.c @@ -26,6 +26,8 @@ */ #include "config.h" +#include "irconsconfirm.h" + #include "irgraph_t.h" #include "irnode_t.h" #include "ircons_t.h" @@ -44,7 +46,7 @@ /** * Walker environment. */ -typedef struct _env_t { +typedef struct env_t { unsigned num_confirms; /**< Number of inserted Confirm nodes. */ unsigned num_consts; /**< Number of constants placed. */ unsigned num_eq; /**< Number of equalities placed. */ @@ -108,10 +110,9 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) */ if (! c) { - ir_mode *mode = get_irn_mode(irn); - ir_type *tp = get_irn_type(irn); - tarval *tv = new_tarval_from_long(nr, mode); - c = new_r_Const_type(current_ir_graph, tv, tp); + ir_mode *mode = get_irn_mode(irn); + ir_tarval *tv = new_tarval_from_long(nr, mode); + c = new_r_Const(current_ir_graph, tv); } set_irn_n(succ, pos, c); @@ -133,7 +134,7 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) */ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t *env) { - ir_node *cond, *old, *cond_block = NULL, *other_blk = NULL, *con = NULL; + ir_node *cond, *old, *other_blk = NULL, *con = NULL; ir_node *c_b = NULL, *c_o = NULL; const ir_edge_t *edge, *next; @@ -150,7 +151,8 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * * We can replace the input with true/false. */ if (con == NULL) { - con = new_Const(pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); + ir_graph *irg = get_irn_irg(block); + con = new_r_Const(irg, pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); } old = get_irn_n(user, pos); set_irn_n(user, pos, con); @@ -166,7 +168,6 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * if (other_blk == NULL) { /* we have already tested, that block has only ONE Cond predecessor */ cond = get_Proj_pred(get_Block_cfgpred(block, 0)); - cond_block = get_nodes_block(cond); foreach_out_edge(cond, edge) { ir_node *proj = get_edge_src_irn(edge); if (get_Proj_proj(proj) == (long)pnc) @@ -177,7 +178,7 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * } assert(other_blk); - /* + /* * Note the special case here: if block is a then, there might be no else * block. In that case the other_block is the user_blk itself and pred_block * is the cond_block ... @@ -211,8 +212,10 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * NEW_ARR_A(ir_node *, in, n); /* ok, ALL predecessors are either dominated by block OR other block */ if (c_b == NULL) { - ir_node *c_true = new_Const(tarval_b_true); - ir_node *c_false = new_Const(tarval_b_false); + ir_graph *irg = get_irn_irg(block); + ir_node *c_true = new_r_Const(irg, tarval_b_true); + ir_node *c_false = new_r_Const(irg, tarval_b_false); + env->num_consts += 2; if (pnc == pn_Cond_true) { c_b = c_true; c_o = c_false; @@ -231,6 +234,7 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * } phi = new_r_Phi(user_blk, n, in, mode_b); set_irn_n(user, pos, phi); + env->num_eq += 1; } } } @@ -297,39 +301,40 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, user, right)); env->num_eq += 1; - } else if (block_dominates(blk, cond_block)) { - if (is_Const(right) && get_irn_pinned(user) == op_pin_state_floats) { - /* - * left == Const and we found a movable user of left in a - * dominator of the Cond block - */ - const ir_edge_t *edge, *next; - for (edge = get_irn_out_edge_first(user); edge; edge = next) { - ir_node *usr_of_usr = get_edge_src_irn(edge); - int npos = get_edge_src_pos(edge); - ir_node *blk = get_effective_use_block(usr_of_usr, npos); - - next = get_irn_out_edge_next(user, edge); - if (block_dominates(block, blk)) { - /* - * The user of the user is dominated by our true/false - * block. So, create a copy of user WITH the constant - * replacing it's pos'th input. - * - * This is always good for unop's and might be good - * for binops. - * - * If user has other user in the false/true block, code - * placement will move it down. - * If there are users in cond block or upper, we create - * "redundant ops", because one will have a const op, - * the other no const ... - */ - ir_node *new_op = exact_copy(user); - set_nodes_block(new_op, block); - set_irn_n(new_op, pos, right); - set_irn_n(usr_of_usr, npos, new_op); - } + } else if (block_dominates(blk, cond_block) + && is_Const(right) + && get_irn_pinned(user) == op_pin_state_floats) { + /* + * left == Const and we found a movable user of left in a + * dominator of the Cond block + */ + const ir_edge_t *edge, *next; + for (edge = get_irn_out_edge_first(user); edge; edge = next) { + ir_node *usr_of_usr = get_edge_src_irn(edge); + int npos = get_edge_src_pos(edge); + ir_node *blk = get_effective_use_block(usr_of_usr, npos); + + next = get_irn_out_edge_next(user, edge); + if (block_dominates(block, blk)) { + /* + * The user of the user is dominated by our true/false + * block. So, create a copy of user WITH the constant + * replacing it's pos'th input. + * + * This is always good for unop's and might be good + * for binops. + * + * If user has other user in the false/true block, code + * placement will move it down. + * If there are users in cond block or upper, we create + * "redundant ops", because one will have a const op, + * the other no const ... + */ + ir_node *new_op = exact_copy(user); + set_nodes_block(new_op, block); + set_irn_n(new_op, pos, right); + set_irn_n(usr_of_usr, npos, new_op); + env->num_eq += 1; } } } @@ -398,10 +403,11 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) /** * Pre-block-walker: Called for every block to insert Confirm nodes */ -static void insert_Confirm_in_block(ir_node *block, void *env) +static void insert_Confirm_in_block(ir_node *block, void *data) { ir_node *cond, *proj, *selector; ir_mode *mode; + env_t *env = (env_t*) data; /* * we can only handle blocks with only ONE control flow @@ -425,7 +431,7 @@ static void insert_Confirm_in_block(ir_node *block, void *env) ir_node *cmp; pn_Cmp pnc; - handle_modeb(block, selector, get_Proj_proj(proj), env); + handle_modeb(block, selector, (pn_Cond) get_Proj_proj(proj), env); /* this should be an IF, check this */ if (! is_Proj(selector)) @@ -435,7 +441,7 @@ static void insert_Confirm_in_block(ir_node *block, void *env) if (! is_Cmp(cmp)) return; - pnc = get_Proj_proj(selector); + pnc = (pn_Cmp) get_Proj_proj(selector); if (get_Proj_proj(proj) != pn_Cond_true) { /* it's the false branch */ @@ -514,9 +520,9 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) * We can replace the input with a Confirm(ptr, !=, NULL). */ if (c == NULL) { - ir_mode *mode = get_irn_mode(ptr); - c = new_Const(get_mode_null(mode)); - + ir_mode *mode = get_irn_mode(ptr); + ir_graph *irg = get_irn_irg(block); + c = new_r_Const(irg, get_mode_null(mode)); c = new_r_Confirm(block, ptr, c, pn_Cmp_Lg); } @@ -532,9 +538,10 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) /** * Pre-walker: Called for every node to insert Confirm nodes */ -static void insert_Confirm(ir_node *node, void *env) +static void insert_Confirm(ir_node *node, void *data) { ir_node *ptr; + env_t *env = (env_t*) data; switch (get_irn_opcode(node)) { case iro_Block: @@ -563,7 +570,6 @@ void construct_confirms(ir_graph *irg) env_t env; int edges_active = edges_activated(irg); - FIRM_DBG_REGISTER(dbg, "firm.ana.confirm"); remove_critical_cf_edges(irg); @@ -616,38 +622,24 @@ ir_graph_pass_t *construct_confirms_pass(const char *name) return def_graph_pass(name ? name : "confirm", construct_confirms); } /* construct_confirms_pass */ -#if 0 -/** - * Post-walker: Remove Confirm nodes - */ -static void rem_Confirm(ir_node *n, void *env) +static void remove_confirm(ir_node *n, void *env) { + ir_node *value; + (void) env; - if (is_Confirm(n)) { - ir_node *value = get_Confirm_value(n); - if (value != n) - exchange(n, value); - else { - /* - * Strange: a Confirm is its own bound. This can happen - * in dead blocks when Phi nodes are already removed. - */ - exchange(n, new_Bad()); - } - } -} /* rem_Confirm */ -#endif + if (!is_Confirm(n)) + return; + + value = get_Confirm_value(n); + exchange(n, value); +} /* * Remove all Confirm nodes from a graph. */ void remove_confirms(ir_graph *irg) { - int rem = get_opt_remove_confirm(); - - set_opt_remove_confirm(1); - optimize_graph_df(irg); - set_opt_remove_confirm(rem); + irg_walk_graph(irg, NULL, remove_confirm, NULL); } /* remove_confirms */ /* Construct a pass. */