X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbeverify.c;h=8a68f634b5f39c30cf98fde8454264a5d969227d;hb=b59e22a229aa1227ef992c184c79fdafe34908cf;hp=a46446bfe9f42a005b2d435b55380dee72db977b;hpb=df6d48d602bf85c72ad8e4cf84c08f44c448d743;p=libfirm

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index a46446bfe..8a68f634b 100644
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -51,10 +51,10 @@ static bool my_values_interfere(const ir_node *a, const ir_node *b);
 
 typedef struct be_verify_register_pressure_env_t_ {
 	ir_graph                    *irg;                 /**< the irg to verify */
-	 be_lv_t                    *lv;                  /**< Liveness information. */
+	be_lv_t                     *lv;                  /**< Liveness information. */
 	const arch_register_class_t *cls;                 /**< the register class to check for */
-	int                         registers_available;  /**< number of available registers */
-	int                         problem_found;        /**< flag indicating if a problem was found */
+	unsigned                    registers_available;  /**< number of available registers */
+	bool                        problem_found;        /**< flag indicating if a problem was found */
 } be_verify_register_pressure_env_t;
 
 /**
@@ -82,21 +82,18 @@ static void verify_liveness_walker(ir_node *block, void *data)
 {
 	be_verify_register_pressure_env_t *env = (be_verify_register_pressure_env_t *)data;
 	ir_nodeset_t live_nodes;
-	int pressure;
 
 	/* collect register pressure info, start with end of a block */
-	// ir_fprintf(stderr, "liveness check %+F\n", block);
 	ir_nodeset_init(&live_nodes);
 	be_liveness_end_of_block(env->lv, env->cls, block,
 	                         &live_nodes);
 
-	// print_living_values(stderr, &live_nodes);
-	pressure = ir_nodeset_size(&live_nodes);
+	unsigned 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_name(env->irg), pressure, env->registers_available);
 		print_living_values(stderr, &live_nodes);
-		env->problem_found = 1;
+		env->problem_found = true;
 	}
 
 	sched_foreach_reverse(block, irn) {
@@ -112,17 +109,14 @@ static void verify_liveness_walker(ir_node *block, void *data)
 			ir_fprintf(stderr, "Verify Warning: Register pressure too high before node %+F in %+F(%s) (%d/%d):\n",
 				irn, block, get_irg_name(env->irg), pressure, env->registers_available);
 			print_living_values(stderr, &live_nodes);
-			env->problem_found = 1;
+			env->problem_found = true;
 			assert(0);
 		}
 	}
 	ir_nodeset_destroy(&live_nodes);
 }
 
