X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=254da32c6c182f319f06daa1c6b718c35cb817db;hb=e3b759fcf8896ea47333fc2e415a1ef4b31e031a;hp=21770ca78f2966aa898933023a76723f02cf8c20;hpb=5057c4b3b6c48dc75dee684cd172ce4cfed00da7;p=libfirm diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c index 21770ca78..254da32c6 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. * @@ -24,9 +24,7 @@ * @date 20.10.2004 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include @@ -61,20 +59,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 { @@ -89,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 }, @@ -140,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; @@ -161,7 +159,7 @@ typedef struct _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) +static inline int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn) { int res = -1; @@ -179,7 +177,7 @@ static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void /** * 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); @@ -190,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 set_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); @@ -207,7 +205,7 @@ static void add_to_sched(block_sched_env_t *env, ir_node *irn); * @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; @@ -227,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; } @@ -284,7 +282,7 @@ static 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)); @@ -294,7 +292,7 @@ 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)); @@ -304,7 +302,7 @@ 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)); @@ -450,14 +448,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)) { /* @@ -469,13 +482,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 */ @@ -502,8 +512,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) { @@ -536,8 +544,7 @@ static void list_sched_block(ir_node *block, void *env_ptr) /* List schedule a graph. */ 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; + ir_graph *irg = birg->irg; int num_nodes; sched_env_t env; @@ -548,24 +555,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 = heuristic_selector; break; } #if 1 @@ -575,8 +572,8 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts) */ /* Assure, that we have no dangling out-edges to deleted stuff */ - edges_deactivate(birg->irg); - edges_activate(birg->irg); + edges_deactivate(irg); + edges_activate(irg); #endif switch (list_sched_options.prep) { @@ -594,15 +591,13 @@ 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.arch_env = arch_env; - env.irg = irg; + env.selector = arch_env_get_list_sched_selector(birg->main_env->arch_env, &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, birg); /* Schedule each single block. */ irg_block_walk_graph(irg, list_sched_block, NULL, &env); @@ -620,8 +615,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts) void list_sched_single_block(const be_irg_t *birg, ir_node *block, be_options_t *be_opts) { - const arch_env_t *arch_env = birg->main_env->arch_env; - ir_graph *irg = birg->irg; + ir_graph *irg = birg->irg; int num_nodes; sched_env_t env; @@ -631,43 +625,31 @@ 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 */ - 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(birg->main_env->arch_env, &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, birg); /* Schedule block. */ list_sched_block(block, &env);