projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve firm profiler (based on patch by Steven Schäfer)
[libfirm]
/
ir
/
ir
/
irgopt.c
diff --git
a/ir/ir/irgopt.c
b/ir/ir/irgopt.c
index
1888d28
..
499269e
100644
(file)
--- a/
ir/ir/irgopt.c
+++ b/
ir/ir/irgopt.c
@@
-112,7
+112,8
@@
static void kill_dead_blocks(ir_node *block, void *env)
* Note that the new dominance code correctly handles
* the End block, i.e. it is always reachable from Start
*/
* Note that the new dominance code correctly handles
* the End block, i.e. it is always reachable from Start
*/
- set_Block_dead(block);
+ ir_graph *irg = get_irn_irg(block);
+ exchange(block, get_irg_bad(irg));
}
}
}
}
@@
-122,9
+123,6
@@
void local_optimize_graph(ir_graph *irg)
ir_graph *rem = current_ir_graph;
current_ir_graph = irg;
ir_graph *rem = current_ir_graph;
current_ir_graph = irg;
- if (get_irg_dom_state(irg) == dom_consistent)
- irg_block_walk_graph(irg, NULL, kill_dead_blocks, NULL);
-
do_local_optimize(get_irg_end(irg));
current_ir_graph = rem;
do_local_optimize(get_irg_end(irg));
current_ir_graph = rem;
@@
-155,12
+153,12
@@
static void enqueue_users(ir_node *n, pdeq *waitq)
/**
* Data flow optimization walker.
/**
* Data flow optimization walker.
- * Optimizes all nodes and enqueue it
'
s users
+ * Optimizes all nodes and enqueue its users
* if done.
*/
static void opt_walker(ir_node *n, void *env)
{
* if done.
*/
static void opt_walker(ir_node *n, void *env)
{
- pdeq *waitq = env;
+ pdeq *waitq =
(pdeq*)
env;
ir_node *optimized;
optimized = optimize_in_place_2(n);
ir_node *optimized;
optimized = optimize_in_place_2(n);
@@
-186,6
+184,7
@@
int optimize_graph_df(ir_graph *irg)
if (get_opt_global_cse())
set_irg_pinned(irg, op_pin_state_floats);
if (get_opt_global_cse())
set_irg_pinned(irg, op_pin_state_floats);
+ set_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK);
/* Clean the value_table in irg for the CSE. */
new_identities(irg);
/* Clean the value_table in irg for the CSE. */
new_identities(irg);
@@
-209,7
+208,7
@@
int optimize_graph_df(ir_graph *irg)
/* finish the wait queue */
while (! pdeq_empty(waitq)) {
/* finish the wait queue */
while (! pdeq_empty(waitq)) {
- ir_node *n = pdeq_getl(waitq);
+ ir_node *n =
(ir_node*)
pdeq_getl(waitq);
if (! is_Bad(n))
opt_walker(n, waitq);
}
if (! is_Bad(n))
opt_walker(n, waitq);
}
@@
-226,6
+225,8
@@
int optimize_graph_df(ir_graph *irg)
end = get_irg_end(irg);
remove_End_Bads_and_doublets(end);
end = get_irg_end(irg);
remove_End_Bads_and_doublets(end);
+ clear_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK);
+
current_ir_graph = rem;
return changed;
}
current_ir_graph = rem;
return changed;
}