-/**
- * Start a walk over the irg and check the register pressure.
- */
-int be_verify_register_pressure(ir_graph *irg, const arch_register_class_t *cls)
+bool be_verify_register_pressure(ir_graph *irg, const arch_register_class_t *cls)
 {
 	be_verify_register_pressure_env_t env;
 
@@ -130,7 +124,7 @@ int be_verify_register_pressure(ir_graph *irg, const arch_register_class_t *cls)
 	env.irg                 = irg;
 	env.cls                 = cls;
 	env.registers_available = be_get_n_allocatable_regs(irg, cls);
-	env.problem_found       = 0;
+	env.problem_found       = false;
 
 	be_liveness_compute_sets(env.lv);
 	irg_block_walk_graph(irg, verify_liveness_walker, NULL, &env);
@@ -142,14 +136,11 @@ int be_verify_register_pressure(ir_graph *irg, const arch_register_class_t *cls)
 /*--------------------------------------------------------------------------- */
 
 typedef struct be_verify_schedule_env_t_ {
-	int       problem_found; /**< flags indicating a problem */
+	bool      problem_found; /**< flags indicating a problem */
 	bitset_t *scheduled;     /**< bitset of scheduled nodes */
 	ir_graph *irg;           /**< the irg to check */
 } be_verify_schedule_env_t;
 
-/**
- * Simple schedule checker.
- */
 static void verify_schedule_walker(ir_node *block, void *data)
 {
 	be_verify_schedule_env_t *env = (be_verify_schedule_env_t*) data;
@@ -169,14 +160,14 @@ static void verify_schedule_walker(ir_node *block, void *data)
 		/* 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;
+			env->problem_found = true;
 		}
 		bitset_set(env->scheduled, get_irn_idx(node));
 
 		/* 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;
+			env->problem_found = true;
 		}
 
 		/* Check that timesteps are increasing */
@@ -184,16 +175,21 @@ static void verify_schedule_walker(ir_node *block, void *data)
 		if (timestep <= last_timestep) {
 			ir_fprintf(stderr, "Verify warning: Schedule timestep did not increase at node %+F\n",
 			           node);
-			env->problem_found = 1;
+			env->problem_found = true;
 		}
 		last_timestep = timestep;
 
+		if (arch_get_irn_flags(node) & arch_irn_flags_not_scheduled) {
+			ir_fprintf(stderr, "Verify warning: flags_not_scheduled node %+F scheduled anyway\n", node);
+			env->problem_found = true;
+		}
+
 		/* Check that phis come before any other node */
 		if (is_Phi(node)) {
 			if (non_phi_found != NULL) {
 				ir_fprintf(stderr, "Verify Warning: Phi node %+F scheduled after non-Phi nodes (for example %+F) in block %+F (%s)\n",
 					node, non_phi_found, block, get_irg_name(env->irg));
-				env->problem_found = 1;
+				env->problem_found = true;
 			}
 		} else {
 			non_phi_found = node;
@@ -205,16 +201,16 @@ static void verify_schedule_walker(ir_node *block, void *data)
 			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_name(env->irg));
-				env->problem_found = 1;
+				env->problem_found = true;
 			} else {
 				cfchange_found = node;
 			}
 		} else if (cfchange_found != NULL) {
-			/* proj and keepany aren't real instructions... */
-			if (!is_Proj(node) && !be_is_Keep(node)) {
+			/* keepany isn't a real instruction. */
+			if (!be_is_Keep(node)) {
 				ir_fprintf(stderr, "Verify Warning: Node %+F scheduled after control flow changing node in block %+F (%s)\n",
 				           node, block, get_irg_name(env->irg));
-				env->problem_found = 1;
+				env->problem_found = true;
 			}
 		}
 
@@ -230,7 +226,7 @@ static void verify_schedule_walker(ir_node *block, void *data)
 				if (sched_get_time_step(arg) >= nodetime) {
 					ir_fprintf(stderr, "Verify Warning: Value %+F used by %+F before it was defined in block %+F (%s)\n",
 					           arg, node, block, get_irg_name(env->irg));
-					env->problem_found = 1;
+					env->problem_found = true;
 				}
 			}
 		}
@@ -239,7 +235,7 @@ static void verify_schedule_walker(ir_node *block, void *data)
 		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_name(env->irg));
-			env->problem_found = 1;
+			env->problem_found = true;
 		}
 
 		if (be_is_Keep(node) || be_is_CopyKeep(node)) {
@@ -267,7 +263,7 @@ static void verify_schedule_walker(ir_node *block, void *data)
 			if (!found) {
 				ir_fprintf(stderr, "%+F not scheduled after its pred node in block %+F (%s)\n",
 				           node, block, get_irg_name(env->irg));
-				env->problem_found = 1;
+				env->problem_found = true;
 			}
 		}
 	}
@@ -282,18 +278,15 @@ static void check_schedule(ir_node *node, void *data)
 	if (should_be != scheduled) {
 		ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should%s be scheduled\n",
 			node, get_nodes_block(node), get_irg_name(env->irg), should_be ? "" : " not");
-		env->problem_found = 1;
+		env->problem_found = true;
 	}
 }
 
