/*
- * 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.
*
#include "bestat.h"
#include "beirg_t.h"
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.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 {
/* 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 },
/* 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)) {
/*
}
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 */
/* 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
/* 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);
/* 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 */
/* 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);