X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessaconstr.c;h=38b486eac8f47a4be857a9faae77eaf0cd56b7d1;hb=4d808298b72e72bd06c7466e837dd9dda4eb1070;hp=a5c1a35c28e242873008935aabeb6674bceb2e8f;hpb=8eee0e6361868153ae82c8d8bdda1446a9af9084;p=libfirm diff --git a/ir/be/bessaconstr.c b/ir/be/bessaconstr.c index a5c1a35c2..38b486eac 100644 --- a/ir/be/bessaconstr.c +++ b/ir/be/bessaconstr.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. * @@ -29,11 +29,11 @@ * 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 @@ -55,6 +55,7 @@ #include "besched_t.h" #include "beintlive_t.h" #include "beirg_t.h" +#include "be_t.h" #include "debug.h" #include "error.h" @@ -73,29 +74,34 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) * frontier to the block itself. */ static -void mark_iterated_dominance_frontiers(const be_dom_front_info_t *domfronts, - waitq *worklist) +void mark_iterated_dominance_frontiers(const be_ssa_construction_env_t *env) { + stat_ev_cnt_decl(blocks); DBG((dbg, LEVEL_3, "Dominance Frontier:")); - while(!pdeq_empty(worklist)) { + stat_ev_tim_push(); + while (!waitq_empty(env->worklist)) { int i; - ir_node *block = waitq_get(worklist); - ir_node **domfront = be_get_dominance_frontier(domfronts, block); + ir_node *block = waitq_get(env->worklist); + ir_node **domfront = be_get_dominance_frontier(env->domfronts, block); int domfront_len = ARR_LEN(domfront); for (i = 0; i < domfront_len; ++i) { ir_node *y = domfront[i]; - if(Block_block_visited(y)) + if (Block_block_visited(y)) continue; - if(!irn_visited(y)) { + if (!irn_visited(y)) { set_irn_link(y, NULL); - waitq_put(worklist, y); + waitq_put(env->worklist, y); } + DBG((dbg, LEVEL_3, " %+F", y)); mark_Block_block_visited(y); + stat_ev_cnt_inc(blocks); } } + stat_ev_tim_pop("bessaconstr_idf_time"); + stat_ev_cnt_done(blocks, "bessaconstr_idf_blocks"); DBG((dbg, LEVEL_3, "\n")); } @@ -144,9 +150,8 @@ static ir_node *get_def_at_idom(be_ssa_construction_env_t *env, ir_node *block) { ir_node *dom = get_Block_idom(block); - ir_node *def = search_def_end_of_block(env, dom); - - return def; + assert(dom != NULL); + return search_def_end_of_block(env, dom); } static @@ -161,7 +166,6 @@ ir_node *search_def_end_of_block(be_ssa_construction_env_t *env, ir_node *block) ir_node *def = get_def_at_idom(env, block); mark_irn_visited(block); set_irn_link(block, def); - return def; } } @@ -203,7 +207,6 @@ ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at) return create_phi(env, block, node); } - DBG((dbg, LEVEL_3, "\t...continue at idom (after checking block)\n")); return get_def_at_idom(env, block); } @@ -245,8 +248,16 @@ void introduce_def_at_block(ir_node *block, ir_node *def) void be_ssa_construction_init(be_ssa_construction_env_t *env, be_irg_t *birg) { ir_graph *irg = be_get_birg_irg(birg); - memset(env, 0, sizeof(env[0])); + ir_node *sb = get_irg_start_block(irg); + int n_blocks = get_Block_dom_max_subtree_pre_num(sb); + stat_ev_ctx_push_fobj("bessaconstr", irg); + stat_ev_tim_push(); + + (void) n_blocks; + stat_ev_dbl("bessaconstr_n_blocks", n_blocks); + + memset(env, 0, sizeof(env[0])); be_assure_dom_front(birg); env->irg = irg; @@ -254,26 +265,28 @@ void be_ssa_construction_init(be_ssa_construction_env_t *env, be_irg_t *birg) env->new_phis = NEW_ARR_F(ir_node*, 0); env->worklist = new_waitq(); - set_using_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 */ inc_irg_visited(irg); /* We use the block visited flag to indicate blocks in the dominance - * froniter of some values (and this potentially needing phis) */ + * frontier of some values (and this potentially needing phis) */ inc_irg_block_visited(irg); } void be_ssa_construction_destroy(be_ssa_construction_env_t *env) { + stat_ev_int("bessaconstr_phis", ARR_LEN(env->new_phis)); del_waitq(env->worklist); DEL_ARR_F(env->new_phis); - clear_using_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"); } void be_ssa_construction_add_copy(be_ssa_construction_env_t *env, @@ -331,67 +344,82 @@ ir_node **be_ssa_construction_get_new_phis(be_ssa_construction_env_t *env) return env->new_phis; } -void be_ssa_construction_fix_users(be_ssa_construction_env_t *env, - ir_node *value) +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; + + BE_TIMER_PUSH(t_ssa_constr); if(!env->iterated_domfront_calculated) { - mark_iterated_dominance_frontiers(env->domfronts, env->worklist); + mark_iterated_dominance_frontiers(env); env->iterated_domfront_calculated = 1; } - /* - * Search the valid def for each use and set it. - */ - foreach_out_edge_safe(value, edge, next) { - ir_node *use = get_edge_src_irn(edge); - ir_node *at = use; - int pos = get_edge_src_pos(edge); - ir_node *def; - - if(env->ignore_uses != NULL && - ir_nodeset_contains(env->ignore_uses, use)) - continue; - - if(is_Phi(use)) { - ir_node *block = get_nodes_block(use); - ir_node *predblock = get_Block_cfgpred_block(block, pos); - at = sched_last(predblock); - } + stat_ev_tim_push(); + for(i = 0; i < nodes_len; ++i) { + ir_node *value = nodes[i]; + + /* + * Search the valid def for each use and set it. + */ + foreach_out_edge_safe(value, edge, next) { + ir_node *use = get_edge_src_irn(edge); + ir_node *at = use; + int pos = get_edge_src_pos(edge); + ir_node *def; + + if(env->ignore_uses != NULL && + ir_nodeset_contains(env->ignore_uses, use)) + continue; + if(is_Anchor(use)) + continue; + + if(is_Phi(use)) { + ir_node *block = get_nodes_block(use); + ir_node *predblock = get_Block_cfgpred_block(block, pos); + at = sched_last(predblock); + } - def = search_def(env, at); + def = search_def(env, at); - if(def == NULL) { - panic("no definition found for %+F at position %d\n", use, pos); - } + if(def == NULL) { + panic("no definition found for %+F at position %d", use, pos); + } - DBG((dbg, LEVEL_2, "\t%+F(%d) -> %+F\n", use, pos, def)); - set_irn_n(use, pos, def); + DBG((dbg, LEVEL_2, "\t%+F(%d) -> %+F\n", use, pos, def)); + set_irn_n(use, pos, def); + stat_ev_cnt_inc(uses); + } } + BE_TIMER_POP(t_ssa_constr); + + stat_ev_tim_pop("bessaconstr_fix_time"); + stat_ev_cnt_done(uses, "bessaconstr_uses"); } -void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env, - ir_node **nodes, size_t nodes_len) +void be_ssa_construction_fix_users(be_ssa_construction_env_t *env, ir_node *value) { - size_t i; - - for(i = 0; i < nodes_len; ++i) { - ir_node *node = nodes[i]; - be_ssa_construction_fix_users(env, node); - } + be_ssa_construction_fix_users_array(env, &value, 1); } + void be_ssa_construction_update_liveness_phis(be_ssa_construction_env_t *env, be_lv_t *lv) { int i, n; + BE_TIMER_PUSH(t_ssa_constr); + n = ARR_LEN(env->new_phis); for(i = 0; i < n; ++i) { ir_node *phi = env->new_phis[i]; be_liveness_introduce(lv, phi); } + + BE_TIMER_POP(t_ssa_constr); } void be_init_ssaconstr(void)