/**
* Print all nodes of a pset into a file.
*/
-static void print_living_values(FILE *F, pset *live_nodes) {
+static void print_living_values(FILE *F, const ir_nodeset_t *live_nodes) {
+ ir_nodeset_iterator_t iter;
ir_node *node;
ir_fprintf(F, "\t");
- foreach_pset(live_nodes, node) {
+ foreach_ir_nodeset(live_nodes, node, iter) {
ir_fprintf(F, "%+F ", node);
}
ir_fprintf(F, "\n");
*/
static void verify_liveness_walker(ir_node *block, void *data) {
be_verify_register_pressure_env_t *env = (be_verify_register_pressure_env_t *)data;
- pset *live_nodes = pset_new_ptr_default();
+ ir_nodeset_t live_nodes;
ir_node *irn;
int pressure;
/* collect register pressure info, start with end of a block */
- be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block, live_nodes);
+ // ir_fprintf(stderr, "liveness check %+F\n", block);
+ ir_nodeset_init(&live_nodes);
+ be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+ &live_nodes);
- pressure = pset_count(live_nodes);
+ // print_living_values(stderr, &live_nodes);
+ pressure = ir_nodeset_size(&live_nodes);
if(pressure > env->registers_available) {
ir_fprintf(stderr, "Verify Warning: Register pressure too high at end of block %+F(%s) (%d/%d):\n",
block, get_irg_dump_name(env->irg), pressure, env->registers_available);
- print_living_values(stderr, live_nodes);
+ print_living_values(stderr, &live_nodes);
env->problem_found = 1;
}
if (is_Phi(irn))
break;
- be_liveness_transfer(env->arch_env, env->cls, irn, live_nodes);
+ // print_living_values(stderr, &live_nodes);
+ be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
- pressure = pset_count(live_nodes);
+ pressure = ir_nodeset_size(&live_nodes);
if(pressure > env->registers_available) {
ir_fprintf(stderr, "Verify Warning: Register pressure too high before node %+F in %+F(%s) (%d/%d):\n",
irn, block, get_irg_dump_name(env->irg), pressure, env->registers_available);
- print_living_values(stderr, live_nodes);
+ print_living_values(stderr, &live_nodes);
env->problem_found = 1;
+ assert(0);
}
}
- del_pset(live_nodes);
+ ir_nodeset_destroy(&live_nodes);
}
/**
ir_graph *irg) {
be_verify_register_pressure_env_t env;
- env.lv = be_liveness(irg);
+ env.lv = be_liveness(birg);
env.irg = irg;
env.arch_env = birg->main_env->arch_env;
env.cls = cls;
env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
env.problem_found = 0;
+ be_liveness_assure_sets(env.lv);
irg_block_walk_graph(irg, verify_liveness_walker, NULL, &env);
be_liveness_free(env.lv);
-//---------------------------------------------------------------------------
+/*--------------------------------------------------------------------------- */
ir_node *node;
int non_phi_found = 0;
int cfchange_found = 0;
- // TODO ask arch about delay branches
+ /* TODO ask arch about delay branches */
int delay_branches = 0;
int last_timestep = INT_MIN;
int i, arity;
int timestep;
- // this node is scheduled
+ /* this node is scheduled */
if(bitset_is_set(env->scheduled, get_irn_idx(node))) {
ir_fprintf(stderr, "Verify warning: %+F appears to be schedule twice\n");
env->problem_found = 1;
}
bitset_set(env->scheduled, get_irn_idx(node));
- // Check that scheduled nodes are in the correct block
+ /* Check that scheduled nodes are in the correct block */
if(get_nodes_block(node) != block) {
ir_fprintf(stderr, "Verify warning: %+F is in block %+F but scheduled in %+F\n", node, get_nodes_block(node), block);
env->problem_found = 1;
}
- // Check that timesteps are increasing
+ /* Check that timesteps are increasing */
timestep = sched_get_time_step(node);
if(timestep <= last_timestep) {
ir_fprintf(stderr, "Verify warning: Schedule timestep did not increase at node %+F\n",
}
last_timestep = timestep;
- // Check that phis come before any other node
+ /* Check that phis come before any other node */
if (is_Phi(node)) {
if (non_phi_found) {
ir_fprintf(stderr, "Verify Warning: Phi node %+F scheduled after non-Phi nodes in block %+F (%s)\n",
non_phi_found = 1;
}
- // Check for control flow changing nodes
+ /* Check for control flow changing nodes */
if (is_cfop(node) && get_irn_opcode(node) != iro_Start) {
/* check, that only one CF operation is scheduled */
if (cfchange_found == 1) {
}
cfchange_found = 1;
} else if (cfchange_found) {
- // proj and keepany aren't real instructions...
+ /* proj and keepany aren't real instructions... */
if(!is_Proj(node) && !be_is_Keep(node)) {
/* check for delay branches */
if (delay_branches == 0) {
}
}
- // Check that all uses come before their definitions
+ /* Check that all uses come before their definitions */
if(!is_Phi(node)) {
int nodetime = sched_get_time_step(node);
for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
}
}
- // Check that no dead nodes are scheduled
+ /* Check that no dead nodes are scheduled */
if(get_irn_n_edges(node) == 0) {
ir_fprintf(stderr, "Verify warning: Node %+F is dead but scheduled in block %+F (%s)\n",
node, block, get_irg_dump_name(env->irg));
env->problem_found = 1;
}
- // check that all projs/keeps are behind their nodes
- if(is_Proj(node)) {
- ir_node *prev = sched_prev(node);
- while(is_Proj(prev))
- prev = sched_prev(prev);
- if(get_Proj_pred(node) != prev) {
- ir_fprintf(stderr, "Proj %+F not scheduled after its pred node in block %+F (%s)\n",
- node, block, get_irg_dump_name(env->irg));
- env->problem_found = 1;
- }
- }
if(be_is_Keep(node)) {
- int arity = get_irn_arity(node);
- int problem = 0;
+ /* at least 1 of the keep arguments has to be it schedule
+ * predecessor */
+ int arity = get_irn_arity(node);
+ int problem = 1;
+ ir_node *prev = sched_prev(node);
for(i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
- ir_node *succ = sched_next(in);
- while(succ != node && !sched_is_end(succ)) {
- /* the node in between has to be another input of the
- * keep or a Proj */
- int i2;
- int found = 0;
-
- if(is_Proj(succ)) {
- succ = sched_next(succ);
- continue;
- }
-
- for(i2 = 0; i2 < arity; ++i2) {
- ir_node *in2 = get_irn_n(node, i2);
- if(in2 == succ) {
- found = 1;
- break;
- }
- }
- if(!found)
- problem = 1;
-
- succ = sched_next(succ);
- }
+ in = skip_Proj(in);
+ if(in == prev)
+ problem = 0;
}
if(problem) {
- ir_fprintf(stderr, "Keep %+F not scheduled after its pred node in block %+F (%s)\n",
+ ir_fprintf(stderr, "%+F not scheduled after its pred node in block %+F (%s)\n",
node, block, get_irg_dump_name(env->irg));
env->problem_found = 1;
}
if(is_Phi(node) || is_Sync(node) || is_Pin(node))
return 0;
}
+#ifdef SCHEDULE_PROJS
if(is_Proj(node)) {
if(get_irn_mode(node) == mode_X)
return 0;
return should_be_scheduled(env, get_Proj_pred(node));
}
+#else
+ if(is_Proj(node))
+ return 0;
+#endif
if(be_is_Keep(node) && get_irn_opcode(get_nodes_block(node)) == iro_Bad)
return 0;
env.arch_env = birg->main_env->arch_env;
irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
- // check if all nodes are scheduled
+ /* check if all nodes are scheduled */
irg_walk_graph(env.irg, check_schedule, NULL, &env);
return ! env.problem_found;
-//---------------------------------------------------------------------------
+/*--------------------------------------------------------------------------- */
static int cmp_spill(const void* d1, const void* d2, size_t size) {
const spill_t* s1 = d1;
const spill_t* s2 = d2;
+ (void) size;
+
return s1->spill != s2->spill;
}
spill.ent = ent;
res = set_insert(env->spills, &spill, sizeof(spill), hash);
- // is 1 of the arguments a spill?
+ /* is 1 of the arguments a spill? */
for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node* arg = get_irn_n(node, i);
collect(env, arg, reload, ent);
} else if(is_Phi(node) && get_irn_mode(node) == mode_M) {
collect_memphi(env, node, reload, ent);
} else {
- // Disabled for now, spills might get transformed by the backend
+ /* Disabled for now, spills might get transformed by the backend */
#if 0
ir_fprintf(stderr, "Verify warning: No spill, memperm or memphi attached to node %+F found from node %+F in block %+F(%s)\n",
node, reload, get_nodes_block(node), get_irg_dump_name(env->irg));
be_verify_spillslots_env_t *env = data;
const arch_env_t *arch_env = env->arch_env;
- // @@@ ia32_classify returns classification of Proj_pred :-/
+ /* @@@ ia32_classify returns classification of Proj_pred :-/ */
if(is_Proj(node))
return;
-//---------------------------------------------------------------------------
+/*--------------------------------------------------------------------------- */
if(get_irn_opcode(user) == iro_End)
continue;
- // in case of phi arguments we compare with the block the value comes from
+ /* in case of phi arguments we compare with the block the value comes from */
if(is_Phi(user)) {
ir_node *phiblock = get_nodes_block(user);
if(phiblock == bb)
-//---------------------------------------------------------------------------
+/*--------------------------------------------------------------------------- */
int problem_found;
} be_verify_register_allocation_env_t;
-static void check_register_constraints(ir_node *node, be_verify_register_allocation_env_t *env) {
+static void check_register_constraints(ir_node *node,
+ be_verify_register_allocation_env_t *env)
+{
const arch_env_t *arch_env = env->arch_env;
const arch_register_t *reg;
int i, arity;
reg = arch_get_irn_register(arch_env, pred);
if (reg == NULL) {
- ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned\n",
- pred, get_nodes_block(pred), get_irg_dump_name(env->irg));
+ ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned (%+F input constraint)\n",
+ pred, get_nodes_block(pred), get_irg_dump_name(env->irg), node);
env->problem_found = 1;
continue;
}
}
static void check_register_allocation(be_verify_register_allocation_env_t *env,
- const arch_register_class_t *regclass, pset *nodes) {
+ const arch_register_class_t *regclass,
+ ir_nodeset_t *nodes)
+{
const arch_env_t *arch_env = env->arch_env;
const arch_register_t *reg = NULL;
int fail = 0;
bitset_t *registers = bitset_alloca(arch_register_class_n_regs(regclass));
ir_node *node;
+ ir_nodeset_iterator_t iter;
- foreach_pset(nodes, node) {
+ foreach_ir_nodeset(nodes, node, iter) {
if (arch_get_irn_reg_class(arch_env, node, -1) != regclass)
continue;
continue;
if (bitset_is_set(registers, reg->index)) {
- pset_break(nodes);
fail = 1;
break;
}
reg->name, get_nodes_block(node), get_irg_dump_name(env->irg));
env->problem_found = 1;
- foreach_pset(nodes, node) {
+ foreach_ir_nodeset(nodes, node, iter) {
if (arch_get_irn_register(arch_env, node) == reg) {
ir_fprintf(stderr, " at node %+F\n", node);
}
for (i = 0; i < nregclasses; ++i) {
const arch_register_class_t *regclass = arch_isa_get_reg_class(isa, i);
ir_node *node;
- pset *live_nodes = pset_new_ptr_default();
+ ir_nodeset_t live_nodes;
- be_liveness_end_of_block(env->lv, env->arch_env, regclass, block, live_nodes);
- check_register_allocation(env, regclass, live_nodes);
+ ir_nodeset_init(&live_nodes);
+
+ be_liveness_end_of_block(env->lv, env->arch_env, regclass, block,
+ &live_nodes);
+ check_register_allocation(env, regclass, &live_nodes);
sched_foreach_reverse(block, node) {
if (is_Phi(node))
break;
- be_liveness_transfer(env->arch_env, regclass, node, live_nodes);
- check_register_allocation(env, regclass, live_nodes);
+ be_liveness_transfer(env->arch_env, regclass, node, &live_nodes);
+ check_register_allocation(env, regclass, &live_nodes);
check_register_constraints(node, env);
}
- del_pset(live_nodes);
+ ir_nodeset_destroy(&live_nodes);
}
}
-int be_verify_register_allocation(const arch_env_t *arch_env, ir_graph *irg) {
+int be_verify_register_allocation(const be_irg_t *birg) {
be_verify_register_allocation_env_t env;
- env.arch_env = arch_env;
- env.irg = irg;
- env.lv = be_liveness(irg);
+ env.arch_env = be_get_birg_arch_env(birg);
+ env.irg = be_get_birg_irg(birg);
+ env.lv = be_liveness(birg);
env.problem_found = 0;
- irg_block_walk_graph(irg, verify_block_register_allocation, NULL, &env);
+ be_liveness_assure_sets(env.lv);
+ irg_block_walk_graph(env.irg, verify_block_register_allocation, NULL, &env);
be_liveness_free(env.lv);
-//---------------------------------------------------------------------------
+/*--------------------------------------------------------------------------- */
return;
mark_irn_visited(node);
+ /* we find too many (uncritical) dead nodes in block out edges */
+ if(is_Block(node))
+ return;
+
foreach_out_edge(node, edge) {
ir_node* src = get_edge_src_irn(edge);
- if(!bitset_is_set(env->reachable, get_irn_idx(src)) && !is_Block(node)) {
+ if(!bitset_is_set(env->reachable, get_irn_idx(src)) && !is_Block(src)) {
ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) only reachable through out edges from %+F\n",
src, get_nodes_block(src), get_irg_dump_name(irg), node);
env->problem_found = 1;
projects / libfirm / blobdiff