X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=5e98db60c4f78e3b3fc99cee46a0ca89775e1ca8;hb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;hp=890248a3ab8a9d8d0ff75d92e5a56511cecef8c9;hpb=79ed89a676afd08eb739330d46b85b1d1532aec1;p=libfirm diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 890248a3a..5e98db60c 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,17 +61,21 @@ #include "bestat.h" #include "beirg_t.h" +#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 { @@ -86,20 +90,16 @@ typedef struct _list_sched_options_t { } list_sched_options_t; static list_sched_options_t list_sched_options = { - BE_SCHED_SELECT_HEUR, /* mueller heuristic selector */ + BE_SCHED_SELECT_NORMAL, /* mueller heuristic selector */ BE_SCHED_PREP_NONE, /* no scheduling preparation */ }; - -#ifdef WITH_LIBCORE -#include -#include - /* 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 }, @@ -127,7 +127,6 @@ static const lc_opt_table_entry_t list_sched_option_table[] = { LC_OPT_ENT_ENUM_PTR("select", "node selector", &sched_select_var), LC_OPT_LAST }; -#endif /* WITH_LIBCORE */ /** * All scheduling info needed per node. @@ -230,7 +229,7 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn /* if irn is an End we have keep-alives and op might be a block, skip that */ if (is_Block(op)) { - assert(get_irn_op(irn) == op_End); + assert(is_End(irn)); continue; } @@ -413,48 +412,6 @@ static void add_to_sched(block_sched_env_t *env, ir_node *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); - } - } -} -#endif - /** * Perform list scheduling on a block. * @@ -495,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)) { /* @@ -514,13 +486,10 @@ static void list_sched_block(ir_node *block, void *env_ptr) 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); -#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 */ @@ -547,8 +516,6 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* Iterate over all remaining nodes */ while (ir_nodeset_size(&be.cands) > 0) { ir_nodeset_iterator_t iter; - /* collect statistics about amount of ready nodes */ - be_do_stat_sched_ready(block, &be.cands); /* Keeps must be scheduled immediately */ foreach_ir_nodeset(&be.cands, irn, iter) { @@ -567,11 +534,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); -#endif - /* remove the scheduled node from the ready list. */ ir_nodeset_remove(&be.cands, irn); } @@ -598,24 +560,14 @@ void list_sched(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 @@ -644,7 +596,7 @@ void list_sched(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); @@ -652,7 +604,7 @@ void list_sched(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); @@ -681,24 +633,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 */ @@ -709,7 +651,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); @@ -717,7 +659,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); @@ -732,12 +674,11 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block, * Register list scheduler options. */ void be_init_listsched(void) { -#ifdef WITH_LIBCORE lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); lc_opt_entry_t *sched_grp = lc_opt_get_grp(be_grp, "listsched"); lc_opt_add_table(sched_grp, list_sched_option_table); -#endif + FIRM_DBG_REGISTER(dbg, "firm.be.sched"); }