X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=a57db1b54a950106144e866dad1b26e7a8b2faf7;hb=34e3b8d50bce639e760da7233524a4db85c80290;hp=9fb7e55c85bd2eccc39190635ce7d6cb5013b0f1;hpb=7d5b331123bd8399f5f1d057e90797faa3300b66;p=libfirm diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c index 9fb7e55c8..a57db1b54 100644 --- a/ir/opt/convopt.c +++ b/ir/opt/convopt.c @@ -1,27 +1,12 @@ /* - * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. - * * This file is part of libFirm. - * - * This file may be distributed and/or modified under the terms of the - * GNU General Public License version 2 as published by the Free Software - * Foundation and appearing in the file LICENSE.GPL included in the - * packaging of this file. - * - * Licensees holding valid libFirm Professional Edition licenses may use - * this file in accordance with the libFirm Commercial License. - * Agreement provided with the Software. - * - * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE - * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. + * Copyright (C) 2012 University of Karlsruhe. */ /** * @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: @@ -54,7 +39,6 @@ #include "irpass_t.h" #include "tv.h" #include "vrp.h" -#include "opt_manage.h" DEBUG_ONLY(static firm_dbg_module_t *dbg;) @@ -63,15 +47,18 @@ static inline int imin(int a, int b) { return a < b ? a : b; } static bool is_optimizable_node(const ir_node *node, ir_mode *dest_mode) { switch (get_irn_opcode(node)) { - case iro_Add: + case iro_Minus: + case iro_Phi: case iro_And: case iro_Eor: - case iro_Minus: - case iro_Mul: - case iro_Not: case iro_Or: - case iro_Phi: + case iro_Not: + return true; + case iro_Add: + case iro_Mul: case iro_Sub: + if (mode_is_float(get_irn_mode(node))) + return false; return true; case iro_Shl: { int modulo_shift = get_mode_modulo_shift(dest_mode); @@ -92,12 +79,11 @@ static ir_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 bool 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); + return ((mode_is_int(src_mode) && mode_is_int(dest_mode)) + || (mode_is_float(src_mode) && mode_is_float(dest_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) @@ -111,7 +97,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; } @@ -130,24 +115,7 @@ static int get_conv_costs(const ir_node *node, ir_mode *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)) { - int i; - int arity = get_Phi_n_preds(node); - int costs; - - costs = get_conv_costs(get_Phi_pred(node, 0), dest_mode); - for (i = 1; i < arity; ++i) { - ir_node *pred = get_Phi_pred(node, i); - int c = get_conv_costs(pred, dest_mode); - if (c < costs) costs = c; - } - - return costs; - } -#endif + /* TODO: Phi nodes */ if (!is_downconv(mode, dest_mode)) { return 1; @@ -157,10 +125,14 @@ 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, dest_mode)) { @@ -199,7 +171,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); @@ -226,10 +197,10 @@ 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, dest_mode)) { @@ -299,54 +270,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; } } -static ir_graph_state_t do_deconv(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)); do { changed = false; irg_walk_graph(irg, NULL, conv_opt_walker, &changed); local_optimize_graph(irg); - invalidate |= changed; + global_changed |= changed; } while (changed); - return 0; -} - -optdesc_t opt_deconv = { - "deconv", - IR_GRAPH_STATE_CONSISTENT_OUT_EDGES, - do_deconv, -}; - -int conv_opt(ir_graph *irg) -{ - perform_irg_optimization(irg, &opt_deconv); - return 1; + 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);