-/**
- * Start a walk over the irg and check schedule.
- */
-int be_verify_schedule(ir_graph *irg)
+bool be_verify_schedule(ir_graph *irg)
 {
 	be_verify_schedule_env_t env;
 
-	env.problem_found = 0;
+	env.problem_found = false;
 	env.irg           = irg;
 	env.scheduled     = bitset_alloca(get_irg_last_idx(env.irg));
 
@@ -315,7 +308,7 @@ typedef struct {
 	ir_graph  *irg;
 	set       *spills;
 	ir_node  **reloads;
-	int        problem_found;
+	bool       problem_found;
 } be_verify_spillslots_env_t;
 
 static int cmp_spill(const void* d1, const void* d2, size_t size)
@@ -382,14 +375,12 @@ static void collect_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_nod
 	if (spillent != ent) {
 		ir_fprintf(stderr, "Verify warning: Spill %+F has different entity than reload %+F in block %+F(%s)\n",
 			node, reload, get_nodes_block(node), get_irg_name(env->irg));
-		env->problem_found = 1;
+		env->problem_found = true;
 	}
 }
 
 static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent)
 {
-	assert(is_Proj(node));
-
 	ir_node *memperm = get_Proj_pred(node);
 	int      out     = get_Proj_proj(node);
 
@@ -398,7 +389,7 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
 	if (spillent != ent) {
 		ir_fprintf(stderr, "Verify warning: MemPerm %+F has different entity than reload %+F in block %+F(%s)\n",
 			node, reload, get_nodes_block(node), get_irg_name(env->irg));
-		env->problem_found = 1;
+		env->problem_found = true;
 	}
 
 	int hash = hash_ptr(node);
@@ -452,13 +443,6 @@ static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *rel
 		collect_memperm(env, node, 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 */
-#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_name(env->irg));
-		env->problem_found = 1;
-#endif
 	}
 }
 
@@ -475,7 +459,7 @@ static void collect_spills_walker(ir_node *node, void *data)
 		if (spill == NULL) {
 			ir_fprintf(stderr, "Verify warning: No spill attached to reload %+F in block %+F(%s)\n",
 			           node, get_nodes_block(node), get_irg_name(env->irg));
-			env->problem_found = 1;
+			env->problem_found = true;
 			return;
 		}
 		ir_entity *ent = arch_get_frame_entity(node);
@@ -510,7 +494,7 @@ static void check_spillslot_interference(be_verify_spillslots_env_t *env)
 				ir_fprintf(stderr, "Verify warning: Spillslots for %+F in block %+F(%s) and %+F in block %+F(%s) interfere\n",
 					sp1->spill, get_nodes_block(sp1->spill), get_irg_name(env->irg),
 					sp2->spill, get_nodes_block(sp2->spill), get_irg_name(env->irg));
-				env->problem_found = 1;
+				env->problem_found = true;
 				my_values_interfere(sp1->spill, sp2->spill);
 			}
 		}
@@ -535,14 +519,14 @@ static void check_lonely_spills(ir_node *node, void *data)
 	}
 }
 
-int be_verify_spillslots(ir_graph *irg)
+bool be_verify_spillslots(ir_graph *irg)
 {
 	be_verify_spillslots_env_t env;
 
-	env.irg = irg;
-	env.spills = new_set(cmp_spill, 10);
-	env.reloads = NEW_ARR_F(ir_node*, 0);
-	env.problem_found = 0;
+	env.irg           = irg;
+	env.spills        = new_set(cmp_spill, 10);
+	env.reloads       = NEW_ARR_F(ir_node*, 0);
+	env.problem_found = false;
 
 	irg_walk_graph(irg, collect_spills_walker, NULL, &env);
 	irg_walk_graph(irg, check_lonely_spills, NULL, &env);
@@ -692,13 +676,13 @@ static void check_input_constraints(ir_node *node)
 			ir_node               *pred     = get_Phi_pred(node, i);
 			const arch_register_t *pred_reg = arch_get_irn_register(pred);
 
-			if (reg != pred_reg && !(pred_reg->type & arch_register_type_joker)) {
+			if (reg != pred_reg && !(pred_reg->type & arch_register_type_virtual)) {
 				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",
 				           i, node, get_nodes_block(node),
 				           get_irg_name(irg), pred_name, reg_name);
-				problem_found = 1;
+				problem_found = true;
 			}
 		}
 	}
