X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fopt%2Fconvopt.c;h=fac7e328dbcd72de405a54cc21a0a9652386fbf5;hb=cf8cb33a340cf13eabad65f2fa5b27cfb4c1db67;hp=e3b0e2583e357a4d5af32510ffe54395ffb6c954;hpb=ae9fd2c229cc7f4c724ce9ccc9263c16d77670fe;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index e3b0e2583..fac7e328d 100644
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   conv node optimisation
  * @author  Matthias Braun, Christoph Mallon
- * @version $Id$
  *
  * Try to minimize the number of conv nodes by changing modes of operations.
  * The typical example is the following structure:
@@ -47,6 +46,7 @@
 #include "irgmod.h"
 #include "irgopt.h"
 #include "irnode_t.h"
+#include "iropt_t.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
@@ -54,11 +54,11 @@
 #include "tv.h"
 #include "vrp.h"
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 static inline int imin(int a, int b) { return a < b ? a : b; }
 
-static bool is_optimizable_node(const ir_node *node)
+static bool is_optimizable_node(const ir_node *node, ir_mode *dest_mode)
 {
 	switch (get_irn_opcode(node)) {
 	case iro_Add:
@@ -69,9 +69,17 @@ static bool is_optimizable_node(const ir_node *node)
 	case iro_Not:
 	case iro_Or:
 	case iro_Phi:
-	case iro_Shl:
 	case iro_Sub:
 		return true;
+	case iro_Shl: {
+		int modulo_shift = get_mode_modulo_shift(dest_mode);
+		int old_shift    = get_mode_modulo_shift(get_irn_mode(node));
+		/* bail out if modulo shift changes */
+		if (modulo_shift != old_shift)
+			return false;
+		return true;
+	}
+
 	default:
 		return false;
 	}
@@ -101,7 +109,6 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return 0;
 
 	if (is_Const(node)) {
-		/* TODO tarval module is incomplete and can't convert floats to ints */
 		return conv_const_tv(node, dest_mode) == tarval_bad ? 1 : 0;
 	}
 
@@ -116,6 +123,10 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return 1;
 	}
 
+	if (ir_zero_when_converted(node, dest_mode)) {
+		return -1;
+	}
+
 #if 0 // TODO
 	/* Take the minimum of the conversion costs for Phi predecessors as only one
 	 * branch is actually executed at a time */
@@ -143,13 +154,17 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		ir_node *pred      = get_Conv_op(node);
 		ir_mode *pred_mode = get_irn_mode(pred);
 
-		if (!values_in_mode(dest_mode, pred_mode)) {
+		if (smaller_mode(pred_mode, dest_mode)) {
+			return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
+		}
+		if (may_leave_out_middle_conv(pred_mode, mode, dest_mode)) {
+			return 0;
+		} else {
 			return 1;
 		}
-		return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
 	}
 
-	if (!is_optimizable_node(node)) {
+	if (!is_optimizable_node(node, dest_mode)) {
 		return 1;
 	}
 
@@ -185,7 +200,6 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		return node;
 
 	if (is_Const(node)) {
-		/* TODO tarval module is incomplete and can't convert floats to ints */
 		ir_tarval *tv = conv_const_tv(node, dest_mode);
 		if (tv == tarval_bad) {
 			return place_conv(node, dest_mode);
@@ -212,13 +226,13 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		ir_node *pred      = get_Conv_op(node);
 		ir_mode *pred_mode = get_irn_mode(pred);
 
-		if (!values_in_mode(dest_mode, pred_mode)) {
-			return place_conv(node, dest_mode);
+		if (smaller_mode(pred_mode, dest_mode)) {
+			return conv_transform(get_Conv_op(node), dest_mode);
 		}
-		return conv_transform(get_Conv_op(node), dest_mode);
+		return place_conv(node, dest_mode);
 	}
 
-	if (!is_optimizable_node(node)) {
+	if (!is_optimizable_node(node, dest_mode)) {
 		return place_conv(node, dest_mode);
 	}
 
@@ -285,43 +299,36 @@ static void conv_opt_walker(ir_node *node, void *data)
 
 	transformed = conv_transform(pred, mode);
 	if (node != transformed) {
-		vrp_attr *vrp;
-
 		exchange(node, transformed);
-		vrp = vrp_get_info(transformed);
-		if (vrp && vrp->valid) {
-			vrp->range_type = VRP_VARYING;
-			vrp->bits_set = tarval_convert_to(vrp->bits_set, mode);
-			vrp->bits_not_set = tarval_convert_to(vrp->bits_not_set, mode);
-		}
-
 		*changed = true;
 	}
 }
 
-int conv_opt(ir_graph *irg)
+void conv_opt(ir_graph *irg)
 {
+	bool global_changed = false;
 	bool changed;
-	bool invalidate = false;
 	FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
 
+	assure_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES);
+
 	DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
 
-	edges_assure(irg);
 	do {
 		changed = false;
 		irg_walk_graph(irg, NULL, conv_opt_walker, &changed);
 		local_optimize_graph(irg);
-		invalidate |= changed;
+		global_changed |= changed;
 	} while (changed);
 
-	return invalidate;
+	confirm_irg_properties(irg,
+		global_changed ? IR_GRAPH_PROPERTIES_NONE : IR_GRAPH_PROPERTIES_ALL);
 }
 
 /* Creates an ir_graph pass for conv_opt. */
 ir_graph_pass_t *conv_opt_pass(const char *name)
 {
-	ir_graph_pass_t *path = def_graph_pass_ret(name ? name : "conv_opt", conv_opt);
+	ir_graph_pass_t *path = def_graph_pass(name ? name : "conv_opt", conv_opt);
 
 	/* safe to run parallel on all irgs */
 	ir_graph_pass_set_parallel(path, 1);