#include "debug.h"
#include "irtools.h"
+#include "bemodule.h"
#include "besched_t.h"
#include "beutil.h"
#include "belive_t.h"
#include <libcore/lc_opts_enum.h>
#endif /* WITH_LIBCORE */
+#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,
{
int i, n;
- /* Blocks cannot be scheduled. */
- if (is_Block(irn) || get_irn_n_edges(irn) == 0)
- return 0;
+ /* Blocks cannot be scheduled. */
+ if (is_Block(irn) || get_irn_n_edges(irn) == 0)
+ return 0;
- /*
- * Check, if the given ir node is in a different block as the
- * currently scheduled one. If that is so, don't make the node ready.
- */
- if (env->block != get_nodes_block(irn))
- return 0;
+ /*
+ * Check, if the given ir node is in a different block as the
+ * currently scheduled one. If that is so, don't make the node ready.
+ */
+ if (env->block != get_nodes_block(irn))
+ return 0;
for (i = 0, n = get_irn_ins_or_deps(irn); i < n; ++i) {
- ir_node *op = get_irn_in_or_dep(irn, i);
-
- /* 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);
- continue;
- }
-
- /* If the operand is local to the scheduled block and not yet
- * scheduled, this nodes cannot be made ready, so exit. */
- if (! is_already_scheduled(env, op) && get_nodes_block(op) == env->block)
- return 0;
- }
+ ir_node *op = get_irn_in_or_dep(irn, i);
+
+ /* 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);
+ continue;
+ }
+
+ /* If the operand is local to the scheduled block and not yet
+ * scheduled, this nodes cannot be made ready, so exit. */
+ if (! is_already_scheduled(env, op) && get_nodes_block(op) == env->block)
+ return 0;
+ }
nodeset_insert(env->cands, irn);
/**
* Try, to make all users of a node ready.
* In fact, a usage node can only be made ready, if all its operands
- * have already been scheduled yet. This is checked my make_ready().
+ * have already been scheduled yet. This is checked by make_ready().
* @param env The block schedule environment.
* @param irn The node, which usages (successors) are to be made ready.
*/
{
int res = -1;
- if(sel->to_appear_in_schedule)
+ 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_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_RegParams(irn));
+ return res >= 0 ? res : ((to_appear_in_schedule(irn) || BE_SCHED_NODE(irn)) && ! is_Unknown(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)) {
- sched_info_t *info = get_irn_sched_info(irn);
- INIT_LIST_HEAD(&info->list);
- info->scheduled = 1;
update_sched_liveness(env, irn);
sched_add_before(env->block, irn);
assert(get_irn_mode(irn) == mode_T && "Mode of node must be tuple");
- if(is_Bad(irn))
+ if (is_Bad(irn))
return;
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));
- sched_info_t *info = get_irn_sched_info(block);
block_sched_env_t be;
const ir_edge_t *edge;
int j, m;
/* Initialize the block's list head that will hold the schedule. */
- INIT_LIST_HEAD(&info->list);
+ sched_init_block(block);
/* Initialize the block scheduling environment */
be.sched_info = env->sched_info;
/* Keeps must be scheduled immediatly */
foreach_nodeset(be.cands, irn) {
- if (be_is_Keep(irn) || be_is_CopyKeep(irn) || get_irn_mode(irn) == mode_M) {
+ if (be_is_Keep(irn) || be_is_CopyKeep(irn) || is_Sync(irn)) {
nodeset_break(be.cands);
break;
}
}
/* Assure, that the out edges are computed */
- edges_assure(irg);
+ edges_deactivate(birg->irg);
+ edges_activate(birg->irg);
switch (list_sched_options.prep) {
case BE_SCHED_PREP_MRIS:
/**
* Register list scheduler options.
*/
-void list_sched_register_options(lc_opt_entry_t *grp) {
- static int run_once = 0;
- lc_opt_entry_t *sched_grp;
+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");
- if (! run_once) {
- run_once = 1;
- sched_grp = lc_opt_get_grp(grp, "sched");
-
- lc_opt_add_table(sched_grp, list_sched_option_table);
- rss_register_options(sched_grp);
- }
+ lc_opt_add_table(sched_grp, list_sched_option_table);
}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_listsched);
#endif /* WITH_LIBCORE */
projects / libfirm / blobdiff