projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BugFixes:
[libfirm]
/
ir
/
opt
/
convopt.c
diff --git
a/ir/opt/convopt.c
b/ir/opt/convopt.c
index
30e94a6
..
4ac59be
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.
*
@@
-54,7
+54,7
@@
DEBUG_ONLY(static firm_dbg_module_t *dbg);
DEBUG_ONLY(static firm_dbg_module_t *dbg);
-static
inline int
min(int a, int b) { return a < b ? a : b; }
+static
INLINE int i
min(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)
@@
-107,9
+107,6
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
}
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;
}
@@
-142,10
+139,11
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
}
costs = 0;
}
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);
for (i = 0; i < arity; ++i) {
ir_node *pred = get_irn_n(node, i);
- costs += min(get_conv_costs(pred, dest_mode), 1);
+ costs +=
i
min(get_conv_costs(pred, dest_mode), 1);
}
return costs;
}
return costs;
@@
-178,9
+176,6
@@
ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
}
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);
}
@@
-192,7
+187,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;