X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeverify.c;h=f59ebb1b54242b16c9d97adf46ed164dbd4062e2;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=63bd7e7979c2b1400b6a305f6cd9d37b3712b2d1;hpb=2cbdc12a046c8a2d7f92634f259c29b2225586f9;p=libfirm

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 63bd7e797..f59ebb1b5 100644
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -9,9 +9,9 @@
 #include "config.h"
 #endif
 
-#include "beverify.h"
-#include "belive.h"
-#include "besched_t.h"
+#include "bitset.h"
+#include "set.h"
+#include "array.h"
 
 #include "irnode.h"
 #include "irgraph.h"
@@ -19,8 +19,10 @@
 #include "irprintf.h"
 #include "irdump_t.h"
 #include "iredges.h"
-#include "set.h"
-#include "array.h"
+
+#include "beverify.h"
+#include "belive.h"
+#include "besched_t.h"
 #include "benode_t.h"
 
 static int my_values_interfere(const ir_node *a, const ir_node *b);
@@ -37,8 +39,7 @@ typedef struct be_verify_register_pressure_env_t_ {
 /**
  * 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, pset *live_nodes) {
 	ir_node *node;
 
 	ir_fprintf(F, "\t");
@@ -51,8 +52,7 @@ static void print_living_values(FILE *F, pset *live_nodes)
 /**
  * Check if number of live nodes never exceeds the number of available registers.
  */
-static void verify_liveness_walker(ir_node *block, void *data)
-{
+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_node *irn;
@@ -90,8 +90,7 @@ static void verify_liveness_walker(ir_node *block, void *data)
 /**
  * Start a walk over the irg and check the register pressure.
  */
-int be_verify_register_pressure(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_graph *irg)
-{
+int be_verify_register_pressure(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_graph *irg) {
 	be_verify_register_pressure_env_t env;
 
 	env.lv                  = be_liveness(irg);
@@ -115,8 +114,7 @@ typedef struct be_verify_schedule_env_t_ {
 /**
  * Simple schedule checker.
  */
-static void verify_schedule_walker(ir_node *block, void *data)
-{
+static void verify_schedule_walker(ir_node *block, void *data) {
 	be_verify_schedule_env_t *env = (be_verify_schedule_env_t*) data;
 	ir_node *node;
 	int non_phi_found  = 0;
@@ -261,7 +259,7 @@ typedef struct _spill_t {
 } spill_t;
 
 typedef struct {
-	be_lv_t *lv;
+	const arch_env_t *arch_env;
 	ir_graph *irg;
 	set *spills;
 	ir_node **reloads;
@@ -274,6 +272,13 @@ static int cmp_spill(const void* d1, const void* d2, size_t size) {
 	return s1->spill != s2->spill;
 }
 
+static spill_t *find_spill(be_verify_spillslots_env_t *env, ir_node *node) {
+	spill_t spill;
+
+	spill.spill = node;
+	return set_find(env->spills, &spill, sizeof(spill), HASH_PTR(node));
+}
+
 static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, entity *ent) {
 	spill_t spill, *res;
 	int hash = HASH_PTR(node);
@@ -289,10 +294,34 @@ static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, entity
 	return res;
 }
 
+static ir_node *get_memory_edge(const ir_node *node) {
+	int i, arity;
+	ir_node *result = NULL;
+
+	arity = get_irn_arity(node);
+	for(i = arity - 1; i >= 0; --i) {
+		ir_node *arg = get_irn_n(node, i);
+		if(get_irn_mode(arg) == mode_M) {
+			assert(result == NULL);
+			result = arg;
+		}
+	}
+
+	return result;
+}
+
 static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, entity* ent);
 
+static void check_entity(be_verify_spillslots_env_t *env, ir_node *node, entity *ent) {
+	if(ent == NULL) {
+		ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have an entity assigned\n",
+		           node, get_nodes_block(node), get_irg_dump_name(env->irg));
+	}
+}
+
 static void collect_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, entity* ent) {
-	entity *spillent = be_get_frame_entity(node);
+	entity *spillent = arch_get_frame_entity(env->arch_env, node);
+	check_entity(env, node, spillent);
 	get_spill(env, node, ent);
 
 	if(spillent != ent) {
@@ -316,6 +345,7 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
 	out = get_Proj_proj(node);
 
 	spillent = be_get_MemPerm_out_entity(memperm, out);
+	check_entity(env, memperm, spillent);
 	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_dump_name(env->irg));
@@ -331,8 +361,8 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
 	spill.ent = spillent;
 	res = set_insert(env->spills, &spill, sizeof(spill), hash);
 
-	for(i = 0, arity = get_irn_arity(memperm); i < arity; ++i) {
-		ir_node* arg = get_irn_n(memperm, i);
+	for(i = 0, arity = be_get_MemPerm_entity_arity(memperm); i < arity; ++i) {
+		ir_node* arg = get_irn_n(memperm, i + 1);
 		entity* argent = be_get_MemPerm_in_entity(memperm, i);
 
 		collect(env, arg, memperm, argent);
@@ -382,10 +412,24 @@ static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *rel
  */
 static void collect_spills_walker(ir_node *node, void *data) {
 	be_verify_spillslots_env_t *env = data;
+	const arch_env_t *arch_env = env->arch_env;
 
-	if(be_is_Reload(node)) {
-		ir_node *spill = get_irn_n(node, be_pos_Reload_mem);
-		entity* ent = be_get_frame_entity(node);
+	// @@@ ia32_classify returns classification of Proj_pred :-/
+	if(is_Proj(node))
+		return;
+
+	if(arch_irn_class_is(arch_env, node, reload)) {
+		ir_node *spill = get_memory_edge(node);
+		entity *ent;
+
+		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_dump_name(env->irg));
+			env->problem_found = 1;
+			return;
+		}
+		ent = arch_get_frame_entity(env->arch_env, node);
+		check_entity(env, node, ent);
 
 		collect(env, spill, node, ent);
 		ARR_APP1(ir_node*, env->reloads, node);
@@ -418,27 +462,43 @@ static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
 					sp2->spill, get_nodes_block(sp2->spill), get_irg_dump_name(env->irg));
 				env->problem_found = 1;
 				my_values_interfere(sp1->spill, sp2->spill);
-				printf("Intf: %d\n", values_interfere(env->lv, sp1->spill, sp2->spill));
 			}
 		}
 	}
 }
 
-int be_verify_spillslots(ir_graph *irg)
+static void check_lonely_spills(ir_node *node, void *data) {
+	be_verify_spillslots_env_t *env = data;
+
+	if(be_is_Spill(node) || (is_Proj(node) && be_is_MemPerm(get_Proj_pred(node)))) {
+		spill_t *spill = find_spill(env, node);
+		if(be_is_Spill(node)) {
+			entity *ent = arch_get_frame_entity(env->arch_env, node);
+			check_entity(env, node, ent);
+		}
+
+		if(spill == NULL) {
+			ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) not connected to a reaload\n",
+			           node, get_nodes_block(node), get_irg_dump_name(env->irg));
+		}
+	}
+}
+
+int be_verify_spillslots(const arch_env_t *arch_env, ir_graph *irg)
 {
 	be_verify_spillslots_env_t env;
 
+	env.arch_env = arch_env;
 	env.irg = irg;
 	env.spills = new_set(cmp_spill, 10);
 	env.reloads = NEW_ARR_F(ir_node*, 0);
 	env.problem_found = 0;
-	env.lv = be_liveness(irg);
 
 	irg_walk_graph(irg, collect_spills_walker, NULL, &env);
+	irg_walk_graph(irg, check_lonely_spills, NULL, &env);
 
 	check_spillslot_interference(&env);
 
-	be_liveness_free(env.lv);
 	DEL_ARR_F(env.reloads);
 	del_set(env.spills);
 
@@ -457,8 +517,7 @@ int be_verify_spillslots(ir_graph *irg)
  * @param b The second value.
  * @return 1, if a and b interfere, 0 if not.
  */
-static int my_values_interfere(const ir_node *a, const ir_node *b)
-{
+static int my_values_interfere(const ir_node *a, const ir_node *b) {
 	const ir_edge_t *edge;
 	ir_node *bb;
 	int a2b = value_dominates(a, b);
@@ -513,3 +572,98 @@ static int my_values_interfere(const ir_node *a, const ir_node *b)
 
 	return 0;
 }
+
+
+
+//---------------------------------------------------------------------------
+
+
+
+typedef struct _be_verify_register_allocation_env_t {
+	const arch_env_t *arch_env;
+	ir_graph *irg;
+	be_lv_t *lv;
+	int problem_found;
+} be_verify_register_allocation_env_t;
+
+static void check_register_allocation(be_verify_register_allocation_env_t *env,
+                                      const arch_register_class_t *regclass, pset *nodes) {
+	const arch_env_t *arch_env = env->arch_env;
+	ir_node *node;
+	const arch_register_t *reg;
+	int fail = 0;
+
+	bitset_t *registers = bitset_alloca(arch_register_class_n_regs(regclass));
+
+	foreach_pset(nodes, node) {
+		if(arch_get_irn_reg_class(arch_env, node, -1) != regclass)
+			continue;
+
+		reg = arch_get_irn_register(arch_env, 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(env->irg));
+			env->problem_found = 1;
+			continue;
+		}
+		if(bitset_is_set(registers, reg->index)) {
+			pset_break(nodes);
+			fail = 1;
+			break;
+		}
+		bitset_set(registers, reg->index);
+	}
+	if (fail) {
+		ir_fprintf(stderr, "Verify warning: Register %s assigned more than once in block %+F(%s)\n",
+			       reg->name, get_nodes_block(node), get_irg_dump_name(env->irg));
+		env->problem_found = 1;
+
+		foreach_pset(nodes, node) {
+			if (arch_get_irn_register(arch_env, node) == reg) {
+				ir_fprintf(stderr, "  at node %+F\n", node);
+			}
+		}
+	}
+}
+
+static void verify_block_register_allocation(ir_node *block, void *data) {
+	be_verify_register_allocation_env_t *env = data;
+	const arch_env_t *arch_env = env->arch_env;
+	const arch_isa_t *isa = arch_env->isa;
+	int i, nregclasses;
+
+	nregclasses = arch_isa_get_n_reg_class(isa);
+	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();
+
+		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);
+		}
+
+		del_pset(live_nodes);
+	}
+}
+
+int be_verify_register_allocation(const arch_env_t *arch_env, ir_graph *irg) {
+	be_verify_register_allocation_env_t env;
+
+	env.arch_env = arch_env;
+	env.irg = irg;
+	env.lv = be_liveness(irg);
+	env.problem_found = 0;
+
+	irg_block_walk_graph(irg, verify_block_register_allocation, NULL, &env);
+
+	be_liveness_free(env.lv);
+
+	return !env.problem_found;
+}