X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=c2821fb7d9414c0640e9f31c5fc375cffe68b927;hb=65daf5bc390b02d68581f4c431dbdbfaae11b88f;hp=57b8f3c5cce991f2ca0d3ab79aff275d84411c96;hpb=e91fed690da8e1869b5dae51ae44c61b3ba90f0c;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index 57b8f3c5c..c2821fb7d 100644 --- a/ir/ana/irconsconfirm.c +++ b/ir/ana/irconsconfirm.c @@ -24,9 +24,9 @@ * @date 6.2005 * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" + +#include "irconsconfirm.h" #include "irgraph_t.h" #include "irnode_t.h" @@ -37,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" @@ -45,17 +46,18 @@ /** * Walker environment. */ -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 */ +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. */ + unsigned num_non_null; /**< Number of non-null Confirms. */ } env_t; /** The debug handle. */ DEBUG_ONLY(static firm_dbg_module_t *dbg;) /** - * Return the effective use block of a node and it's predecessor on + * Return the effective use block of a node and its predecessor on * position pos. * * @param node the node @@ -63,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); @@ -83,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; @@ -106,15 +110,14 @@ 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, block, mode, 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); DBG_OPT_CONFIRM_C(irn, c); -// ir_printf("1 Replacing input %d of node %n with %n\n", pos, succ, c); + DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c)); env->num_consts += 1; } @@ -129,8 +132,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; @@ -147,13 +151,14 @@ 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); + 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); DBG_OPT_CONFIRM_C(old, con); - DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, user, con)); + DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, user, con)); env->num_consts += 1; } else { @@ -163,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) @@ -174,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 ... @@ -208,12 +212,17 @@ 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_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; + } 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); @@ -223,8 +232,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; } } } @@ -235,10 +245,11 @@ static void handle_modeb(ir_node *block, ir_node *selector, pn_Cond pnc, env_t * * * @param block the block which is entered by the branch * @param cmp the Cmp node expressing the branch condition - * @param pnc the Compare relation for taking this branch + * @param rel 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, ir_relation rel, env_t *env) +{ ir_node *left = get_Cmp_left(cmp); ir_node *right = get_Cmp_right(cmp); ir_node *cond_block; @@ -263,14 +274,14 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { left = right; right = t; - pnc = get_inversed_pnc(pnc); + rel = get_inversed_relation(rel); } /* * First case: both values are identical. * replace the left one by the right (potentially const) one. */ - if (pnc == pn_Cmp_Eq) { + if (rel == ir_relation_equal) { cond_block = get_Block_cfgpred_block(block, 0); for (edge = get_irn_out_edge_first(left); edge; edge = next) { ir_node *user = get_edge_src_irn(edge); @@ -287,55 +298,55 @@ static void handle_if(ir_node *block, ir_node *cmp, pn_Cmp pnc, env_t *env) { set_irn_n(user, pos, right); DBG_OPT_CONFIRM(left, right); - DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, user, right)); + 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 its 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; } } } } - } else { /* not pn_Cmp_Eq cases */ + } else { /* not ir_relation_equal 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 @@ -343,24 +354,60 @@ 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, rel); pos = get_edge_src_pos(edge); set_irn_n(succ, pos, c); - DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, succ, c)); + DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c)); env->num_confirms += 1; } } + + if (! is_Const(right)) { + /* also construct inverse Confirms */ + ir_node *rc = NULL; + + rel = get_inversed_relation(rel); + 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, rel^-1, left). + */ + if (! rc) + rc = new_r_Confirm(block, right, left, rel); + + 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 *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 @@ -381,33 +428,28 @@ static void insert_Confirm_in_block(ir_node *block, void *env) { mode = get_irn_mode(selector); if (mode == mode_b) { - ir_node *cmp; - pn_Cmp pnc; + ir_relation rel; - 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)) + if (! is_Cmp(selector)) return; - cmp = get_Proj_pred(selector); - if (! is_Cmp(cmp)) - return; - - pnc = get_Proj_proj(selector); + rel = get_Cmp_relation(selector); if (get_Proj_proj(proj) != pn_Cond_true) { /* it's the false branch */ - pnc = get_negated_pnc(pnc, mode); + mode = get_irn_mode(get_Cmp_left(selector)); + rel = get_negated_relation(rel); } - DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, cmp, pnc)); + DB((dbg, LEVEL_2, "At %+F using %+F Confirm %=\n", block, selector, rel)); - handle_if(block, cmp, pnc, env); + handle_if(block, selector, rel, env); } else if (mode_is_int(mode)) { 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); @@ -417,18 +459,12 @@ 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) { - /* - * While a SymConst is not a Confirm, it is non-null - * anyway. This helps to reduce the number of - * constructed Confirms. - */ - if (is_SymConst_addr_ent(ptr)) - return 1; +static int is_non_null_Confirm(const ir_node *ptr) +{ for (;;) { if (! is_Confirm(ptr)) - return 0; - if (get_Confirm_cmp(ptr) == pn_Cmp_Lg) { + break; + if (get_Confirm_relation(ptr) == ir_relation_less_greater) { ir_node *bound = get_Confirm_bound(ptr); if (is_Const(bound) && is_Const_null(bound)) @@ -436,6 +472,14 @@ static int is_non_null_Confirm(const ir_node *ptr) { } ptr = get_Confirm_value(ptr); } + /* + * While a SymConst is not a Confirm, it is non-null + * anyway. This helps to reduce the number of + * constructed Confirms. + */ + if (is_SymConst_addr_ent(ptr)) + return 1; + return 0; } /* is_non_null_Confirm */ /** @@ -445,7 +489,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; @@ -455,40 +500,30 @@ static void insert_non_null(ir_node *ptr, ir_node *block, env_t *env) { ir_node *blk; - if (is_Confirm(succ)) { - /* beware of loops */ + /* for now, we place a Confirm only in front of a Cmp */ + if (! is_Cmp(succ)) continue; - } - - if ((is_Load(succ) || is_Store(succ)) && - get_nodes_block(succ) == block) { - /* Ignore Loads and Store in the same block for now, - because we are not sure if they are dominated. - This is not a bad restriction: if exception flow is - present, they are in other blocks either. */ - continue; - } pos = get_edge_src_pos(edge); blk = get_effective_use_block(succ, pos); - if (block_dominates(block, blk) && !is_non_null_Confirm(get_irn_n(succ, pos))) { + if (block_dominates(block, blk)) { /* * Ok, we found a usage of ptr in a block * dominated by the Load/Store block. * We can replace the input with a Confirm(ptr, !=, NULL). */ if (c == NULL) { - ir_mode *mode = get_irn_mode(ptr); - c = new_Const(mode, get_mode_null(mode)); - - c = new_r_Confirm(current_ir_graph, block, ptr, c, pn_Cmp_Lg); + 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, ir_relation_less_greater); } set_irn_n(succ, pos, c); - DB((dbg, LEVEL_2, "Replacing input %d of node %n with %n\n", pos, succ, c)); - + DB((dbg, LEVEL_2, "Replacing input %d of node %+F with %+F\n", pos, succ, c)); + env->num_non_null += 1; env->num_confirms += 1; } } @@ -497,8 +532,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: @@ -522,11 +559,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); @@ -545,6 +582,7 @@ void construct_confirms(ir_graph *irg) { env.num_confirms = 0; env.num_consts = 0; env.num_eq = 0; + env.num_non_null = 0; if (get_opt_global_null_ptr_elimination()) { /* do global NULL test elimination */ @@ -565,40 +603,41 @@ void construct_confirms(ir_graph *irg) { DB((dbg, LEVEL_1, "# Confirms inserted : %u\n", env.num_confirms)); DB((dbg, LEVEL_1, "# Const replacements: %u\n", env.num_consts)); DB((dbg, LEVEL_1, "# node equalities : %u\n", env.num_eq)); + DB((dbg, LEVEL_1, "# non-null Confirms : %u\n", env.num_non_null)); /* deactivate edges if they where off */ if (! edges_active) edges_deactivate(irg); } /* construct_confirms */ -#if 0 -/** - * Post-walker: Remove Confirm nodes - */ -static void rem_Confirm(ir_node *n, void *env) { +/* 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 */ + +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); +void remove_confirms(ir_graph *irg) +{ + irg_walk_graph(irg, NULL, remove_confirm, NULL); } /* 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 */