#include "benode.h"
#include "beirg.h"
#include "beintlive_t.h"
+#include "belistsched.h"
static int my_values_interfere(const ir_node *a, const ir_node *b);
env.lv = be_liveness(irg);
env.irg = irg;
env.cls = cls;
- env.registers_available
- = env.cls->n_regs - be_put_ignore_regs(irg, env.cls, NULL);
+ env.registers_available = be_get_n_allocatable_regs(irg, cls);
env.problem_found = 0;
be_liveness_assure_sets(env.lv);
{
be_verify_schedule_env_t *env = (be_verify_schedule_env_t*) data;
ir_node *node;
- ir_node *non_phi_found = NULL;
- int cfchange_found = 0;
- /* TODO ask arch about delay branches */
- int delay_branches = 0;
+ ir_node *non_phi_found = NULL;
+ ir_node *cfchange_found = NULL;
int last_timestep = INT_MIN;
/*
* Tests for the following things:
- * 1. Make sure that all phi nodes are scheduled at the beginning of the block
- * 2. There is 1 or no control flow changing node scheduled and exactly delay_branches operations after it.
- * 3. No value is defined after it has been used
- * 4. mode_T nodes have all projs scheduled behind them followed by Keeps
+ * 1. Make sure that all phi nodes are scheduled at the beginning of the
+ * block
+ * 2. No value is defined after it has been used
+ * 3. mode_T nodes have all projs scheduled behind them followed by Keeps
* (except mode_X projs)
*/
sched_foreach(block, node) {
- int i, arity;
int timestep;
/* this node is scheduled */
}
/* Check for control flow changing nodes */
- if (is_cfop(node) && get_irn_opcode(node) != iro_Start) {
+ if (is_cfop(node)) {
/* check, that only one CF operation is scheduled */
- if (cfchange_found == 1) {
- ir_fprintf(stderr, "Verify Warning: More than 1 control flow changing node (%+F) scheduled in block %+F (%s)\n",
- node, block, get_irg_dump_name(env->irg));
+ if (cfchange_found != NULL) {
+ ir_fprintf(stderr, "Verify Warning: Additional control flow changing node %+F scheduled after %+F in block %+F (%s)\n",
+ node, block, cfchange_found, get_irg_dump_name(env->irg));
env->problem_found = 1;
+ } else {
+ cfchange_found = node;
}
- cfchange_found = 1;
- } else if (cfchange_found) {
+ } else if (cfchange_found != NULL) {
/* proj and keepany aren't real instructions... */
if (!is_Proj(node) && !be_is_Keep(node)) {
- /* check for delay branches */
- if (delay_branches == 0) {
- ir_fprintf(stderr, "Verify Warning: Node %+F scheduled after control flow changing node (+delay branches) in block %+F (%s)\n",
- node, block, get_irg_dump_name(env->irg));
- env->problem_found = 1;
- } else {
- delay_branches--;
- }
+ ir_fprintf(stderr, "Verify Warning: Node %+F scheduled after control flow changing node in block %+F (%s)\n",
+ node, block, get_irg_dump_name(env->irg));
+ env->problem_found = 1;
}
}
/* Check that all uses come before their definitions */
if (!is_Phi(node)) {
- int nodetime = sched_get_time_step(node);
+ int i;
+ int arity;
+ sched_timestep_t nodetime = sched_get_time_step(node);
for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node *arg = get_irn_n(node, i);
if (get_nodes_block(arg) != block
}
if (be_is_Keep(node) || be_is_CopyKeep(node)) {
- /* at least 1 of the keep arguments has to be it schedule
+ /* at least 1 of the keep arguments has to be its schedule
* predecessor */
int arity = get_irn_arity(node);
- int problem = 1;
+ bool found = false;
ir_node *prev = sched_prev(node);
while (be_is_Keep(prev) || be_is_CopyKeep(prev))
prev = sched_prev(prev);
- for (i = 0; i < arity; ++i) {
- ir_node *in = get_irn_n(node, i);
- in = skip_Proj(in);
- if (in == prev)
- problem = 0;
+ while (true) {
+ int i;
+ for (i = 0; i < arity; ++i) {
+ ir_node *in = get_irn_n(node, i);
+ in = skip_Proj(in);
+ if (in == prev)
+ found = true;
+ }
+ if (found)
+ break;
+ prev = sched_prev(prev);
+ if (!is_Phi(prev))
+ break;
}
- if (problem) {
+ if (!found) {
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;
}
}
}
-
- /* check that all delay branches are filled (at least with NOPs) */
- if (cfchange_found && delay_branches != 0) {
- ir_fprintf(stderr, "Verify warning: Not all delay slots filled after jump (%d/%d) in block %+F (%s)\n",
- block, get_irg_dump_name(env->irg));
- env->problem_found = 1;
- }
}
static void check_schedule(ir_node *node, void *data)
{
- be_verify_schedule_env_t *env = data;
- bool should_be = to_appear_in_schedule(node);
+ be_verify_schedule_env_t *env = (be_verify_schedule_env_t*)data;
+ bool should_be = !is_Proj(node) && !(arch_get_irn_flags(node) & arch_irn_flags_not_scheduled);
bool scheduled = bitset_is_set(env->scheduled, get_irn_idx(node));
if (should_be != scheduled) {
static int cmp_spill(const void* d1, const void* d2, size_t size)
{
- const spill_t* s1 = d1;
- const spill_t* s2 = d2;
+ const spill_t* s1 = (const spill_t*)d1;
+ const spill_t* s2 = (const spill_t*)d2;
(void) size;
return s1->spill != s2->spill;
spill_t spill;
spill.spill = node;
- return set_find(env->spills, &spill, sizeof(spill), HASH_PTR(node));
+ return (spill_t*)set_find(env->spills, &spill, sizeof(spill), HASH_PTR(node));
}
static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_entity *ent)
int hash = HASH_PTR(node);
spill.spill = node;
- res = set_find(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_find(env->spills, &spill, sizeof(spill), hash);
if (res == NULL) {
spill.ent = ent;
- res = set_insert(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_insert(env->spills, &spill, sizeof(spill), hash);
}
return res;
}
spill.spill = node;
- res = set_find(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_find(env->spills, &spill, sizeof(spill), hash);
if (res != NULL) {
return;
}
spill.ent = spillent;
- res = set_insert(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_insert(env->spills, &spill, sizeof(spill), hash);
for (i = 0, arity = be_get_MemPerm_entity_arity(memperm); i < arity; ++i) {
ir_node* arg = get_irn_n(memperm, i + 1);
assert(is_Phi(node));
spill.spill = node;
- res = set_find(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_find(env->spills, &spill, sizeof(spill), hash);
if (res != NULL) {
return;
}
spill.ent = ent;
- res = set_insert(env->spills, &spill, sizeof(spill), hash);
+ res = (spill_t*)set_insert(env->spills, &spill, sizeof(spill), hash);
/* is 1 of the arguments a spill? */
for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
*/
static void collect_spills_walker(ir_node *node, void *data)
{
- be_verify_spillslots_env_t *env = data;
+ be_verify_spillslots_env_t *env = (be_verify_spillslots_env_t*)data;
if (arch_irn_classify(node) & arch_irn_class_reload) {
ir_node *spill = get_memory_edge(node);
spill_t *spill;
int i;
- for (spill = set_first(env->spills), i = 0; spill != NULL; spill = set_next(env->spills), ++i) {
- spills[i] = spill;
+ i = 0;
+ foreach_set(env->spills, spill_t*, spill) {
+ spills[i++] = spill;
}
for (i = 0; i < spillcount; ++i) {
static void check_lonely_spills(ir_node *node, void *data)
{
- be_verify_spillslots_env_t *env = data;
+ be_verify_spillslots_env_t *env = (be_verify_spillslots_env_t*)data;
if (be_is_Spill(node) || (is_Proj(node) && be_is_MemPerm(get_Proj_pred(node)))) {
spill_t *spill = find_spill(env, node);
static void check_output_constraints(ir_node *node)
{
/* verify output register */
- if (arch_get_irn_reg_class_out(node) == regclass) {
+ if (arch_get_irn_reg_class(node) == regclass) {
+ const arch_register_req_t *req = arch_get_irn_register_req(node);
const arch_register_t *reg = arch_get_irn_register(node);
if (reg == NULL) {
ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned\n",
node, get_nodes_block(node), get_irg_dump_name(irg));
problem_found = 1;
- } else if (!arch_register_type_is(reg, joker) && !arch_reg_out_is_allocatable(node, reg)) {
+ } else if (!arch_reg_is_allocatable(req, reg)) {
ir_fprintf(stderr, "Verify warning: Register %s assigned as output of %+F not allowed (register constraint) in block %+F(%s)\n",
reg->name, node, get_nodes_block(node), get_irg_dump_name(irg));
problem_found = 1;
/* verify input register */
arity = get_irn_arity(node);
for (i = 0; i < arity; ++i) {
- const arch_register_req_t *req = arch_get_in_register_req(node, i);
+ const arch_register_req_t *req = arch_get_irn_register_req_in(node, i);
ir_node *pred = get_irn_n(node, i);
- const arch_register_req_t *pred_req = arch_get_register_req_out(pred);
+ const arch_register_req_t *pred_req = arch_get_irn_register_req(pred);
if (is_Bad(pred)) {
ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) has Bad as input %d\n",
pred, get_nodes_block(pred), get_irg_dump_name(irg), node);
problem_found = 1;
continue;
- } else if (!arch_register_type_is(reg, joker) && ! arch_reg_is_allocatable(node, i, reg)) {
+ } else if (!arch_reg_is_allocatable(req, reg)) {
ir_fprintf(stderr, "Verify warning: Register %s as input %d of %+F not allowed (register constraint) in block %+F(%s)\n",
reg->name, i, node, get_nodes_block(node), get_irg_dump_name(irg));
problem_found = 1;
/* phis should be NOPs at this point, which means all input regs
* must be the same as the output reg */
if (is_Phi(node)) {
- int i, arity;
-
reg = arch_get_irn_register(node);
arity = get_irn_arity(node);
ir_node *pred = get_Phi_pred(node, i);
const arch_register_t *pred_reg = arch_get_irn_register(pred);
- if (reg != pred_reg && !arch_register_type_is(pred_reg, joker)) {
+ if (reg != pred_reg && !(pred_reg->type & arch_register_type_joker)) {
const char *pred_name = pred_reg != NULL ? pred_reg->name : "(null)";
const char *reg_name = reg != NULL ? reg->name : "(null)";
ir_fprintf(stderr, "Verify warning: Input %d of %+F in block %+F(%s) uses register %s instead of %s\n",
const arch_register_t *reg;
ir_node *reg_node;
- if (arch_get_irn_reg_class_out(node) != regclass)
+ if (arch_get_irn_reg_class(node) != regclass)
return;
reg = arch_get_irn_register(node);
const arch_register_t *reg;
ir_node *reg_node;
- if (arch_get_irn_reg_class_out(node) != regclass)
+ if (arch_get_irn_reg_class(node) != regclass)
return;
reg = arch_get_irn_register(node);
reg_node = registers[reg->index];
+ /* a little cheat, since its so hard to remove all outedges to dead code
+ * in the backend. This particular case should never be a problem. */
+ if (reg_node == NULL && get_irn_n_edges(node) == 0)
+ return;
+
if (reg_node != node) {
ir_fprintf(stderr, "Verify warning: Node %+F not registered as value for Register %s (but %+F) in block %+F(%s)\n",
node, reg->name, reg_node, get_nodes_block(node), get_irg_dump_name(irg));
int i, nregclasses;
(void) data;
- nregclasses = arch_env_get_n_reg_class(arch_env);
+ nregclasses = arch_env->n_register_classes;
for (i = 0; i < nregclasses; ++i) {
ir_node *node;
int idx, i2, n_regs;
- regclass = arch_env_get_reg_class(arch_env, i);
+ regclass = &arch_env->register_classes[i];
assert(lv->nodes && "live sets must be computed");
registers = ALLOCANZ(ir_node*, n_regs);
be_lv_foreach(lv, block, be_lv_state_end, idx) {
- ir_node *node = be_lv_get_irn(lv, block, idx);
- value_used(block, node);
+ ir_node *lv_node = be_lv_get_irn(lv, block, idx);
+ value_used(block, lv_node);
}
sched_foreach_reverse(block, node) {
}
be_lv_foreach(lv, block, be_lv_state_in, idx) {
- ir_node *node = be_lv_get_irn(lv, block, idx);
- value_def(node);
+ ir_node *lv_node = be_lv_get_irn(lv, block, idx);
+ value_def(lv_node);
}
/* set must be empty now */
projects / libfirm / blobdiff