projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed off-by-one error after phase refactoring
[libfirm]
/
ir
/
opt
/
convopt.c
diff --git
a/ir/opt/convopt.c
b/ir/opt/convopt.c
index
5d2785c
..
43ac2d9
100644
(file)
--- a/
ir/opt/convopt.c
+++ b/
ir/opt/convopt.c
@@
-50,7
+50,7
@@
#include "iredges_t.h"
#include "irgwalk.h"
#include "irprintf.h"
#include "iredges_t.h"
#include "irgwalk.h"
#include "irprintf.h"
-#include "irpass.h"
+#include "irpass
_t
.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg);
DEBUG_ONLY(static firm_dbg_module_t *dbg);
@@
-59,19
+59,19
@@
static inline int imin(int a, int b) { return a < b ? a : b; }
static bool is_optimizable_node(const ir_node *node)
{
switch (get_irn_opcode(node)) {
static bool is_optimizable_node(const ir_node *node)
{
switch (get_irn_opcode(node)) {
-
case iro_Add:
-
case iro_And:
-
case iro_Eor:
-
case iro_Minus:
-
case iro_Mul:
-
case iro_Not:
-
case iro_Or:
-
case iro_Phi:
-
case iro_Shl:
-
case iro_Sub:
-
return 1
;
-
-
default: return 0
;
+ case iro_Add:
+ case iro_And:
+ case iro_Eor:
+ case iro_Minus:
+ case iro_Mul:
+ case iro_Not:
+ case iro_Or:
+ case iro_Phi:
+ case iro_Shl:
+ case iro_Sub:
+
return true
;
+ default:
+
return false
;
}
}
}
}
@@
-138,6
+138,12
@@
static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
}
if (is_Conv(node)) {
}
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;
}
return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
}
@@
-197,6
+203,12
@@
static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
}
if (is_Conv(node)) {
}
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);
}
return conv_transform(get_Conv_op(node), dest_mode);
}
@@
-229,12
+241,10
@@
static void try_optimize_cmp(ir_node *node)
ir_node *right = get_Cmp_right(node);
ir_node *conv = NULL;
ir_node *right = get_Cmp_right(node);
ir_node *conv = NULL;
- if(is_downconv
+ if
(is_downconv
}
#endif
}
#endif
-static bool changed;
-
static void conv_opt_walker(ir_node *node, void *data)
{
ir_node *transformed;
static void conv_opt_walker(ir_node *node, void *data)
{
ir_node *transformed;
@@
-242,10
+252,10
@@
static void conv_opt_walker(ir_node *node, void *data)
ir_mode *pred_mode;
ir_mode *mode;
int costs;
ir_mode *pred_mode;
ir_mode *mode;
int costs;
-
(void)
data;
+
bool *changed =
data;
#if 0
#if 0
- if(is_Cmp(node)) {
+ if
(is_Cmp(node)) {
try_optimize_cmp(node);
return;
}
try_optimize_cmp(node);
return;
}
@@
-273,13
+283,14
@@
static void conv_opt_walker(ir_node *node, void *data)
transformed = conv_transform(pred, mode);
if (node != transformed) {
exchange(node, transformed);
transformed = conv_transform(pred, mode);
if (node != transformed) {
exchange(node, transformed);
- changed = true;
+
*
changed = true;
}
}
int conv_opt(ir_graph *irg)
{
}
}
int conv_opt(ir_graph *irg)
{
- bool invalidate = 0;
+ bool changed;
+ bool invalidate = false;
FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
@@
-287,7
+298,7
@@
int conv_opt(ir_graph *irg)
edges_assure(irg);
do {
changed = false;
edges_assure(irg);
do {
changed = false;
- irg_walk_graph(irg, NULL, conv_opt_walker,
NULL
);
+ irg_walk_graph(irg, NULL, conv_opt_walker,
&changed
);
local_optimize_graph(irg);
invalidate |= changed;
} while (changed);
local_optimize_graph(irg);
invalidate |= changed;
} while (changed);
@@
-301,5
+312,10
@@
int conv_opt(ir_graph *irg)
/* Creates an ir_graph pass for conv_opt. */
ir_graph_pass_t *conv_opt_pass(const char *name)
{
/* 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);
+ ir_graph_pass_t *path = def_graph_pass_ret(name ? name : "conv_opt", conv_opt);
+
+ /* safe to run parallel on all irgs */
+ ir_graph_pass_set_parallel(path, 1);
+
+ return path;
}
}