X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=b930563ad1610fea43c55338d430df3631483c25;hb=66a85ef5ee56713b80b444e55963354ff923f0f0;hp=815822b0946c768870ae65fef0ff0dad97a9a250;hpb=dbbe99abdf207c014d25029d2633c7b994015a41;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index 815822b09..b930563ad 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -106,17 +106,7 @@ typedef void (*compute_func)(node_t *node);
  * An opcode map key.
  */
 struct opcode_key_t {
-	unsigned    code;   /**< The Firm opcode. */
-	ir_mode     *mode;  /**< The mode of all nodes in the partition. */
-	int         arity;  /**< The arity of this opcode (needed for Phi etc. */
-	union {
-		long      proj;   /**< For Proj nodes, its proj number */
-		ir_entity *ent;   /**< For Sel Nodes, its entity */
-		int       intVal; /**< For Conv/Div Nodes: strict/remainderless */
-		unsigned  uintVal;/**< for Builtin: the kind */
-		ir_node   *block; /**< for Block: itself */
-		void      *ptr;   /**< generic pointer for hash/cmp */
-	} u;
+	ir_node *irn;    /**< An IR node representing this opcode. */
 };
 
 /**
@@ -236,6 +226,42 @@ static ir_tarval *tarval_UNKNOWN;
 /* forward */
 static node_t *identity(node_t *node);
 
+/**
+ * Compare two opcode representatives.
+ */
+static int cmp_irn_opcode(const ir_node *a, const ir_node *b)
+{
+	int arity;
+
+	if ((get_irn_op(a) != get_irn_op(b)) ||
+	    (get_irn_mode(a) != get_irn_mode(b)))
+		return 1;
+
+	/* compare if a's in and b's in are of equal length */
+	arity = get_irn_arity(a);
+	if (arity != get_irn_arity(b))
+		return 1;
+
+	if (is_Block(a)) {
+		/*
+		 * Some ugliness here: Two Blocks having the same
+		 * IJmp predecessor would be congruent, which of course is wrong.
+		 * We fix it by never letting blocks be congruent
+		 * which cannot be detected by combo either.
+		 */
+		return 1;
+	}
+
+	/*
+	 * here, we already know that the nodes are identical except their
+	 * attributes
+	 */
+	if (a->op->ops.node_cmp_attr)
+		return a->op->ops.node_cmp_attr(a, b);
+
+	return 0;
+}  /* cmp_irn_opcode */
+
 #ifdef CHECK_PARTITIONS
 /**
  * Check a partition.
@@ -265,76 +291,16 @@ static void check_partition(const partition_t *T)
  */
 static void check_opcode(const partition_t *Z)
 {
-	node_t       *node;
-	opcode_key_t key;
-	int          first = 1;
+	node_t        *node;
+	const ir_node *repr = NULL;
 
 	list_for_each_entry(node_t, node, &Z->Leader, node_list) {
 		ir_node *irn = node->node;
 
-		if (first) {
-			key.code   = get_irn_opcode(irn);
-			key.mode   = get_irn_mode(irn);
-			key.arity  = get_irn_arity(irn);
-			key.u.proj = 0;
-			key.u.ent  = NULL;
-
-			switch (get_irn_opcode(irn)) {
-			case iro_Proj:
-				key.u.proj = get_Proj_proj(irn);
-				break;
-			case iro_Sel:
-				key.u.ent = get_Sel_entity(irn);
-				break;
-			case iro_Conv:
-				key.u.intVal = get_Conv_strict(irn);
-				break;
-			case iro_Div:
-				key.u.intVal = get_Div_no_remainder(irn);
-				break;
-			case iro_Block:
-				key.u.block = irn;
-				break;
-			case iro_Load:
-				key.mode = get_Load_mode(irn);
-				break;
-			case iro_Builtin:
-				key.u.intVal = get_Builtin_kind(irn);
-				break;
-			default:
-				break;
-			}
-			first = 0;
+		if (repr == NULL) {
+			repr = irn;
 		} else {
-			assert((unsigned)key.code  == get_irn_opcode(irn));
-			assert(key.mode  == get_irn_mode(irn));
-			assert(key.arity == get_irn_arity(irn));
-
-			switch (get_irn_opcode(irn)) {
-			case iro_Proj:
-				assert(key.u.proj == get_Proj_proj(irn));
-				break;
-			case iro_Sel:
-				assert(key.u.ent == get_Sel_entity(irn));
-				break;
-			case iro_Conv:
-				assert(key.u.intVal == get_Conv_strict(irn));
-				break;
-			case iro_Div:
-				assert(key.u.intVal == get_Div_no_remainder(irn));
-				break;
-			case iro_Block:
-				assert(key.u.block == irn);
-				break;
-			case iro_Load:
-				assert(key.mode == get_Load_mode(irn));
-				break;
-			case iro_Builtin:
-				assert(key.u.intVal == (int) get_Builtin_kind(irn));
-				break;
-			default:
-				break;
-			}
+			assert(cmp_irn_opcode(repr, irn) == 0);
 		}
 	}
 }  /* check_opcode */
@@ -597,7 +563,18 @@ static listmap_entry_t *listmap_find(listmap_t *map, void *id)
  */
 static unsigned opcode_hash(const opcode_key_t *entry)
 {
-	return (unsigned)(PTR_TO_INT(entry->mode) * 9 + entry->code + entry->u.proj * 3 + HASH_PTR(entry->u.ptr) + entry->arity);
+	/* we cannot use the ir ops hash function here, because it hashes the
+	 * predecessors. */
+	const ir_node *n = entry->irn;
+	ir_opcode code  = get_irn_opcode(n);
+	ir_mode   *mode = get_irn_mode(n);
+	unsigned hash = (unsigned)(PTR_TO_INT(mode) * 9 + code) + get_irn_arity(n);
+
+	if (code == iro_Const)
+		hash ^= (unsigned)HASH_PTR(get_Const_tarval(n));
+	else if (code == iro_Proj)
+		hash += (unsigned)get_Proj_proj(n);
+	return hash;
 }  /* opcode_hash */
 
 /**
@@ -609,11 +586,8 @@ static int cmp_opcode(const void *elt, const void *key, size_t size)
 	const opcode_key_t *o2 = (opcode_key_t*)key;
 
 	(void) size;
-	return o1->code != o2->code || o1->mode != o2->mode ||
-	       o1->arity != o2->arity ||
-	       o1->u.proj != o2->u.proj ||
-	       o1->u.intVal != o2->u.intVal || /* this already checks uIntVal */
-	       o1->u.ptr != o2->u.ptr;
+
+	return cmp_irn_opcode(o1->irn, o2->irn);
 }  /* cmp_opcode */
 
 /**
@@ -806,7 +780,8 @@ static void init_block_phis(ir_node *irn, void *ctx)
 	(void) ctx;
 
 	if (is_Phi(irn)) {
-		add_Block_phi(get_nodes_block(irn), irn);
+		ir_node *block = get_nodes_block(irn);
+		add_Block_phi(block, irn);
 	}
 }  /* init_block_phis */
 
