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 acebf48..499269e 100644 (file)
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -51,7 +51,8 @@
 /**
  * A wrapper around optimize_inplace_2() to be called from a walker.
  */
-static void optimize_in_place_wrapper(ir_node *n, void *env) {
+static void optimize_in_place_wrapper(ir_node *n, void *env)
+{
        ir_node *optimized = optimize_in_place_2(n);
        (void) env;
 
@@ -68,26 +69,29 @@ static void optimize_in_place_wrapper(ir_node *n, void *env) {
  *
  * @note current_ir_graph must be set
  */
-static inline void do_local_optimize(ir_node *n) {
+static inline void do_local_optimize(ir_node *n)
+{
+       ir_graph *irg = get_irn_irg(n);
+
        /* Handle graph state */
-       assert(get_irg_phase_state(current_ir_graph) != phase_building);
+       assert(get_irg_phase_state(irg) != phase_building);
 
        if (get_opt_global_cse())
-               set_irg_pinned(current_ir_graph, op_pin_state_floats);
-       set_irg_outs_inconsistent(current_ir_graph);
-       set_irg_doms_inconsistent(current_ir_graph);
-       set_irg_loopinfo_inconsistent(current_ir_graph);
+               set_irg_pinned(irg, op_pin_state_floats);
+       set_irg_outs_inconsistent(irg);
+       set_irg_doms_inconsistent(irg);
+       set_irg_loopinfo_inconsistent(irg);
 
        /* Clean the value_table in irg for the CSE. */
-       del_identities(current_ir_graph->value_table);
-       current_ir_graph->value_table = new_identities();
+       new_identities(irg);
 
        /* walk over the graph */
        irg_walk(n, firm_clear_link, optimize_in_place_wrapper, NULL);
 }
 
 /* Applies local optimizations (see iropt.h) to all nodes reachable from node n */
-void local_optimize_node(ir_node *n) {
+void local_optimize_node(ir_node *n)
+{
        ir_graph *rem = current_ir_graph;
        current_ir_graph = get_irn_irg(n);
 
@@ -99,7 +103,8 @@ void local_optimize_node(ir_node *n) {
 /**
  * Block-Walker: uses dominance depth to mark dead blocks.
  */
-static void kill_dead_blocks(ir_node *block, void *env) {
+static void kill_dead_blocks(ir_node *block, void *env)
+{
        (void) env;
 
        if (get_Block_dom_depth(block) < 0) {
@@ -107,18 +112,17 @@ 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
                 */
-               set_Block_dead(block);
+               ir_graph *irg = get_irn_irg(block);
+               exchange(block, get_irg_bad(irg));
        }
 }
 
 /* Applies local optimizations (see iropt.h) to all nodes reachable from node n. */
-void local_optimize_graph(ir_graph *irg) {
+void local_optimize_graph(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;
@@ -128,7 +132,8 @@ void local_optimize_graph(ir_graph *irg) {
  * Enqueue all users of a node to a wait queue.
  * Handles mode_T nodes.
  */
-static void enqueue_users(ir_node *n, pdeq *waitq) {
+static void enqueue_users(ir_node *n, pdeq *waitq)
+{
        const ir_edge_t *edge;
 
        foreach_out_edge(n, edge) {
@@ -148,11 +153,12 @@ static void enqueue_users(ir_node *n, pdeq *waitq) {
 
 /**
  * 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) {
-       pdeq *waitq = env;
+static void opt_walker(ir_node *n, void *env)
+{
+       pdeq *waitq = (pdeq*)env;
        ir_node *optimized;
 
        optimized = optimize_in_place_2(n);
@@ -165,7 +171,8 @@ static void opt_walker(ir_node *n, void *env) {
 }
 
 /* Applies local optimizations to all nodes in the graph until fixpoint. */
-int optimize_graph_df(ir_graph *irg) {
+int optimize_graph_df(ir_graph *irg)
+{
        pdeq     *waitq = new_pdeq();
        ir_graph *rem = current_ir_graph;
        ir_node  *end;
@@ -176,11 +183,11 @@ int optimize_graph_df(ir_graph *irg) {
        state = edges_assure(irg);
 
        if (get_opt_global_cse())
-               set_irg_pinned(current_ir_graph, op_pin_state_floats);
+               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. */
-       del_identities(irg->value_table);
-       irg->value_table = new_identities();
+       new_identities(irg);
 
        if (get_irg_dom_state(irg) == dom_consistent)
                irg_block_walk_graph(irg, NULL, kill_dead_blocks, NULL);
@@ -201,7 +208,7 @@ int optimize_graph_df(ir_graph *irg) {
 
        /* 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);
        }
@@ -218,30 +225,14 @@ int optimize_graph_df(ir_graph *irg) {
        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;
 }
 
-/**
- * Wrapper for running optimize_graph_df() as an ir_graph pass.
- */
-static int pass_wrapper(ir_graph *irg, void *context) {
-       (void)context;
-       return optimize_graph_df(irg);
-}  /* pass_wrapper */
-
 /* Creates an ir_graph pass for optimize_graph_df. */
-ir_graph_pass_t *optimize_graph_df_pass(const char *name, int verify, int dump) {
-       struct ir_graph_pass_t *pass = XMALLOCZ(ir_graph_pass_t);
-
-       pass->kind       = k_ir_prog_pass;
-       pass->run_on_irg = pass_wrapper;
-       pass->context    = pass;
-       pass->name       = name ? name : "optimize_graph_df";
-       pass->verify     = verify != 0;
-       pass->dump       = dump != 0;
-
-       INIT_LIST_HEAD(&pass->list);
-
-       return pass;
-}  /* combo_pass */
+ir_graph_pass_t *optimize_graph_df_pass(const char *name)
+{
+       return def_graph_pass_ret(name ? name : "optimize_graph_df", optimize_graph_df);
+}  /* optimize_graph_df_pass */