@@ -716,9 +700,8 @@ static void value_used(const ir_node *block, const ir_node *node)
 	for (unsigned i = 0; i < req->width; ++i) {
 		const ir_node *reg_node = registers[idx+i];
 		if (reg_node != NULL && reg_node != node) {
-			const arch_register_t *realreg = &arch_env->registers[idx+i];
 			ir_fprintf(stderr, "Verify warning: Register %s assigned more than once in block %+F(%s) (nodes %+F %+F)\n",
-					   realreg->name, block, get_irg_name(irg),
+					   reg->name, block, get_irg_name(irg),
 					   node, reg_node);
 			problem_found = true;
 		}
@@ -745,9 +728,8 @@ static void value_def(const ir_node *node)
 			return;
 
 		if (reg_node != node) {
-			const arch_register_t *realreg = &arch_env->registers[idx+i];
 			ir_fprintf(stderr, "Verify warning: Node %+F not registered as value for Register %s (but %+F) in block %+F(%s)\n",
-			           node, realreg->name, reg_node, get_nodes_block(node),
+			           node, reg->name, reg_node, get_nodes_block(node),
 			           get_irg_name(irg));
 			problem_found = true;
 		}
@@ -769,17 +751,10 @@ static void verify_block_register_allocation(ir_node *block, void *data)
 	}
 
 	sched_foreach_reverse(block, node) {
-
-		if (get_irn_mode(node) == mode_T) {
-			foreach_out_edge(node, edge) {
-				ir_node *def = get_edge_src_irn(edge);
-				value_def(def);
-				check_output_constraints(def);
-			}
-		} else {
-			value_def(node);
-			check_output_constraints(node);
-		}
+		be_foreach_value(node, value,
+			value_def(value);
+			check_output_constraints(value);
+		);
 
 		check_input_constraints(node);
 
@@ -848,7 +823,6 @@ static const char *lv_flags_to_str(unsigned flags)
 static void lv_check_walker(ir_node *bl, void *data)
 {
 	lv_walker_t *w     = (lv_walker_t*)data;
-	be_lv_t     *lv    = w->lv;
 	be_lv_t     *fresh = (be_lv_t*)w->data;
 
 	be_lv_info_t *curr = ir_nodehashmap_get(be_lv_info_t, &fresh->map, bl);
@@ -857,11 +831,9 @@ static void lv_check_walker(ir_node *bl, void *data)
 	if (!fr && curr && curr[0].head.n_members > 0) {
 		ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl);
 		for (unsigned i = 0; i < curr[0].head.n_members; ++i) {
-			ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].node.idx));
+			ir_fprintf(stderr, "\t%+F\n", curr[1 + i].node.node);
 		}
-	}
-
-	else if (curr) {
+	} else if (curr) {
 		unsigned n_curr  = curr[0].head.n_members;
 		unsigned n_fresh = fr[0].head.n_members;
 
@@ -871,13 +843,13 @@ static void lv_check_walker(ir_node *bl, void *data)
 			ir_fprintf(stderr, "current:\n");
 			for (unsigned i = 0; i < n_curr; ++i) {
 				be_lv_info_node_t *n = &curr[1 + i].node;
-				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
+				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, n->node, lv_flags_to_str(n->flags));
 			}
 
 			ir_fprintf(stderr, "correct:\n");
 			for (unsigned i = 0; i < n_fresh; ++i) {
 				be_lv_info_node_t *n = &fr[1 + i].node;
-				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
+				ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, n->node, lv_flags_to_str(n->flags));
 			}
 		}
 	}