#include "benode_t.h"
#include "besched_t.h"
#include "beilpsched.h"
+#include "beutil.h"
typedef struct _ilpsched_options_t {
+ unsigned regpress;
unsigned limit_dead;
unsigned time_limit;
char log_file[1024];
#define get_ilpsched_block_attr(block) (&(block)->attr.block_attr)
#define get_ilpsched_node_attr(node) (&(node)->attr.node_attr)
-/* iterate over a list of ir_nodes linked by link field */
-#define foreach_linked_irns(head, iter) for ((iter) = (head); (iter); (iter) = get_irn_link((iter)))
-
/* check if node is considered for ILP scheduling */
#define consider_for_sched(isa, irn) \
(! (is_Block(irn) || \
is_normal_Proj(isa, irn) || \
is_Phi(irn) || \
is_NoMem(irn) || \
- is_Jmp(irn) || \
+ is_Unknown(irn) || \
is_End(irn) \
))
/* option variable */
static ilpsched_options_t ilp_opts = {
- 70, /* if we have more than 70 nodes: use alive nodes constraint */
- 120, /* 300 sec per block time limit */
+ 1, /* default is with register pressure constraints */
+ 120, /* if we have more than 70 nodes: use alive nodes constraint */
+ 300, /* 300 sec per block time limit */
"" /* no log file */
};
#ifdef WITH_LIBCORE
/* ILP options */
static const lc_opt_table_entry_t ilpsched_option_table[] = {
+ LC_OPT_ENT_BOOL("regpress", "Use register pressure constraints", &ilp_opts.regpress),
LC_OPT_ENT_INT("limit_dead", "Upto how many nodes the dead node constraint should be used", &ilp_opts.limit_dead),
LC_OPT_ENT_INT("time_limit", "ILP time limit per block", &ilp_opts.time_limit),
LC_OPT_ENT_STR("lpp_log", "LPP logfile (stderr and stdout are supported)", ilp_opts.log_file, sizeof(ilp_opts.log_file)),
foreach_out_edge(irn, edge) {
ir_node *user = get_edge_src_irn(edge);
- if (to_appear_in_schedule(user) || get_irn_mode(user) == mode_b)
+ if ((to_appear_in_schedule(user) || get_irn_mode(user) == mode_b) &&
+ get_irn_n_edges(user) > 0)
+ {
notified_sched_add_before(env, block, user, cycle);
+ }
check_for_keeps(keeps, block, user);
}
if (! LPP_VALUE_IS_0(val)) {
na->sched_point = t;
ARR_APP1(be_ilpsched_irn_t *, sched_nodes, node);
- DBG((env->dbg, LEVEL_1, "Schedpoint of %+F is %u at unit type %s\n",
+ DBG((env->dbg, LEVEL_2, "Schedpoint of %+F is %u at unit type %s\n",
irn, t, na->type_info[tp_idx].tp->name));
found = 1;
}
case iro_End:
case iro_Proj:
case iro_Bad:
+ case iro_Unknown:
break;
default:
if (is_cfop(irn)) {
/* add all nodes from list */
for (i = 0, l = ARR_LEN(sched_nodes); i < l; ++i) {
ilpsched_node_attr_t *na = get_ilpsched_node_attr(sched_nodes[i]);
- add_to_sched(env, block, sched_nodes[i]->irn, na->sched_point);
+ if (sched_nodes[i]->irn != cfop)
+ add_to_sched(env, block, sched_nodes[i]->irn, na->sched_point);
}
/* schedule control flow node if not already done */
/* if we have less than two interesting nodes, there is no need to create the ILP */
if (ba->n_interesting_nodes > 1) {
- double fact_var = ba->n_interesting_nodes > 25 ? 1.1 : 1.2;
- double fact_cst = ba->n_interesting_nodes > 25 ? 0.7 : 1.5;
+ double fact_var = ba->n_interesting_nodes > 25 ? 2.3 : 3;
+ double fact_cst = ba->n_interesting_nodes > 25 ? 3 : 4.5;
int base_num = ba->n_interesting_nodes * ba->n_interesting_nodes;
int estimated_n_var = (int)((double)base_num * fact_var);
int estimated_n_cst = (int)((double)base_num * fact_cst);
- DBG((env->dbg, LEVEL_1, "Creating LPP with estimed numbers: %d vars, %d cst\n",
+ DBG((env->dbg, LEVEL_1, "Creating LPP with estimated numbers: %d vars, %d cst\n",
estimated_n_var, estimated_n_cst));
/* set up the LPP object */
lpp = new_lpp_userdef(
(const char *)name,
lpp_minimize,
- estimated_n_cst + 1, /* num vars */
- estimated_n_cst + 20, /* num cst */
- 1.2); /* grow factor */
+ estimated_n_cst, /* num vars */
+ estimated_n_cst + 1, /* num cst */
+ 1.3); /* grow factor */
obstack_init(&var_obst);
/* create ILP variables */
create_ressource_constraints(env, lpp, block_node);
create_bundle_constraints(env, lpp, block_node);
//create_proj_keep_constraints(env, lpp, block_node);
- if (ba->n_interesting_nodes > env->opts->limit_dead) {
- create_alive_nodes_constraint(env, lpp, block_node);
- create_pressure_alive_constraint(env, lpp, block_node);
- } else {
- create_dying_nodes_constraint(env, lpp, block_node);
- create_pressure_dead_constraint(env, lpp, block_node);
+
+ if (env->opts->regpress) {
+ if (ba->n_interesting_nodes > env->opts->limit_dead) {
+ create_alive_nodes_constraint(env, lpp, block_node);
+ create_pressure_alive_constraint(env, lpp, block_node);
+ } else {
+ create_dying_nodes_constraint(env, lpp, block_node);
+ create_pressure_dead_constraint(env, lpp, block_node);
+ }
}
DBG((env->dbg, LEVEL_1, "ILP to solve: %u variables, %u constraints\n", lpp->var_next, lpp->cst_next));
/* debug stuff, dump lpp when debugging is on */
DEBUG_ONLY(
- if (firm_dbg_get_mask(env->dbg) > 0) {
+ if (firm_dbg_get_mask(env->dbg) > 1) {
char buf[1024];
FILE *f;
DBG((env->dbg, LEVEL_1, "\nSolution:\n"));
DBG((env->dbg, LEVEL_1, "\tsend time: %g sec\n", lpp->send_time / 1000000.0));
DBG((env->dbg, LEVEL_1, "\treceive time: %g sec\n", lpp->recv_time / 1000000.0));
+ DBG((env->dbg, LEVEL_1, "\tmatrix: %u elements, density %.2f%%, size %.2fMB\n", lpp->n_elems, lpp->density, (double)lpp->matrix_mem / 1024.0 / 1024.0));
DBG((env->dbg, LEVEL_1, "\titerations: %d\n", lpp->iterations));
DBG((env->dbg, LEVEL_1, "\tsolution time: %g\n", lpp->sol_time));
DBG((env->dbg, LEVEL_1, "\tobjective function: %g\n", LPP_VALUE_IS_0(lpp->objval) ? 0.0 : lpp->objval));
FIRM_DBG_REGISTER(env.dbg, "firm.be.sched.ilp");
- //firm_dbg_set_mask(env.dbg, 31);
+// firm_dbg_set_mask(env.dbg, 1);
env.irg_env = be_ilp_sched_init_irg_ilp_schedule(sel, birg->irg);
env.sel = sel;
projects / libfirm / blobdiff