@@ -871,7 +846,7 @@ static void add_to_cprop(node_t *y, environment_t *env)
 	irn = y->node;
 	if (get_irn_mode(irn) == mode_T) {
 		/* mode_T nodes always produce tarval_bottom, so we must explicitly
-		   add it's Proj's to get constant evaluation to work */
+		 * add its Projs to get constant evaluation to work */
 		int i;
 
 		for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
@@ -1724,45 +1699,8 @@ static void *lambda_type(const node_t *node, environment_t *env)
 static void *lambda_opcode(const node_t *node, environment_t *env)
 {
 	opcode_key_t key, *entry;
-	ir_node      *irn = node->node;
-
-	key.code   = get_irn_opcode(irn);
-	key.mode   = get_irn_mode(irn);
-	key.arity  = get_irn_arity(irn);
-	key.u.proj = 0;
-	key.u.ent  = NULL;
 
-	switch (get_irn_opcode(irn)) {
-	case iro_Proj:
-		key.u.proj = get_Proj_proj(irn);
-		break;
-	case iro_Sel:
-		key.u.ent = get_Sel_entity(irn);
-		break;
-	case iro_Conv:
-		key.u.intVal = get_Conv_strict(irn);
-		break;
-	case iro_Div:
-		key.u.intVal = get_Div_no_remainder(irn);
-		break;
-	case iro_Block:
-		/*
-		 * Some ugliness here: Two Blocks having the same
-		 * IJmp predecessor would be congruent, which of course is wrong.
-		 * We fix it by never letting blocks be congruent
-		 * which cannot be detected by combo either.
-		 */
-		key.u.block = irn;
-		break;
-	case iro_Load:
-		key.mode = get_Load_mode(irn);
-		break;
-	case iro_Builtin:
-		key.u.intVal = get_Builtin_kind(irn);
-		break;
-	default:
-		break;
-	}
+	key.irn = node->node;
 
 	entry = (opcode_key_t*)set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
 	return entry;
@@ -1876,7 +1814,7 @@ static void split_by(partition_t *X, environment_t *env)
 	dump_partition("split_by", X);
 
 	if (X->n_leader == 1) {
-		/* we have only one leader, no need to split, just check it's type */
+		/* we have only one leader, no need to split, just check its type */
 		node_t *x = get_first_node(X);
 		X->type_is_T_or_C = x->type.tv == tarval_top || is_con(x->type);
 		return;
@@ -2298,44 +2236,12 @@ static void compute_Eor(node_t *node)
  */
 static void compute_Cmp(node_t *node)
 {
-	ir_node        *cmp  = node->node;
-	node_t         *l    = get_irn_node(get_Cmp_left(cmp));
-	node_t         *r    = get_irn_node(get_Cmp_right(cmp));
-	lattice_elem_t a     = l->type;
-	lattice_elem_t b     = r->type;
-	ir_mode        *mode = get_irn_mode(get_Cmp_left(cmp));
-
-	if (a.tv == tarval_top || b.tv == tarval_top) {
-		node->type.tv = tarval_top;
-	} else if (r->part == l->part) {
-		/* both nodes congruent, we can probably do something */
-		if (mode_is_float(mode)) {
-			/* beware of NaN's */
-			node->type.tv = tarval_bottom;
-		} else {
-			node->type.tv = tarval_b_true;
-		}
-	} else if (is_con(a) && is_con(b)) {
-		node->type.tv = tarval_b_true;
-	} else {
-		node->type.tv = tarval_bottom;
-	}
-}  /* compute_Cmp */
-
-/**
- * (Re-)compute the type for a Proj(Cmp).
- *
- * @param node  the node
- * @param cond  the predecessor Cmp node
- */
-static void compute_Proj_Cmp(node_t *node, ir_node *cmp)
-{
-	ir_node        *proj = node->node;
-	node_t         *l    = get_irn_node(get_Cmp_left(cmp));
-	node_t         *r    = get_irn_node(get_Cmp_right(cmp));
-	lattice_elem_t a     = l->type;
-	lattice_elem_t b     = r->type;
-	pn_Cmp         pnc   = get_Proj_pn_cmp(proj);
+	ir_node        *cmp     = node->node;
+	node_t         *l       = get_irn_node(get_Cmp_left(cmp));
+	node_t         *r       = get_irn_node(get_Cmp_right(cmp));
+	lattice_elem_t a        = l->type;
+	lattice_elem_t b        = r->type;
+	ir_relation    relation = get_Cmp_relation(cmp);
 	ir_tarval      *tv;
 
 	if (a.tv == tarval_top || b.tv == tarval_top) {
@@ -2350,19 +2256,19 @@ static void compute_Proj_Cmp(node_t *node, ir_node *cmp)
 	 *  consistent with compute_Cmp, so don't do anything for floats)
 	 */
 	} else if (r->part == l->part && !mode_is_float(get_irn_mode(l->node))) {
-		tv = pnc & pn_Cmp_Eq ? tarval_b_true : tarval_b_false;
+		tv = relation & ir_relation_equal ? tarval_b_true : tarval_b_false;
 
-		/* if the node was ONCE evaluated by all constants, but now
+		/* if the node was ONCE evaluated to a constant, but now
 		   this breaks AND we get from the argument partitions a different
-		   result, switch to bottom.
+		   result, ensure monotony by fall to bottom.
 		   This happens because initially all nodes are in the same partition ... */
-		if (node->type.tv != tv)
+		if (node->type.tv != tv && is_constant_type(node->type))
 			tv = tarval_bottom;
 		node->type.tv = tv;
 	} else {
 		node->type.tv = tarval_bottom;
 	}
-}  /* compute_Proj_Cmp */
+}
 
 /**
  * (Re-)compute the type for a Proj(Cond).
@@ -2532,28 +2438,23 @@ static void compute_Proj(node_t *node)
 		/* mode M is always bottom */
 		node->type.tv = tarval_bottom;
 		return;
+	} else if (mode == mode_X) {
+		/* handle mode_X nodes */
+		switch (get_irn_opcode(pred)) {
+		case iro_Start:
+			/* the Proj_X from the Start is always reachable.
+			   However this is already handled at the top. */
+			node->type.tv = tarval_reachable;
+			return;
+		case iro_Cond:
+			compute_Proj_Cond(node, pred);
+			return;
+		default:
+			break;
+		}
 	}
-	if (mode != mode_X) {
-		if (is_Cmp(pred))
-			compute_Proj_Cmp(node, pred);
-		else
-			default_compute(node);
-		return;
-	}
-	/* handle mode_X nodes */
 
-	switch (get_irn_opcode(pred)) {
-	case iro_Start:
-		/* the Proj_X from the Start is always reachable.
-		   However this is already handled at the top. */
-		node->type.tv = tarval_reachable;
-		break;
-	case iro_Cond:
-		compute_Proj_Cond(node, pred);
-		break;
-	default:
-		default_compute(node);
-	}
+	default_compute(node);
 }  /* compute_Proj */
 
 /**
@@ -2566,7 +2467,7 @@ static void compute_Confirm(node_t *node)
 	ir_node *confirm = node->node;
 	node_t  *pred = get_irn_node(get_Confirm_value(confirm));
 
-	if (get_Confirm_cmp(confirm) == pn_Cmp_Eq) {
+	if (get_Confirm_relation(confirm) == ir_relation_equal) {
 		node_t *bound = get_irn_node(get_Confirm_bound(confirm));
 
 		if (is_con(bound->type)) {
@@ -3101,18 +3002,21 @@ static void apply_cf(ir_node *block, void *ctx)
 			ir_node *pred = get_Block_cfgpred(block, i);
 
 			if (! is_Bad(pred)) {
-				node_t *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
-
-				if (pred_bl->flagged == 0) {
-					pred_bl->flagged = 3;
-
-					if (pred_bl->type.tv == tarval_reachable) {
-						/*
-						 * We will remove an edge from block to its pred.
-						 * This might leave the pred block as an endless loop
-						 */
-						if (! is_backedge(block, i))
-							keep_alive(pred_bl->node);
+				ir_node *pred_block = get_nodes_block(skip_Proj(pred));
+				if (!is_Bad(pred_block)) {
+					node_t *pred_bl = get_irn_node(pred_block);
+
+					if (pred_bl->flagged == 0) {
+						pred_bl->flagged = 3;
+
+						if (pred_bl->type.tv == tarval_reachable) {
+							/*
+							 * We will remove an edge from block to its pred.
+							 * This might leave the pred block as an endless loop
+							 */
+							if (! is_backedge(block, i))
+								keep_alive(pred_bl->node);
+						}
 					}
 				}
 			}
