handle Block_entity like other node attributes
[libfirm] / ir / be / beirgmod.c
index 5e3dcb0..0cfb3f4 100644 (file)
  * @brief       Backend IRG modification routines.
  * @author      Sebastian Hack, Daniel Grund, Matthias Braun, Christian Wuerdig
  * @date        04.05.2005
- * @version     $Id$
  *
  * This file contains the following IRG modifications for be routines:
  * - insertion of Perm nodes
  * - empty block elimination
  * - a simple dead node elimination (set inputs of unreachable nodes to BAD)
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 
 #include "iredges_t.h"
 #include "irgraph_t.h"
 #include "irgopt.h"
+#include "irgmod.h"
 #include "irprintf_t.h"
 #include "irgwalk.h"
 
 #include "be_t.h"
 #include "bechordal_t.h"
-#include "bearch_t.h"
-#include "besched_t.h"
+#include "bearch.h"
+#include "besched.h"
 #include "belive_t.h"
-#include "benode_t.h"
+#include "benode.h"
 #include "beutil.h"
 #include "beinsn_t.h"
 #include "bessaconstr.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beirgmod.h"
 #include "bemodule.h"
 
@@ -80,32 +78,29 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 */
 
-ir_node *insert_Perm_after(be_irg_t *birg,
-                                                  const arch_register_class_t *cls,
+ir_node *insert_Perm_after(ir_graph *irg, const arch_register_class_t *cls,
                                                   ir_node *pos)
 {
-       const arch_env_t *arch_env = &birg->main_env->arch_env;
-       be_lv_t *lv     = birg->lv;
+       be_lv_t *lv     = be_get_irg_liveness(irg);
        ir_node *bl     = is_Block(pos) ? pos : get_nodes_block(pos);
-       ir_graph *irg   = get_irn_irg(bl);
        ir_nodeset_t          live;
        ir_nodeset_iterator_t iter;
 
-       ir_node *curr, *irn, *perm, **nodes;
+       ir_node *irn, *perm, **nodes;
        size_t i, n;
 
        DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
 
        ir_nodeset_init(&live);
-       be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
+       be_liveness_nodes_live_at(lv, cls, pos, &live);
 
        n = ir_nodeset_size(&live);
-       if(n == 0) {
+       if (n == 0) {
                ir_nodeset_destroy(&live);
                return NULL;
        }
 
-       nodes = xmalloc(n * sizeof(nodes[0]));
+       nodes = XMALLOCN(ir_node*, n);
 
        DBG((dbg, LEVEL_1, "live:\n"));
        i = 0;
@@ -116,23 +111,20 @@ ir_node *insert_Perm_after(be_irg_t *birg,
        }
        ir_nodeset_destroy(&live);
 
-       perm = be_new_Perm(cls, irg, bl, n, nodes);
+       perm = be_new_Perm(cls, bl, n, nodes);
        sched_add_after(pos, perm);
        free(nodes);
 
-       curr = perm;
        for (i = 0; i < n; ++i) {
                ir_node *perm_op = get_irn_n(perm, i);
-               const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
+               const arch_register_t *reg = arch_get_irn_register(perm_op);
                be_ssa_construction_env_t senv;
 
                ir_mode *mode = get_irn_mode(perm_op);
-               ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
-               arch_set_irn_register(arch_env, proj, reg);
+               ir_node *proj = new_r_Proj(perm, mode, i);
+               arch_set_irn_register(proj, reg);
 
-               curr = proj;
-
-               be_ssa_construction_init(&senv, birg);
+               be_ssa_construction_init(&senv, irg);
                be_ssa_construction_add_copy(&senv, perm_op);
                be_ssa_construction_add_copy(&senv, proj);
                be_ssa_construction_fix_users(&senv, perm_op);
@@ -159,16 +151,17 @@ static void remove_empty_block(ir_node *block)
        ir_node *pred;
        ir_node *succ_block;
        ir_node *jump = NULL;
+       ir_graph *irg = get_irn_irg(block);
 
-       if (irn_visited(block))
+       if (irn_visited_else_mark(block))
                return;
 
-       mark_irn_visited(block);
        if (get_Block_n_cfgpreds(block) != 1)
                goto check_preds;
 
        sched_foreach(block, node) {
-               if (! is_Jmp(node))
+               if (! is_Jmp(node)
+                               && !(arch_get_irn_flags(node) & arch_irn_flags_simple_jump))
                        goto check_preds;
                if (jump != NULL) {
                        /* we should never have 2 jumps in a block */
@@ -187,36 +180,52 @@ static void remove_empty_block(ir_node *block)
 
                assert(succ_block == NULL);
                succ_block = get_edge_src_irn(edge);
+               if (get_Block_entity(succ_block) != NULL
+                   && get_Block_entity(block) != NULL) {
+                       /*
+                        * Currently we can add only one label for a block.
+                        * Therefore we cannot combine them if  both block already have one.
+                        */
+                       goto check_preds;
+               }
 
                set_irn_n(succ_block, pos, pred);
        }
 
+       if (get_Block_entity(block) != NULL) {
+               /* move the label to the successor block */
+               ir_entity *entity = get_Block_entity(block);
+               set_Block_entity(succ_block, entity);
+       }
+
        /* there can be some non-scheduled Pin nodes left in the block, move them
-        * to the succ block */
+        * to the succ block (Pin) or pred block (Sync) */
        foreach_out_edge_safe(block, edge, next) {
                node = get_edge_src_irn(edge);
 
-               if(node == jump)
+               if (node == jump)
                        continue;
-               if (is_Block(node)) {
-                       /* a Block->Block edge: This should be the MacroBlock
-                          edge, ignore it. */
-                       assert(get_Block_MacroBlock(node) == block && "Wrong Block->Block edge");
-                       continue;
-               }
+               /* we simply kill Pins, because there are some strange interactions
+                * between jump threading, which produce PhiMs with Pins, we simply
+                * kill the pins here, everything is scheduled anyway */
                if (is_Pin(node)) {
-                       set_nodes_block(node, succ_block);
+                       exchange(node, get_Pin_op(node));
                        continue;
                }
                if (is_Sync(node)) {
                        set_nodes_block(node, get_nodes_block(pred));
                        continue;
                }
+               if (is_End(node)) { /* End-keep, reroute it to the successor */
+                       int pos = get_edge_src_pos(edge);
+                       set_irn_n(node, pos, succ_block);
+                       continue;
+               }
                panic("Unexpected node %+F in block %+F with empty schedule", node, block);
        }
 
-       set_Block_cfgpred(block, 0, new_Bad());
-       be_kill_node(jump);
+       set_Block_cfgpred(block, 0, new_r_Bad(irg, mode_X));
+       kill_node(jump);
        blocks_removed = 1;
 
        /* check predecessor */
@@ -225,7 +234,7 @@ static void remove_empty_block(ir_node *block)
 
 check_preds:
        arity = get_Block_n_cfgpreds(block);
-       for(i = 0; i < arity; ++i) {
+       for (i = 0; i < arity; ++i) {
                ir_node *pred = get_Block_cfgpred_block(block, i);
                remove_empty_block(pred);
        }
@@ -239,31 +248,97 @@ int be_remove_empty_blocks(ir_graph *irg)
 
        blocks_removed = 0;
 
-       set_using_irn_visited(irg);
+       ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
        inc_irg_visited(irg);
        remove_empty_block(get_irg_end_block(irg));
        end   = get_irg_end(irg);
        arity = get_irn_arity(end);
-       for(i = 0; i < arity; ++i) {
+       for (i = 0; i < arity; ++i) {
                ir_node *pred = get_irn_n(end, i);
-               if(!is_Block(pred))
+               if (!is_Block(pred))
                        continue;
                remove_empty_block(pred);
        }
-       clear_using_irn_visited(irg);
+       ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
        if (blocks_removed) {
                /* invalidate analysis info */
-               set_irg_doms_inconsistent(irg);
-               set_irg_extblk_inconsistent(irg);
-               set_irg_outs_inconsistent(irg);
+               clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+                                  | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
        }
        return blocks_removed;
 }
 
+//---------------------------------------------------------------------------
+
+typedef struct remove_dead_nodes_env_t_ {
+       bitset_t *reachable;
+       ir_graph *irg;
+       be_lv_t  *lv;
+} remove_dead_nodes_env_t;
+
+/**
+ * Post-walker: remember all visited nodes in a bitset.
+ */
+static void mark_dead_nodes_walker(ir_node *node, void *data)
+{
+       remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+       bitset_set(env->reachable, get_irn_idx(node));
+}
+
+/**
+ * Post-block-walker:
+ * Walk through the schedule of every block and remove all dead nodes from it.
+ */
+static void remove_dead_nodes_walker(ir_node *block, void *data)
+{
+       remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+       ir_node                 *node, *next;
+
+       for (node = sched_first(block); ! sched_is_end(node); node = next) {
+               /* get next node now, as after calling sched_remove it will be invalid */
+               next = sched_next(node);
+
+               if (bitset_is_set(env->reachable, get_irn_idx(node)))
+                       continue;
+
+               if (env->lv != NULL)
+                       be_liveness_remove(env->lv, node);
+               sched_remove(node);
+
+               /* kill projs */
+               if (get_irn_mode(node) == mode_T) {
+                       const ir_edge_t *edge;
+                       const ir_edge_t *next_edge;
+                       foreach_out_edge_safe(node, edge, next_edge) {
+                               ir_node *proj = get_edge_src_irn(edge);
+                               if (!is_Proj(proj))
+                                       continue;
+                               if (env->lv != NULL)
+                                       be_liveness_remove(env->lv, proj);
+                               kill_node(proj);
+                       }
+               }
+               kill_node(node);
+       }
+}
+
+void be_remove_dead_nodes_from_schedule(ir_graph *irg)
+{
+       remove_dead_nodes_env_t env;
+       env.reachable = bitset_alloca(get_irg_last_idx(irg));
+       env.lv        = be_get_irg_liveness(irg);
+       env.irg       = irg;
+
+       // mark all reachable nodes
+       irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);
+
+       // walk schedule and remove non-marked nodes
+       irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod)
 void be_init_irgmod(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.irgmod");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_irgmod);