X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=46909900d4b1ce8564f1335b60bf5b5d9f0d1a8a;hb=efdb09dd64658e15cd9fd2599884bfe72bba7fd2;hp=290afd9602b1b853179c5db06de689a0bb0e173c;hpb=8535fe8732b0acf822be252812a7158ce5b8134a;p=libfirm diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 290afd960..46909900d 100644 --- a/ir/be/belistsched.c +++ b/ir/be/belistsched.c @@ -1,20 +1,37 @@ +/* + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + /** - * Scheduling algorithms. - * Just a simple list scheduling algorithm is here. - * @date 20.10.2004 - * @author Sebastian Hack - * @cvs-id $Id$ + * @file + * @brief Primitive list scheduling with different node selectors. + * @author Sebastian Hack + * @date 20.10.2004 + * @version $Id$ */ -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include #include #include -#include "benode_t.h" +#include "benode.h" #include "be_t.h" #include "obst.h" @@ -32,7 +49,7 @@ #include "irtools.h" #include "bemodule.h" -#include "besched_t.h" +#include "besched.h" #include "beutil.h" #include "belive_t.h" #include "belistsched.h" @@ -40,21 +57,23 @@ #include "beschedrss.h" #include "bearch.h" #include "bestat.h" +#include "beirg.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)) +#define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_Start(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 { @@ -69,15 +88,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 */ }; /* 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 }, @@ -103,7 +123,7 @@ static lc_opt_enum_int_var_t sched_prep_var = { static const lc_opt_table_entry_t list_sched_option_table[] = { LC_OPT_ENT_ENUM_PTR("prep", "schedule preparation", &sched_prep_var), LC_OPT_ENT_ENUM_PTR("select", "node selector", &sched_select_var), - { NULL } + LC_OPT_LAST }; /** @@ -120,8 +140,6 @@ typedef struct _sched_irn_t { typedef struct _sched_env_t { sched_irn_t *sched_info; /**< scheduling info per node */ const list_sched_selector_t *selector; /**< The node selector. */ - const arch_env_t *arch_env; /**< The architecture environment. */ - const ir_graph *irg; /**< The graph to schedule. */ void *selector_env; /**< A pointer to give to the selector. */ } sched_env_t; @@ -130,18 +148,36 @@ typedef struct _sched_env_t { */ typedef struct _block_sched_env_t { sched_irn_t *sched_info; /**< scheduling info per node, copied from the global scheduler object */ - nodeset *cands; /**< the set of candidates */ + ir_nodeset_t cands; /**< the set of candidates */ ir_node *block; /**< the current block */ sched_env_t *sched_env; /**< the scheduler environment */ - nodeset *live; /**< simple liveness during scheduling */ + ir_nodeset_t live; /**< simple liveness during scheduling */ const list_sched_selector_t *selector; 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 */ -static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n) +static inline int is_already_scheduled(block_sched_env_t *env, ir_node *n) { int idx = get_irn_idx(n); @@ -152,7 +188,7 @@ static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n) /** * Mark a node as already scheduled */ -static INLINE void mark_already_scheduled(block_sched_env_t *env, ir_node *n) +static inline void set_already_scheduled(block_sched_env_t *env, ir_node *n) { int idx = get_irn_idx(n); @@ -160,6 +196,8 @@ static INLINE void mark_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. @@ -167,7 +205,7 @@ static INLINE void mark_already_scheduled(block_sched_env_t *env, ir_node *n) * @param irn The node to make ready. * @return 1, if the node could be made ready, 0 else. */ -static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn) +static inline int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn) { int i, n; @@ -187,7 +225,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; } @@ -197,13 +235,18 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn return 0; } - 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; } @@ -215,18 +258,22 @@ static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn * @param env The block schedule environment. * @param irn The node, which usages (successors) are to be made ready. */ -static INLINE void make_users_ready(block_sched_env_t *env, ir_node *irn) +static void make_users_ready(block_sched_env_t *env, ir_node *irn) { const ir_edge_t *edge; + /* make all data users ready */ foreach_out_edge(irn, edge) { ir_node *user = get_edge_src_irn(edge); + 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 (! is_Phi(user)) make_ready(env, irn, user); } @@ -235,7 +282,8 @@ static INLINE void make_users_ready(block_sched_env_t *env, ir_node *irn) /** * Returns the number of not yet schedules users. */ -static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) { +static inline int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) +{ int idx = get_irn_idx(n); assert(idx < ARR_LEN(env->sched_info)); @@ -245,7 +293,8 @@ static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) { /** * Sets the number of not yet schedules users. */ -static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) { +static inline void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) +{ int idx = get_irn_idx(n); assert(idx < ARR_LEN(env->sched_info)); @@ -255,7 +304,8 @@ static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, in /** * Add @p num to the number of not yet schedules users and returns the result. */ -static INLINE int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) { +static inline int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) +{ int idx = get_irn_idx(n); assert(idx < ARR_LEN(env->sched_info)); @@ -266,7 +316,8 @@ static INLINE int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int /** * Returns the number of users of a node having mode datab. */ -static int get_num_successors(ir_node *irn) { +static int get_num_successors(ir_node *irn) +{ int sum = 0; const ir_edge_t *edge; @@ -276,10 +327,11 @@ static int get_num_successors(ir_node *irn) { ir_node *proj = get_edge_src_irn(edge); ir_mode *mode = get_irn_mode(proj); - if (mode == mode_T) + if (mode == mode_T) { sum += get_num_successors(proj); - else if (mode_is_datab(mode)) + } else if (mode_is_datab(mode)) { sum += get_irn_n_edges(proj); + } } } else { @@ -295,9 +347,10 @@ static int get_num_successors(ir_node *irn) { /** * Adds irn to @p live, updates all inputs that this user is scheduled - * and counts all of it's non scheduled users. + * and counts all of its non scheduled users. */ -static void update_sched_liveness(block_sched_env_t *env, ir_node *irn) { +static void update_sched_liveness(block_sched_env_t *env, ir_node *irn) +{ int i; /* ignore Projs */ @@ -308,13 +361,12 @@ static void update_sched_liveness(block_sched_env_t *env, ir_node *irn) { ir_node *in = get_irn_in_or_dep(irn, i); /* if in is a proj: update predecessor */ - while (is_Proj(in)) - in = get_Proj_pred(in); + in = skip_Proj(in); /* if in is still in the live set: reduce number of users by one */ - if (nodeset_find(env->live, in)) { + if (ir_nodeset_contains(&env->live, in)) { if (add_irn_not_sched_user(env, in, -1) <= 0) - nodeset_remove(env->live, in); + ir_nodeset_remove(&env->live, in); } } @@ -327,93 +379,38 @@ static void update_sched_liveness(block_sched_env_t *env, ir_node *irn) { i = get_num_successors(irn); if (i > 0) { set_irn_not_sched_user(env, irn, i); - nodeset_insert(env->live, irn); + ir_nodeset_insert(&env->live, irn); } } -static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn) -{ - int res = -1; - - if (get_irn_n_edges(irn) < 1) - return 0; - - 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)); -} - /** * Append an instruction to a schedule. * @param env The block scheduling environment. * @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. */ if (env->selector->node_selected) env->selector->node_selected(env->selector_block_env, irn); - /* Insert the node in the set of all already scheduled nodes. */ - mark_already_scheduled(env, irn); - - /* Remove the node from the ready set */ - if(nodeset_find(env->cands, irn)) - nodeset_remove(env->cands, irn); - - return irn; -} - -/** - * 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"); + /* Insert the node in the set of all available scheduled nodes. */ + set_already_scheduled(env, irn); - if (get_irn_mode(out) == mode_T) - add_tuple_projs(env, out); - else { - add_to_sched(env, out); - make_users_ready(env, out); - } - } + make_users_ready(env, irn); } /** @@ -431,7 +428,6 @@ static void list_sched_block(ir_node *block, void *env_ptr) { sched_env_t *env = env_ptr; const list_sched_selector_t *selector = env->selector; - ir_node *start_node = get_irg_start(get_irn_irg(block)); block_sched_env_t be; const ir_edge_t *edge; @@ -444,8 +440,8 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* Initialize the block scheduling environment */ be.sched_info = env->sched_info; be.block = block; - be.cands = new_nodeset(get_irn_n_edges(block)); - be.live = new_nodeset(get_irn_n_edges(block)); + ir_nodeset_init_size(&be.cands, get_irn_n_edges(block)); + ir_nodeset_init_size(&be.live, get_irn_n_edges(block)); be.selector = selector; be.sched_env = env; @@ -456,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)) { /* @@ -471,16 +482,12 @@ 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) { + } else if (be_is_Start(irn)) { /* The start block will be scheduled as the first node */ add_to_sched(&be, irn); - add_tuple_projs(&be, irn); - } - else { + } 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 */ @@ -490,10 +497,9 @@ static void list_sched_block(ir_node *block, void *env_ptr) if (get_nodes_block(operand) == block) { ready = 0; break; - } - else { + } else { /* live in values increase register pressure */ - update_sched_liveness(&be, operand); + ir_nodeset_insert(&be.live, operand); } } @@ -506,21 +512,19 @@ static void list_sched_block(ir_node *block, void *env_ptr) } /* Iterate over all remaining nodes */ - while (nodeset_count(be.cands) > 0) { - /* collect statistics about amount of ready nodes */ - be_do_stat_sched_ready(block, be.cands); + while (ir_nodeset_size(&be.cands) > 0) { + ir_nodeset_iterator_t iter; - /* Keeps must be scheduled immediatly */ - foreach_nodeset(be.cands, irn) { + /* Keeps must be scheduled immediately */ + foreach_ir_nodeset(&be.cands, irn, iter) { if (be_is_Keep(irn) || be_is_CopyKeep(irn) || is_Sync(irn)) { - nodeset_break(be.cands); break; } } if (! irn) { /* Keeps must be immediately scheduled */ - irn = be.selector->select(be.selector_block_env, be.cands, be.live); + irn = be.selector->select(be.selector_block_env, &be.cands, &be.live); } DB((dbg, LEVEL_2, "\tpicked node %+F\n", irn)); @@ -528,29 +532,20 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* Add the node to the schedule. */ add_to_sched(&be, irn); - if (get_irn_mode(irn) == mode_T) - add_tuple_projs(&be, irn); - else - make_users_ready(&be, irn); - /* remove the scheduled node from the ready list. */ - if (nodeset_find(be.cands, irn)) - nodeset_remove(be.cands, irn); + ir_nodeset_remove(&be.cands, irn); } if (selector->finish_block) selector->finish_block(be.selector_block_env); - del_nodeset(be.cands); - del_nodeset(be.live); + ir_nodeset_destroy(&be.cands); + ir_nodeset_destroy(&be.live); } /* List schedule a graph. */ -void list_sched(const be_irg_t *birg, be_options_t *be_opts) +void list_sched(ir_graph *irg) { - const arch_env_t *arch_env = birg->main_env->arch_env; - ir_graph *irg = birg->irg; - int num_nodes; sched_env_t env; mris_env_t *mris = NULL; @@ -558,36 +553,33 @@ 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 = heuristic_selector; break; } - /* Assure, that the out edges are computed */ - edges_deactivate(birg->irg); - edges_activate(birg->irg); +#if 1 + /* Matze: This is very slow, we should avoid it to improve backend speed, + * we just have to make sure that we have no dangling out-edges at this + * point... + */ + + /* Assure, that we have no dangling out-edges to deleted stuff */ + edges_deactivate(irg); + edges_activate(irg); +#endif switch (list_sched_options.prep) { case BE_SCHED_PREP_MRIS: - mris = be_sched_mris_preprocess(birg); + mris = be_sched_mris_preprocess(irg); break; case BE_SCHED_PREP_RSS: - rss_schedule_preparation(birg); + rss_schedule_preparation(irg); break; default: break; @@ -597,15 +589,13 @@ 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.arch_env = arch_env; - env.irg = irg; + env.selector = arch_env_get_list_sched_selector(be_get_irg_arch_env(irg), &sel); env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes); 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, irg); /* Schedule each single block. */ irg_block_walk_graph(irg, list_sched_block, NULL, &env); @@ -620,54 +610,39 @@ void list_sched(const be_irg_t *birg, be_options_t *be_opts) } /* List schedule a block. */ -void list_sched_single_block(const be_irg_t *birg, ir_node *block, be_options_t *be_opts) +void list_sched_single_block(ir_graph *irg, ir_node *block) { - const arch_env_t *arch_env = birg->main_env->arch_env; - ir_graph *irg = birg->irg; - int num_nodes; sched_env_t env; list_sched_selector_t sel; /* 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 */ - edges_deactivate(birg->irg); - edges_activate(birg->irg); + edges_deactivate(irg); + edges_activate(irg); num_nodes = get_irg_last_idx(irg); /* 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.arch_env = arch_env; - env.irg = irg; + env.selector = arch_env_get_list_sched_selector(be_get_irg_arch_env(irg), &sel); env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes); 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, irg); /* Schedule block. */ list_sched_block(block, &env); @@ -678,16 +653,13 @@ void list_sched_single_block(const be_irg_t *birg, ir_node *block, be_options_t DEL_ARR_F(env.sched_info); } -/** - * Register list scheduler options. - */ -void be_init_listsched(void) { - lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_listsched); +void be_init_listsched(void) +{ + 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); FIRM_DBG_REGISTER(dbg, "firm.be.sched"); } - -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_listsched);