@@ -3122,7 +3026,9 @@ static void apply_cf(ir_node *block, void *ctx)
 		   finds out the opposite :-) */
 		if (block != get_irg_end_block(current_ir_graph)) {
 			/* mark dead blocks */
-			set_Block_dead(block);
+			//set_Block_dead(block);
+			//ir_graph *irg = get_irn_irg(block);
+			//exchange(block, get_irg_bad(irg));
 			DB((dbg, LEVEL_1, "Removing dead %+F\n", block));
 		} else {
 			/* the endblock is unreachable */
@@ -3157,18 +3063,21 @@ static void apply_cf(ir_node *block, void *ctx)
 		} else {
 			DB((dbg, LEVEL_1, "Removing dead input %d from %+F (%+F)\n", i, block, pred));
 			if (! is_Bad(pred)) {
-				node_t *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
-
-				if (pred_bl->flagged == 0) {
-					pred_bl->flagged = 3;
-
-					if (pred_bl->type.tv == tarval_reachable) {
-						/*
-						 * We will remove an edge from block to its pred.
-						 * This might leave the pred block as an endless loop
-						 */
-						if (! is_backedge(block, i))
-							keep_alive(pred_bl->node);
+				ir_node *pred_block = get_nodes_block(skip_Proj(pred));
+				if (!is_Bad(pred_block)) {
+					node_t *pred_bl = get_irn_node(pred_block);
+
+					if (!is_Bad(pred_bl->node) && pred_bl->flagged == 0) {
+						pred_bl->flagged = 3;
+
+						if (pred_bl->type.tv == tarval_reachable) {
+							/*
+							 * We will remove an edge from block to its pred.
+							 * This might leave the pred block as an endless loop
+							 */
+							if (! is_backedge(block, i))
+								keep_alive(pred_bl->node);
+						}
 					}
 				}
 			}
@@ -3497,13 +3406,22 @@ static void apply_end(ir_node *end, environment_t *env)
 
 	/* fix the keep alive */
 	for (i = j = 0; i < n; i++) {
-		ir_node *ka   = get_End_keepalive(end, i);
-		node_t  *node = get_irn_node(ka);
+		ir_node *ka = get_End_keepalive(end, i);
+		ir_node *block;
+		node_t  *node;
 
-		if (! is_Block(ka))
-			node = get_irn_node(get_nodes_block(ka));
+		if (is_Bad(ka))
+			continue;
+		if (!is_Block(ka)) {
+			block = get_nodes_block(ka);
+			if (is_Bad(block))
+				continue;
+		} else {
+			block = ka;
+		}
 
-		if (node->type.tv != tarval_unreachable && !is_Bad(ka))
+		node = get_irn_node(block);
+		if (node->type.tv != tarval_unreachable)
 			in[j++] = ka;
 	}
 	if (j != n) {
@@ -3519,10 +3437,10 @@ static void apply_end(ir_node *end, environment_t *env)
  */
 static void set_compute_functions(void)
 {
-	int i;
+	size_t i, n;
 
 	/* set the default compute function */
-	for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) {
 		ir_op *op = get_irp_opcode(i);
 		op->ops.generic = (op_func)default_compute;
 	}