X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=43ac2d90aa2ae1ed236eb84ad6d10965b6f841e0;hb=a619ce99e40de4eb4481a590970a881e9f24627a;hp=ca983f0648983b106f6f748a71109fc006063111;hpb=21853dc32a3c0b52398379d3664fc33f7672f55e;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index ca983f064..43ac2d90a 100644
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -36,13 +36,12 @@
  * TODO: * try to optimize cmp modes
  *       * decide when it is useful to move the convs through phis
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 
 #include <assert.h>
+#include <stdbool.h>
 #include "debug.h"
 #include "ircons.h"
 #include "irgmod.h"
@@ -51,28 +50,28 @@
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
+#include "irpass_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
-static INLINE int imin(int a, int b) { return a < b ? a : b; }
+static inline int imin(int a, int b) { return a < b ? a : b; }
 
-static
-int is_optimizable_node(const ir_node *node)
+static bool is_optimizable_node(const ir_node *node)
 {
 	switch (get_irn_opcode(node)) {
-		case iro_Add:
-		case iro_And:
-		case iro_Eor:
-		case iro_Minus:
-		case iro_Mul:
-		case iro_Not:
-		case iro_Or:
-		case iro_Phi:
-		case iro_Shl:
-		case iro_Sub:
-			return 1;
-
-		default: return 0;
+	case iro_Add:
+	case iro_And:
+	case iro_Eor:
+	case iro_Minus:
+	case iro_Mul:
+	case iro_Not:
+	case iro_Or:
+	case iro_Phi:
+	case iro_Shl:
+	case iro_Sub:
+		return true;
+	default:
+		return false;
 	}
 }
 
@@ -81,17 +80,15 @@ static tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
 	return tarval_convert_to(get_Const_tarval(cnst), dest_mode);
 }
 
-static
-int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
+static int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
 {
 	return
 		mode_is_int(src_mode) &&
 		mode_is_int(dest_mode) &&
-		get_mode_size_bits(dest_mode) < get_mode_size_bits(src_mode);
+		get_mode_size_bits(dest_mode) <= get_mode_size_bits(src_mode);
 }
 
-static
-int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
+static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 {
 	ir_mode *mode = get_irn_mode(node);
 	size_t arity;
@@ -107,7 +104,7 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 
 	if (is_Conv(node) &&
-			is_downconv(get_irn_mode(node), dest_mode) &&
+			is_downconv(mode, dest_mode) &&
 			get_irn_mode(get_Conv_op(node)) == dest_mode) {
 		return -1;
 	}
@@ -117,10 +114,6 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return 1;
 	}
 
-	if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
-		return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
-	}
-
 #if 0 // TODO
 	/* Take the minimum of the conversion costs for Phi predecessors as only one
 	 * branch is actually executed at a time */
@@ -140,6 +133,20 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 #endif
 
+	if (!is_downconv(mode, dest_mode)) {
+		return 1;
+	}
+
+	if (is_Conv(node)) {
+		ir_node *pred      = get_Conv_op(node);
+		ir_mode *pred_mode = get_irn_mode(pred);
+
+		if (!values_in_mode(dest_mode, pred_mode)) {
+			return 1;
+		}
+		return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
+	}
+
 	if (!is_optimizable_node(node)) {
 		return 1;
 	}
@@ -158,17 +165,17 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 {
 	ir_node *block = get_nodes_block(node);
-	ir_node *conv = new_r_Conv(current_ir_graph, block, node, dest_mode);
+	ir_node *conv = new_r_Conv(block, node, dest_mode);
 	return conv;
 }
 
-static
-ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
+static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
-	size_t arity;
-	size_t i;
+	ir_mode *mode = get_irn_mode(node);
+	size_t   arity;
+	size_t   i;
 
-	if (get_irn_mode(node) == dest_mode)
+	if (mode == dest_mode)
 		return node;
 
 	if (is_Const(node)) {
@@ -177,12 +184,12 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		if (tv == tarval_bad) {
 			return place_conv(node, dest_mode);
 		} else {
-			return new_Const(dest_mode, tv);
+			return new_Const(tv);
 		}
 	}
 
 	if (is_Conv(node) &&
-			is_downconv(get_irn_mode(node), dest_mode) &&
+			is_downconv(mode, dest_mode) &&
 			get_irn_mode(get_Conv_op(node)) == dest_mode) {
 		return get_Conv_op(node);
 	}
@@ -191,7 +198,17 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		return place_conv(node, dest_mode);
 	}
 
-	if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
+	if (!is_downconv(mode, dest_mode)) {
+		return place_conv(node, dest_mode);
+	}
+
+	if (is_Conv(node)) {
+		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);
+		}
 		return conv_transform(get_Conv_op(node), dest_mode);
 	}
 
@@ -218,31 +235,27 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 /* TODO, backends (at least ia32) can't handle it at the moment,
    and it's probably not more efficient on most archs */
 #if 0
-static
-void try_optimize_cmp(ir_node *node)
+static void try_optimize_cmp(ir_node *node)
 {
 	ir_node *left  = get_Cmp_left(node);
 	ir_node *right = get_Cmp_right(node);
 	ir_node *conv  = NULL;
 
-	if(is_downconv
+	if (is_downconv
 }
 #endif
 
-static char changed;
-
-static
-void conv_opt_walker(ir_node *node, void *data)
+static void conv_opt_walker(ir_node *node, void *data)
 {
 	ir_node *transformed;
 	ir_node *pred;
 	ir_mode *pred_mode;
 	ir_mode *mode;
 	int costs;
-	(void) data;
+	bool *changed = data;
 
 #if 0
-	if(is_Cmp(node)) {
+	if (is_Cmp(node)) {
 		try_optimize_cmp(node);
 		return;
 	}
@@ -255,32 +268,37 @@ void conv_opt_walker(ir_node *node, void *data)
 	mode      = get_irn_mode(node);
 	pred_mode = get_irn_mode(pred);
 
+	if (mode_is_reference(mode) || mode_is_reference(pred_mode))
+		return;
+
 	if (!is_Phi(pred) && !is_downconv(pred_mode, mode))
 		return;
 
 	/* - 1 for the initial conv */
 	costs = get_conv_costs(pred, mode) - 1;
 	DB((dbg, LEVEL_2, "Costs for %+F -> %+F: %d\n", node, pred, costs));
-	if (costs > 0) return;
+	if (costs > 0)
+		return;
 
 	transformed = conv_transform(pred, mode);
 	if (node != transformed) {
 		exchange(node, transformed);
-		changed = 1;
+		*changed = true;
 	}
 }
 
-void conv_opt(ir_graph *irg)
+int conv_opt(ir_graph *irg)
 {
-	char invalidate = 0;
+	bool changed;
+	bool invalidate = false;
 	FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
 
 	DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
 
 	edges_assure(irg);
 	do {
-		changed = 0;
-		irg_walk_graph(irg, NULL, conv_opt_walker, NULL);
+		changed = false;
+		irg_walk_graph(irg, NULL, conv_opt_walker, &changed);
 		local_optimize_graph(irg);
 		invalidate |= changed;
 	} while (changed);
@@ -288,4 +306,16 @@ void conv_opt(ir_graph *irg)
 	if (invalidate) {
 		set_irg_outs_inconsistent(irg);
 	}
+	return invalidate;
+}
+
+/* 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);
+
+	/* safe to run parallel on all irgs */
+	ir_graph_pass_set_parallel(path, 1);
+
+	return path;
 }