projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- removed verify and dump parameters from passes
[libfirm]
/
ir
/
opt
/
convopt.c
diff --git
a/ir/opt/convopt.c
b/ir/opt/convopt.c
index
3ee9687
..
4d06679
100644
(file)
--- a/
ir/opt/convopt.c
+++ b/
ir/opt/convopt.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-36,9
+36,7
@@
* TODO: * try to optimize cmp modes
* * decide when it is useful to move the convs through phis
*/
* TODO: * try to optimize cmp modes
* * decide when it is useful to move the convs through phis
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include "iroptimize.h"
#include "iroptimize.h"
@@
-51,10
+49,11
@@
#include "iredges_t.h"
#include "irgwalk.h"
#include "irprintf.h"
#include "iredges_t.h"
#include "irgwalk.h"
#include "irprintf.h"
+#include "irtools.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
inline
int imin(int a, int b) { return a < b ? a : b; }
static
int is_optimizable_node(const ir_node *node)
static
int is_optimizable_node(const ir_node *node)
@@
-87,7
+86,7
@@
int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
return
mode_is_int(src_mode) &&
mode_is_int(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
}
static
@@
-106,18
+105,17
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
return conv_const_tv(node, dest_mode) == tarval_bad ? 1 : 0;
}
return conv_const_tv(node, dest_mode) == tarval_bad ? 1 : 0;
}
+ if (is_Conv(node) &&
+ is_downconv(mode, dest_mode) &&
+ get_irn_mode(get_Conv_op(node)) == dest_mode) {
+ return -1;
+ }
+
if (get_irn_n_edges(node) > 1) {
if (get_irn_n_edges(node) > 1) {
- if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
- return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
- }
DB((dbg, LEVEL_3, "multi outs at %+F\n", node));
return 1;
}
DB((dbg, LEVEL_3, "multi outs at %+F\n", node));
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 */
#if 0 // TODO
/* Take the minimum of the conversion costs for Phi predecessors as only one
* branch is actually executed at a time */
@@
-137,12
+135,21
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
}
#endif
}
#endif
+ if (!is_downconv(mode, dest_mode)) {
+ return 1;
+ }
+
+ if (is_Conv(node)) {
+ return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
+ }
+
if (!is_optimizable_node(node)) {
return 1;
}
costs = 0;
if (!is_optimizable_node(node)) {
return 1;
}
costs = 0;
- arity = get_irn_arity(node);
+ // 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) {
ir_node *pred = get_irn_n(node, i);
costs += imin(get_conv_costs(pred, dest_mode), 1);
for (i = 0; i < arity; ++i) {
ir_node *pred = get_irn_n(node, i);
costs += imin(get_conv_costs(pred, dest_mode), 1);
@@
-154,17
+161,18
@@
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);
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)
{
return conv;
}
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)) {
return node;
if (is_Const(node)) {
@@
-173,18
+181,25
@@
ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
if (tv == tarval_bad) {
return place_conv(node, dest_mode);
} else {
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(mode, dest_mode) &&
+ get_irn_mode(get_Conv_op(node)) == dest_mode) {
+ return get_Conv_op(node);
+ }
+
if (get_irn_n_edges(node) > 1) {
if (get_irn_n_edges(node) > 1) {
- if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
- return conv_transform(get_Conv_op(node), dest_mode);
- }
return place_conv(node, 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)) {
return conv_transform(get_Conv_op(node), dest_mode);
}
return conv_transform(get_Conv_op(node), dest_mode);
}
@@
-192,7
+207,8
@@
ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
return place_conv(node, dest_mode);
}
return place_conv(node, dest_mode);
}
- arity = get_irn_arity(node);
+ // 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++) {
ir_node *pred = get_irn_n(node, i);
ir_node *transformed;
for (i = 0; i < arity; i++) {
ir_node *pred = get_irn_n(node, i);
ir_node *transformed;
@@
-247,6
+263,9
@@
void conv_opt_walker(ir_node *node, void *data)
mode = get_irn_mode(node);
pred_mode = get_irn_mode(pred);
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;
if (!is_Phi(pred) && !is_downconv(pred_mode, mode))
return;
@@
-262,7
+281,7
@@
void conv_opt_walker(ir_node *node, void *data)
}
}
}
}
-
void
conv_opt(ir_graph *irg)
+
int
conv_opt(ir_graph *irg)
{
char invalidate = 0;
FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
{
char invalidate = 0;
FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
@@
-280,4
+299,11
@@
void conv_opt(ir_graph *irg)
if (invalidate) {
set_irg_outs_inconsistent(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)
+{
+ return def_graph_pass_ret(name ? name : "conv_opt", conv_opt);
+} /* conv_opt_pass */