X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fana%2Firconsconfirm.c;h=9ec685e9e40fb359d9e1d15d6449bd99f41b6408;hb=46fcd214e2431ac8ab60ced40a51aa16b798f638;hp=de475349d345d6fb878067e68e966f84f8206c91;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index de475349d..9ec685e9e 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" @@ -35,6 +37,7 @@ #include "irgwalk.h" #include "irprintf.h" #include "irgopt.h" +#include "irpass.h" #include "irtools.h" #include "array_t.h" #include "debug.h" @@ -62,7 +65,8 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;) * * This handles correctly Phi nodes. */ -static ir_node *get_effective_use_block(ir_node *node, int pos) { +static ir_node *get_effective_use_block(ir_node *node, int pos) +{ if (is_Phi(node)) { /* the effective use of a Phi argument is in its predecessor block */ node = get_nodes_block(node); @@ -82,7 +86,8 @@ static ir_node *get_effective_use_block(ir_node *node, int pos) { * Branch labels are a simple case. We can replace the value * by a Const with the branch label. */ -static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) { +static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) +{ const ir_edge_t *edge, *next; ir_node *c = NULL; @@ -108,7 +113,7 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) { 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, block, mode, tv, tp); + c = new_r_Const_type(current_ir_graph, tv, tp); } set_irn_n(succ, pos, c); @@ -128,8 +133,9 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) { * @param pnc the true/false condition branch * @param env statistical environment */ -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; +static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t *env) +{ + ir_node *cond, *old, *other_blk = NULL, *con = NULL; ir_node *c_b = NULL, *c_o = NULL; const ir_edge_t *edge, *next; @@ -146,7 +152,7 @@ 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(mode_b, pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); + con = new_Const(pnc == pn_Cond_true ? tarval_b_true : tarval_b_false); } old = get_irn_n(user, pos); set_irn_n(user, pos, con); @@ -162,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) @@ -207,12 +212,16 @@ 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(mode_b, tarval_b_true); - ir_node *c_false = new_Const(mode_b, tarval_b_false); - c_b = new_r_Confirm(current_ir_graph, cond_block, selector, - pnc == pn_Cond_true ? c_true : c_false, pn_Cmp_Eq); - c_o = new_r_Confirm(current_ir_graph, cond_block, selector, - pnc == pn_Cond_false ? c_true : c_false, pn_Cmp_Eq); + ir_node *c_true = new_Const(tarval_b_true); + ir_node *c_false = new_Const(tarval_b_false); + env->num_consts += 2; + if (pnc == pn_Cond_true) { + c_b = c_true; + c_o = c_false; + } else { + c_b = c_false; + c_o = c_true; + } } for (i = n - 1; i >= 0; --i) { ir_node *pred_blk = get_Block_cfgpred_block(user_blk, i); @@ -222,8 +231,9 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * else in[i] = c_o; } - phi = new_r_Phi(current_ir_graph, user_blk, n, in, mode_b); + phi = new_r_Phi(user_blk, n, in, mode_b); set_irn_n(user, pos, phi); + env->num_eq += 1; } } } @@ -237,7 +247,8 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * * @param pnc the Compare relation for taking this branch * @param env statistical environment */ -static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { +static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) +{ ir_node *left = get_Cmp_left(cmp); ir_node *right = get_Cmp_right(cmp); ir_node *cond_block; @@ -289,39 +300,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; } } } @@ -329,12 +341,11 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { } else { /* not pn_Cmp_Eq cases */ ir_node *c = NULL; - for (edge = get_irn_out_edge_first(left); edge; edge = next) { + foreach_out_edge_safe(left, edge, next) { ir_node *succ = get_edge_src_irn(edge); int pos = get_edge_src_pos(edge); ir_node *blk = get_effective_use_block(succ, pos); - next = get_irn_out_edge_next(left, edge); if (block_dominates(block, blk)) { /* * Ok, we found a usage of left in a block @@ -342,7 +353,7 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { * We can replace the input with a Confirm(left, pnc, right). */ if (! c) - c = new_r_Confirm(current_ir_graph, block, left, right, pnc); + c = new_r_Confirm(block, left, right, pnc); pos = get_edge_src_pos(edge); set_irn_n(succ, pos, c); @@ -351,13 +362,48 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { env->num_confirms += 1; } } + + if (! is_Const(right)) { + /* also construct inverse Confirms */ + ir_node *rc = NULL; + + pnc = get_inversed_pnc(pnc); + foreach_out_edge_safe(right, edge, next) { + ir_node *succ = get_edge_src_irn(edge); + int pos; + ir_node *blk; + + if (succ == c) + continue; + + pos = get_edge_src_pos(edge); + blk = get_effective_use_block(succ, pos); + + if (block_dominates(block, blk)) { + /* + * Ok, we found a usage of right in a block + * dominated by the branch block. + * We can replace the input with a Confirm(right, pnc^-1, left). + */ + if (! rc) + rc = new_r_Confirm(block, right, left, pnc); + + pos = get_edge_src_pos(edge); + set_irn_n(succ, pos, rc); + DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, rc)); + + env->num_confirms += 1; + } + } + } } } /* handle_if */ /** * 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 *env) +{ ir_node *cond, *proj, *selector; ir_mode *mode; @@ -397,6 +443,7 @@ static void insert_Confirm_in_block(ir_node *block, void *env) { if (get_Proj_proj(proj) != pn_Cond_true) { /* it's the false branch */ + mode = get_irn_mode(get_Cmp_left(cmp)); pnc = get_negated_pnc(pnc, mode); } DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, cmp, pnc)); @@ -406,7 +453,7 @@ static void insert_Confirm_in_block(ir_node *block, void *env) { long proj_nr = get_Proj_proj(proj); /* this is a CASE, but we cannot handle the default case */ - if (proj_nr == get_Cond_defaultProj(cond)) + if (proj_nr == get_Cond_default_proj(cond)) return; handle_case(block, get_Cond_selector(cond), proj_nr, env); @@ -416,7 +463,8 @@ static void insert_Confirm_in_block(ir_node *block, void *env) { /** * Checks if a node is a non-null Confirm. */ -static int is_non_null_Confirm(const ir_node *ptr) { +static int is_non_null_Confirm(const ir_node *ptr) +{ for (;;) { if (! is_Confirm(ptr)) break; @@ -445,7 +493,8 @@ static int is_non_null_Confirm(const ir_node *ptr) { * @param block the block of the dereferencing instruction * @param env environment */ -static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) { +static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) +{ const ir_edge_t *edge, *next; ir_node *c = NULL; @@ -470,9 +519,9 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) { */ if (c == NULL) { ir_mode *mode = get_irn_mode(ptr); - c = new_Const(mode, get_mode_null(mode)); + c = new_Const(get_mode_null(mode)); - c = new_r_Confirm(current_ir_graph, block, ptr, c, pn_Cmp_Lg); + c = new_r_Confirm(block, ptr, c, pn_Cmp_Lg); } set_irn_n(succ, pos, c); @@ -487,7 +536,8 @@ 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 *env) +{ ir_node *ptr; switch (get_irn_opcode(node)) { @@ -512,11 +562,11 @@ static void insert_Confirm(ir_node *node, void *env) { /* * Construct Confirm nodes */ -void construct_confirms(ir_graph *irg) { +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); @@ -563,11 +613,18 @@ void construct_confirms(ir_graph *irg) { edges_deactivate(irg); } /* construct_confirms */ +/* Construct a pass. */ +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 rem_Confirm(ir_node *n, void *env) +{ (void) env; if (is_Confirm(n)) { ir_node *value = get_Confirm_value(n); @@ -587,10 +644,17 @@ static void rem_Confirm(ir_node *n, void *env) { /* * Remove all Confirm nodes from a graph. */ -void remove_confirms(ir_graph *irg) { +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); } /* remove_confirms */ + +/* Construct a pass. */ +ir_graph_pass_t *remove_confirms_pass(const char *name) +{ + return def_graph_pass(name ? name : "rem_confirm", remove_confirms); +} /* remove_confirms_pass */