projects
/
libfirm
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fcc0d94
)
Before deconving a node, make sure it is a downconv.
author
Christoph Mallon
<christoph.mallon@gmx.de>
Mon, 8 Dec 2008 10:46:22 +0000
(10:46 +0000)
committer
Christoph Mallon
<christoph.mallon@gmx.de>
Mon, 8 Dec 2008 10:46:22 +0000
(10:46 +0000)
[r24387]
ir/opt/convopt.c
patch
|
blob
|
history
diff --git
a/ir/opt/convopt.c
b/ir/opt/convopt.c
index
80de074
..
cfee6ee
100644
(file)
--- a/
ir/opt/convopt.c
+++ b/
ir/opt/convopt.c
@@
-115,10
+115,6
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
return 1;
}
return 1;
}
- if (is_Conv(node) && is_downconv(mode, 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 */
@@
-138,7
+134,15
@@
int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
}
#endif
}
#endif
- if (!mode_is_int(mode) || !is_optimizable_node(node)) {
+ 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;
}
return 1;
}
@@
-190,11
+194,15
@@
ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
return place_conv(node, dest_mode);
}
return place_conv(node, dest_mode);
}
- if (is_Conv(node) && is_downconv(mode, 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);
}
- if (!
mode_is_int(mode) || !
is_optimizable_node(node)) {
+ if (!is_optimizable_node(node)) {
return place_conv(node, dest_mode);
}
return place_conv(node, dest_mode);
}