X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=cf31ea45ec0c76fcad5d13d876d7f43ac6ff8d8b;hb=3f807bf48426a29da4129ff29c44a4b4690c45f6;hp=511d6196d81c16fb7878fb7848f3c3f21e8ca7aa;hpb=55437d814f031e648187e51ba6e952907f9a480c;p=libfirm diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 511d6196d..cf31ea45e 100644 --- a/ir/be/belistsched.c +++ b/ir/be/belistsched.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. * @@ -61,20 +61,21 @@ #include "bestat.h" #include "beirg_t.h" -#include -#include +#include "lc_opts.h" +#include "lc_opts_enum.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL); #define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_RegParams(irn)) enum { - BE_SCHED_SELECT_TRIVIAL = 0, - BE_SCHED_SELECT_REGPRESS = 1, - BE_SCHED_SELECT_MUCHNIK = 2, - BE_SCHED_SELECT_HEUR = 3, - BE_SCHED_SELECT_HMUCHNIK = 4, - BE_SCHED_SELECT_RANDOM = 5 + BE_SCHED_SELECT_TRIVIAL, + BE_SCHED_SELECT_REGPRESS, + BE_SCHED_SELECT_MUCHNIK, + BE_SCHED_SELECT_HEUR, + BE_SCHED_SELECT_HMUCHNIK, + BE_SCHED_SELECT_RANDOM, + BE_SCHED_SELECT_NORMAL, }; enum { @@ -96,8 +97,9 @@ static list_sched_options_t list_sched_options = { /* schedule selector options. */ static const lc_opt_enum_int_items_t sched_select_items[] = { { "trivial", BE_SCHED_SELECT_TRIVIAL }, - { "random", BE_SCHED_SELECT_RANDOM }, + { "random", BE_SCHED_SELECT_RANDOM }, { "regpress", BE_SCHED_SELECT_REGPRESS }, + { "normal", BE_SCHED_SELECT_NORMAL }, { "muchnik", BE_SCHED_SELECT_MUCHNIK }, { "heur", BE_SCHED_SELECT_HEUR }, { "hmuchnik", BE_SCHED_SELECT_HMUCHNIK }, @@ -158,6 +160,24 @@ typedef struct _block_sched_env_t { void *selector_block_env; } block_sched_env_t; +/** + * Returns non-zero if a node must be placed in the schedule. + */ +static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn) +{ + int res = -1; + + /* if there are no uses, don't schedule */ + if (get_irn_n_edges(irn) < 1) + return 0; + + /* else ask the scheduler */ + if (sel->to_appear_in_schedule) + res = sel->to_appear_in_schedule(block_env, irn); + + return res >= 0 ? res : ((to_appear_in_schedule(irn) || BE_SCHED_NODE(irn)) && ! is_Unknown(irn)); +} + /** * Returns non-zero if the node is already scheduled */ @@ -180,6 +200,8 @@ static INLINE void set_already_scheduled(block_sched_env_t *env, ir_node *n) env->sched_info[idx].already_sched = 1; } +static void add_to_sched(block_sched_env_t *env, ir_node *irn); + /** * Try to put a node in the ready set. * @param env The block scheduler environment. @@ -217,65 +239,22 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn return 0; } - ir_nodeset_insert(&env->cands, irn); + if (! must_appear_in_schedule(env->selector, env, irn)) { + add_to_sched(env, irn); + DB((dbg, LEVEL_3, "\tmaking immediately available: %+F\n", irn)); + } else { + ir_nodeset_insert(&env->cands, irn); - /* Notify selector about the ready node. */ - if (env->selector->node_ready) - env->selector->node_ready(env->selector_block_env, irn, pred); + /* Notify selector about the ready node. */ + if (env->selector->node_ready) + env->selector->node_ready(env->selector_block_env, irn, pred); - DB((dbg, LEVEL_2, "\tmaking ready: %+F\n", irn)); + DB((dbg, LEVEL_2, "\tmaking ready: %+F\n", irn)); + } return 1; } -/** - * Returns non-zero if a node must be placed in the schedule. - */ -static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn) -{ - int res = -1; - - /* if there are no uses, don't schedule */ - if (get_irn_n_edges(irn) < 1) - return 0; - - /* else ask the scheduler */ - if (sel->to_appear_in_schedule) - res = sel->to_appear_in_schedule(block_env, irn); - - return res >= 0 ? res : ((to_appear_in_schedule(irn) || BE_SCHED_NODE(irn)) && ! is_Unknown(irn)); -} - -/* forward */ -static void make_users_ready(block_sched_env_t *env, ir_node *irn); - -static void make_user_ready(block_sched_env_t *env, ir_node *pred, ir_node *user) { - if (! is_Phi(user)) { - if (! must_appear_in_schedule(env->selector, env, user)) { - /* notify the selector about the finally selected node. */ - if (env->selector->node_selected) - env->selector->node_selected(env->selector_block_env, user); - - /* Insert the node in the set of all available scheduled nodes. */ - set_already_scheduled(env, user); - - make_users_ready(env, user); - } else { - if (! ir_nodeset_contains(&env->cands, user)) { - /* work-around: this should NEVER be true, else we have a cycle in the basic block. - for now it's needed to compile bzip2.c */ - if (sched_is_scheduled(user)) { - //assert(!"make an already scheduled user ready"); - } - else { - make_ready(env, pred, user); - } - } - } - } -} - - /** * Try, to make all users of a node ready. * In fact, a usage node can only be made ready, if all its operands @@ -291,16 +270,16 @@ static void make_users_ready(block_sched_env_t *env, ir_node *irn) foreach_out_edge(irn, edge) { ir_node *user = get_edge_src_irn(edge); - if (get_block(user) == env->block) - make_user_ready(env, irn, user); + if (! is_Phi(user)) + make_ready(env, irn, user); } /* and the dependent nodes as well */ foreach_out_edge_kind(irn, edge, EDGE_KIND_DEP) { ir_node *user = get_edge_src_irn(edge); - if (get_block(user) == env->block) - make_user_ready(env, irn, user); + if (! is_Phi(user)) + make_ready(env, irn, user); } } @@ -409,15 +388,18 @@ static void update_sched_liveness(block_sched_env_t *env, ir_node *irn) { * @param irn The node to add to the schedule. * @return The given node. */ -static ir_node *add_to_sched(block_sched_env_t *env, ir_node *irn) +static void add_to_sched(block_sched_env_t *env, ir_node *irn) { /* If the node consumes/produces data, it is appended to the schedule * list, otherwise, it is not put into the list */ if (must_appear_in_schedule(env->selector, env->selector_block_env, irn)) { update_sched_liveness(env, irn); - sched_add_before(env->block, irn); + sched_add_before(env->block, irn); + + DBG((dbg, LEVEL_2, "\tadding %+F\n", irn)); - DBG((dbg, LEVEL_2, "\tadding %+F\n", irn)); + /* Remove the node from the ready set */ + ir_nodeset_remove(&env->cands, irn); } /* notify the selector about the finally selected node. */ @@ -427,55 +409,9 @@ static ir_node *add_to_sched(block_sched_env_t *env, ir_node *irn) /* Insert the node in the set of all available scheduled nodes. */ set_already_scheduled(env, irn); - /* Remove the node from the ready set */ - ir_nodeset_remove(&env->cands, irn); - - return irn; + make_users_ready(env, irn); } -#ifdef SCHEDULE_PROJS -/** - * Add the proj nodes of a tuple-mode irn to the schedule immediately - * after the tuple-moded irn. By pinning the projs after the irn, no - * other nodes can create a new lifetime between the tuple-moded irn and - * one of its projs. This should render a realistic image of a - * tuple-moded irn, which in fact models a node which defines multiple - * values. - * - * @param irn The tuple-moded irn. - */ -static void add_tuple_projs(block_sched_env_t *env, ir_node *irn) -{ - const ir_edge_t *edge; - - assert(get_irn_mode(irn) == mode_T && "Mode of node must be tuple"); - - if (is_Bad(irn)) - return; - - - /* non-proj nodes can have dependency edges to tuple nodes. */ - foreach_out_edge_kind(irn, edge, EDGE_KIND_DEP) { - ir_node *out = get_edge_src_irn(edge); - make_ready(env, irn, out); - } - - /* schedule the normal projs */ - foreach_out_edge(irn, edge) { - ir_node *out = get_edge_src_irn(edge); - - assert(is_Proj(out) && "successor of a modeT node must be a proj"); - - if (get_irn_mode(out) == mode_T) - add_tuple_projs(env, out); - else { - add_to_sched(env, out); - make_users_ready(env, out); - } - } -} -#endif - /** * Perform list scheduling on a block. * @@ -516,14 +452,29 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* Then one can add all nodes are ready to the set. */ foreach_out_edge(block, edge) { - ir_node *irn = get_edge_src_irn(edge); + ir_node *irn = get_edge_src_irn(edge); + ir_opcode code = get_irn_opcode(irn); + int users; - /* Skip the end node because of keepalive edges. */ - if (get_irn_opcode(irn) == iro_End) + if (code == iro_End) { + /* Skip the end node because of keep-alive edges. */ + continue; + } else if (code == iro_Block) { + /* A Block-Block edge. This should be the MacroBlock + * edge, ignore it. */ + assert(get_Block_MacroBlock(irn) == block && "Block-Block edge found"); continue; + } - if (get_irn_n_edges(irn) == 0) + users = get_irn_n_edges(irn); + if (users == 0) continue; + else if (users == 1) { /* ignore nodes that are only hold by the anchor */ + const ir_edge_t *edge = get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL); + ir_node *user = get_edge_src_irn(edge); + if (is_Anchor(user)) + continue; + } if (is_Phi(irn)) { /* @@ -531,20 +482,14 @@ static void list_sched_block(ir_node *block, void *env_ptr) transfer data flow from the predecessors to this block. */ add_to_sched(&be, irn); - make_users_ready(&be, irn); } else if (irn == start_node) { /* The start block will be scheduled as the first node */ add_to_sched(&be, irn); -#ifdef SCHEDULE_PROJS - add_tuple_projs(&be, irn); -#else - make_users_ready(&be, irn); -#endif } else { /* Other nodes must have all operands in other blocks to be made - * ready */ + * ready */ int ready = 1; /* Check, if the operands of a node are not local to this block */ @@ -591,15 +536,6 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* Add the node to the schedule. */ add_to_sched(&be, irn); -#ifdef SCHEDULE_PROJS - if (get_irn_mode(irn) == mode_T) - add_tuple_projs(&be, irn); - else -#endif - { - make_users_ready(&be, irn); - } - /* remove the scheduled node from the ready list. */ ir_nodeset_remove(&be.cands, irn); } @@ -612,7 +548,7 @@ static void list_sched_block(ir_node *block, void *env_ptr) } /* List schedule a graph. */ -void list_sched(const be_irg_t *birg, be_options_t *be_opts) +void list_sched(be_irg_t *birg, be_options_t *be_opts) { const arch_env_t *arch_env = birg->main_env->arch_env; ir_graph *irg = birg->irg; @@ -626,24 +562,14 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts) /* Select a scheduler based on backend options */ switch (list_sched_options.select) { - case BE_SCHED_SELECT_TRIVIAL: - memcpy(&sel, trivial_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_RANDOM: - memcpy(&sel, random_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_REGPRESS: - memcpy(&sel, reg_pressure_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_MUCHNIK: - memcpy(&sel, muchnik_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_HEUR: - memcpy(&sel, heuristic_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_HMUCHNIK: + case BE_SCHED_SELECT_TRIVIAL: sel = trivial_selector; break; + case BE_SCHED_SELECT_RANDOM: sel = random_selector; break; + case BE_SCHED_SELECT_REGPRESS: sel = reg_pressure_selector; break; + case BE_SCHED_SELECT_MUCHNIK: sel = muchnik_selector; break; + case BE_SCHED_SELECT_HEUR: sel = heuristic_selector; break; + case BE_SCHED_SELECT_NORMAL: sel = normal_selector; break; default: - memcpy(&sel, trivial_selector, sizeof(sel)); + case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector; break; } #if 1 @@ -672,7 +598,7 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts) /* initialize environment for list scheduler */ memset(&env, 0, sizeof(env)); - env.selector = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel); + env.selector = arch_env_get_list_sched_selector(arch_env, &sel); env.arch_env = arch_env; env.irg = irg; env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes); @@ -680,7 +606,7 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts) memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0])); if (env.selector->init_graph) - env.selector_env = env.selector->init_graph(env.selector, arch_env, irg); + env.selector_env = env.selector->init_graph(env.selector, birg); /* Schedule each single block. */ irg_block_walk_graph(irg, list_sched_block, NULL, &env); @@ -709,24 +635,14 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block, /* Select a scheduler based on backend options */ switch (list_sched_options.select) { - case BE_SCHED_SELECT_TRIVIAL: - memcpy(&sel, trivial_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_RANDOM: - memcpy(&sel, random_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_REGPRESS: - memcpy(&sel, reg_pressure_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_MUCHNIK: - memcpy(&sel, muchnik_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_HEUR: - memcpy(&sel, heuristic_selector, sizeof(sel)); - break; - case BE_SCHED_SELECT_HMUCHNIK: + case BE_SCHED_SELECT_TRIVIAL: sel = trivial_selector; break; + case BE_SCHED_SELECT_RANDOM: sel = random_selector; break; + case BE_SCHED_SELECT_REGPRESS: sel = reg_pressure_selector; break; + case BE_SCHED_SELECT_MUCHNIK: sel = muchnik_selector; break; + case BE_SCHED_SELECT_HEUR: sel = heuristic_selector; break; + case BE_SCHED_SELECT_NORMAL: sel = normal_selector; break; default: - memcpy(&sel, trivial_selector, sizeof(sel)); + case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector; break; } /* Assure, that the out edges are computed */ @@ -737,7 +653,7 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block, /* initialize environment for list scheduler */ memset(&env, 0, sizeof(env)); - env.selector = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel); + env.selector = arch_env_get_list_sched_selector(arch_env, &sel); env.arch_env = arch_env; env.irg = irg; env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes); @@ -745,7 +661,7 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block, memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0])); if (env.selector->init_graph) - env.selector_env = env.selector->init_graph(env.selector, arch_env, irg); + env.selector_env = env.selector->init_graph(env.selector, birg); /* Schedule block. */ list_sched_block(block, &env);