X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=7ea1e3a92cb0e8d98d662597e2dfb44664689b3e;hb=762b472fc81c73cf7a1b0041b8cd286b7206d79d;hp=653ef1d400ea056346683f713b8420636037f7f6;hpb=a7c6b3122cc7be047df0ceab4fe29b22fc88dff9;p=libfirm diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c index 653ef1d40..7ea1e3a92 100644 --- a/ir/opt/convopt.c +++ b/ir/opt/convopt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -47,16 +47,19 @@ #include "irgmod.h" #include "irgopt.h" #include "irnode_t.h" +#include "iropt_t.h" #include "iredges_t.h" #include "irgwalk.h" #include "irprintf.h" #include "irpass_t.h" +#include "tv.h" +#include "vrp.h" 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: @@ -67,15 +70,23 @@ 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; } } -static tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode) +static ir_tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode) { return tarval_convert_to(get_Const_tarval(cnst), dest_mode); } @@ -91,8 +102,8 @@ static int is_downconv(ir_mode *src_mode, 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; - size_t i; + int arity; + int i; int costs; if (mode == dest_mode) @@ -114,12 +125,16 @@ 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 */ if (is_Phi(node)) { - size_t i; - size_t arity = get_Phi_n_preds(node); + int i; + int arity = get_Phi_n_preds(node); int costs; costs = get_conv_costs(get_Phi_pred(node, 0), dest_mode); @@ -138,10 +153,16 @@ static int get_conv_costs(const ir_node *node, ir_mode *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 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; } @@ -165,20 +186,24 @@ static ir_node *place_conv(ir_node *node, ir_mode *dest_mode) static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode) { - ir_mode *mode = get_irn_mode(node); - size_t arity; - size_t i; + ir_mode *mode = get_irn_mode(node); + ir_graph *irg = get_irn_irg(node); + int arity; + int conv_arity; + int i; + ir_node *new_node; + ir_node **ins; if (mode == dest_mode) return node; if (is_Const(node)) { /* TODO tarval module is incomplete and can't convert floats to ints */ - tarval *tv = conv_const_tv(node, dest_mode); + ir_tarval *tv = conv_const_tv(node, dest_mode); if (tv == tarval_bad) { return place_conv(node, dest_mode); } else { - return new_Const(tv); + return new_r_Const(irg, tv); } } @@ -197,16 +222,26 @@ static ir_node *conv_transform(ir_node *node, ir_mode *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); } - if (!is_optimizable_node(node)) { + if (!is_optimizable_node(node, dest_mode)) { return place_conv(node, dest_mode); } + // We want to create a new node with the right mode + arity = get_irn_arity(node); + ins = ALLOCAN(ir_node *, arity); + // The shift count does not participate in the conv optimisation - arity = is_Shl(node) ? 1 : get_irn_arity(node); - for (i = 0; i < arity; i++) { + conv_arity = is_Shl(node) ? 1 : arity; + for (i = 0; i < conv_arity; i++) { ir_node *pred = get_irn_n(node, i); ir_node *transformed; if (get_conv_costs(pred, dest_mode) > 0) { @@ -214,24 +249,24 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode) } else { transformed = conv_transform(pred, dest_mode); } - set_irn_n(node, i, transformed); + ins[i] = transformed; } - set_irn_mode(node, dest_mode); - return node; -} -/* 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) -{ - ir_node *left = get_Cmp_left(node); - ir_node *right = get_Cmp_right(node); - ir_node *conv = NULL; + for (i = conv_arity; i < arity; i++) { + ins[i] = get_irn_n(node, i); + } + + new_node = new_ir_node(get_irn_dbg_info(node), + irg, + get_nodes_block(node), + get_irn_op(node), + dest_mode, + arity, + ins); + copy_node_attr(irg, node, new_node); - if(is_downconv + return new_node; } -#endif static void conv_opt_walker(ir_node *node, void *data) { @@ -240,14 +275,7 @@ static void conv_opt_walker(ir_node *node, void *data) ir_mode *pred_mode; ir_mode *mode; int costs; - bool *changed = data; - -#if 0 - if(is_Cmp(node)) { - try_optimize_cmp(node); - return; - } -#endif + bool *changed = (bool*)data; if (!is_Conv(node)) return; @@ -270,7 +298,16 @@ 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; } } @@ -291,9 +328,6 @@ int conv_opt(ir_graph *irg) invalidate |= changed; } while (changed); - if (invalidate) { - set_irg_outs_inconsistent(irg); - } return invalidate; }