X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firconsconfirm.c;h=c0e833d0a93c0b5376bbf23009f1504a6872bafd;hb=ab0e5a91b4acdb44ae152930042cbfa9e927bcdd;hp=eb5a3542c3b12fd13b89e91458024d44ea5ba6fc;hpb=974215da1a935f250766874d0f7a7ddfa34bc4ef;p=libfirm diff --git a/ir/ana/irconsconfirm.c b/ir/ana/irconsconfirm.c index eb5a3542c..c0e833d0a 100644 --- a/ir/ana/irconsconfirm.c +++ b/ir/ana/irconsconfirm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -55,13 +55,12 @@ typedef struct _env_t { * * This handles correctly Phi nodes. */ -static ir_node *get_effective_use_block(ir_node *node, int pos) -{ - /* the effective use of a Phi is in its predecessor block */ - if (is_Phi(node)) - return get_nodes_block(get_irn_n(node, pos)); - else - return get_nodes_block(node); +static ir_node *get_effective_use_block(ir_node *node, int pos) { + /* the effective use of a Phi is in its predecessor block */ + if (is_Phi(node)) + return get_nodes_block(get_irn_n(node, pos)); + else + return get_nodes_block(node); } /** @@ -75,43 +74,42 @@ 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) -{ - const ir_edge_t *edge, *next; - ir_node *c = NULL; - - if (is_Bad(irn)) - return; - - for (edge = get_irn_out_edge_first(irn); edge; 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(irn, edge); - - if (block_dominates(block, blk)) { - /* - * Ok, we found a user of irn that is placed - * in a block dominated by the branch block. - * We can replace the input with the Constant - * branch label. - */ - - 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); - } - - 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); - - env->num_consts += 1; - } - } +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; + + if (is_Bad(irn)) + return; + + for (edge = get_irn_out_edge_first(irn); edge; 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(irn, edge); + + if (block_dominates(block, blk)) { + /* + * Ok, we found a user of irn that is placed + * in a block dominated by the branch block. + * We can replace the input with the Constant + * branch label. + */ + + 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); + } + + 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); + + env->num_consts += 1; + } + } } /* handle_case */ /** @@ -122,213 +120,209 @@ static void handle_case(ir_node *block, ir_node *irn, long nr, env_t *env) * @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) -{ - ir_node *left = get_Cmp_left(cmp); - ir_node *right = get_Cmp_right(cmp); - ir_op *op; - const ir_edge_t *edge, *next; - - /* Beware of Bads */ - if (is_Bad(left) ||is_Bad(right)) - return; - - op = get_irn_op(left); - - /* Do not create Confirm nodes for Cmp(Const, Const) constructs. - These are removed anyway */ - if (op == op_Const && is_Const(right)) - return; - - /* try to place the constant on the right side for a Confirm */ - if (op == op_Const || op == op_SymConst) { - ir_node *t = left; - - left = right; - right = t; - - pnc = get_inversed_pnc(pnc); - } - - /* - * First case: both values are identical. - * replace the left one by the right (potentially const) one. - */ - if (pnc == pn_Cmp_Eq) { - for (edge = get_irn_out_edge_first(left); edge; 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 - * dominated by the branch block. - * We can replace the input with right. - */ - set_irn_n(succ, pos, right); - DBG_OPT_CONFIRM(left, right); - -// ir_printf("2 Replacing input %d of node %n with %n\n", pos, succ, right); - - env->num_eq += 1; - } - } - } - else { /* not pn_Cmp_Eq cases */ - ir_node *c = NULL; - - for (edge = get_irn_out_edge_first(left); edge; 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 - * dominated by the branch block. - * We can replace the input with a Confirm(left, pnc, right). - */ - if (! c) - c = new_r_Confirm(current_ir_graph, block, left, right, pnc); - - pos = get_edge_src_pos(edge); - set_irn_n(succ, pos, c); -// ir_printf("3 Replacing input %d of node %n with %n\n", pos, succ, c); - - env->num_confirms += 1; - } - } - } +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_op *op; + const ir_edge_t *edge, *next; + + /* Beware of Bads */ + if (is_Bad(left) ||is_Bad(right)) + return; + + op = get_irn_op(left); + + /* Do not create Confirm nodes for Cmp(Const, Const) constructs. + These are removed anyway */ + if (op == op_Const && is_Const(right)) + return; + + /* try to place the constant on the right side for a Confirm */ + if (op == op_Const || op == op_SymConst) { + ir_node *t = left; + + left = right; + right = t; + + pnc = get_inversed_pnc(pnc); + } + + /* + * First case: both values are identical. + * replace the left one by the right (potentially const) one. + */ + if (pnc == pn_Cmp_Eq) { + for (edge = get_irn_out_edge_first(left); edge; 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 + * dominated by the branch block. + * We can replace the input with right. + */ + set_irn_n(succ, pos, right); + DBG_OPT_CONFIRM(left, right); + +// ir_printf("2 Replacing input %d of node %n with %n\n", pos, succ, right); + + env->num_eq += 1; + } + } + } else { /* not pn_Cmp_Eq cases */ + ir_node *c = NULL; + + for (edge = get_irn_out_edge_first(left); edge; 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 + * dominated by the branch block. + * We can replace the input with a Confirm(left, pnc, right). + */ + if (! c) + c = new_r_Confirm(current_ir_graph, block, left, right, pnc); + + pos = get_edge_src_pos(edge); + set_irn_n(succ, pos, c); +// ir_printf("3 Replacing input %d of node %n with %n\n", pos, succ, c); + + env->num_confirms += 1; + } + } + } } /* handle_if */ /** * Pre-walker: Called for every block to insert Confirm nodes */ -static void insert_Confirm(ir_node *block, void *env) -{ - ir_node *cond, *proj, *selector; - ir_mode *mode; - - /* - * we can only handle blocks with only ONE control flow - * predecessor yet. - */ - if (get_Block_n_cfgpreds(block) != 1) - return; - - proj = get_Block_cfgpred(block, 0); - if (get_irn_op(proj) != op_Proj) - return; - - cond = get_Proj_pred(proj); - if (get_irn_op(cond) != op_Cond) - return; - - selector = get_Cond_selector(cond); - mode = get_irn_mode(selector); - - if (mode == mode_b) { - ir_node *cmp; - pn_Cmp pnc; - - /* this should be an IF, check this */ - if (get_irn_op(selector) != op_Proj) - return; - - cmp = get_Proj_pred(selector); - if (get_irn_op(cmp) != op_Cmp) - return; - - pnc = get_Proj_proj(selector); - - if (get_Proj_proj(proj) != pn_Cond_true) { - /* it's the false branch */ - pnc = get_negated_pnc(pnc, mode); - } -// ir_printf("At %n using %n Confirm %=\n", block, cmp, pnc); - - handle_if(block, cmp, pnc, 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)) - return; - - handle_case(block, get_Cond_selector(cond), proj_nr, env); - } +static void insert_Confirm(ir_node *block, void *env) { + ir_node *cond, *proj, *selector; + ir_mode *mode; + + /* + * we can only handle blocks with only ONE control flow + * predecessor yet. + */ + if (get_Block_n_cfgpreds(block) != 1) + return; + + proj = get_Block_cfgpred(block, 0); + if (get_irn_op(proj) != op_Proj) + return; + + cond = get_Proj_pred(proj); + if (get_irn_op(cond) != op_Cond) + return; + + selector = get_Cond_selector(cond); + mode = get_irn_mode(selector); + + if (mode == mode_b) { + ir_node *cmp; + pn_Cmp pnc; + + /* this should be an IF, check this */ + if (get_irn_op(selector) != op_Proj) + return; + + cmp = get_Proj_pred(selector); + if (get_irn_op(cmp) != op_Cmp) + return; + + pnc = get_Proj_proj(selector); + + if (get_Proj_proj(proj) != pn_Cond_true) { + /* it's the false branch */ + pnc = get_negated_pnc(pnc, mode); + } +// ir_printf("At %n using %n Confirm %=\n", block, cmp, pnc); + + handle_if(block, cmp, pnc, 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)) + return; + + handle_case(block, get_Cond_selector(cond), proj_nr, env); + } } /* insert_Confirm */ /* * Construct Confirm nodes */ -void construct_confirms(ir_graph *irg) -{ - env_t env; - int edges_active = edges_activated(irg); +void construct_confirms(ir_graph *irg) { + env_t env; + int edges_active = edges_activated(irg); - /* we need dominance info */ - assure_doms(irg); + /* we need dominance info */ + assure_doms(irg); - assert(get_irg_pinned(irg) == op_pin_state_pinned && - "Nodes must be placed to insert Confirms"); + assert(get_irg_pinned(irg) == op_pin_state_pinned && + "Nodes must be placed to insert Confirms"); - if (! edges_active) { - /* We need edges */ - edges_activate(irg); - } + if (! edges_active) { + /* We need edges */ + edges_activate(irg); + } - env.num_confirms = 0; - env.num_consts = 0; - env.num_eq = 0; + env.num_confirms = 0; + env.num_consts = 0; + env.num_eq = 0; - /* now, visit all blocks and add Confirms where possible */ - irg_block_walk_graph(irg, insert_Confirm, NULL, &env); + /* now, visit all blocks and add Confirms where possible */ + irg_block_walk_graph(irg, insert_Confirm, NULL, &env); - if (env.num_confirms | env.num_consts | env.num_eq) { - /* we have add nodes or changed DF edges */ - set_irg_outs_inconsistent(irg); + if (env.num_confirms | env.num_consts | env.num_eq) { + /* we have add nodes or changed DF edges */ + set_irg_outs_inconsistent(irg); - /* the new nodes are not in the loop info */ - set_irg_loopinfo_inconsistent(irg); - } + /* the new nodes are not in the loop info */ + set_irg_loopinfo_inconsistent(irg); + } #if 0 - printf("# Confirms inserted : %u\n", env.num_confirms); - printf("# Const replacements: %u\n", env.num_consts); - printf("# node equalities : %u\n", env.num_eq); + printf("# Confirms inserted : %u\n", env.num_confirms); + printf("# Const replacements: %u\n", env.num_consts); + printf("# node equalities : %u\n", env.num_eq); #endif - /* deactivate edges if they where off */ - if (! edges_active) - edges_deactivate(irg); + /* deactivate edges if they where off */ + if (! edges_active) + edges_deactivate(irg); } /* construct_confirms */ /** * Post-walker: Remove Confirm nodes */ static void rem_Confirm(ir_node *n, void *env) { - if (get_irn_op(n) == op_Confirm) { - ir_node *value = get_Confirm_value(n); - if (value != n) - exchange(n, value); - else { - /* - * Strange: a Confirm is it's own bound. This can happen - * in dead blocks when Phi nodes are already removed. - */ - exchange(n, new_Bad()); - } - } + (void) env; + if (get_irn_op(n) == op_Confirm) { + ir_node *value = get_Confirm_value(n); + if (value != n) + exchange(n, value); + else { + /* + * Strange: a Confirm is it's own bound. This can happen + * in dead blocks when Phi nodes are already removed. + */ + exchange(n, new_Bad()); + } + } } /* rem_Confirm */ /* * Remove all Confirm nodes from a graph. */ void remove_confirms(ir_graph *irg) { - irg_walk_graph(irg, NULL, rem_Confirm, NULL); + irg_walk_graph(irg, NULL, rem_Confirm, NULL); } /* remove_confirms */