bechordal: assert(), instead of test, that the remaining nodes are live-in in create_...
[libfirm] / ir / be / bechordal_common.c
index 0ccb396..a179117 100644 (file)
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -108,29 +94,30 @@ void create_borders(ir_node *block, void *env_ptr)
 #define border_use(irn, step, real) \
        border_add(env, head, irn, step, ++pressure, 0, real)
 
-       be_chordal_env_t *env  = (be_chordal_env_t*)env_ptr;
-       bitset_t         *live = bitset_malloc(get_irg_last_idx(env->irg));
-       be_lv_t          *lv   = be_get_irg_liveness(env->irg);
+       be_chordal_env_t *const env = (be_chordal_env_t*)env_ptr;
 
        unsigned step = 0;
        unsigned pressure = 0;
        struct list_head *head;
 
-       bitset_clear_all(live);
-
        /* Set up the border list in the block info */
        head = OALLOC(&env->obst, struct list_head);
        INIT_LIST_HEAD(head);
        assert(pmap_get(struct list_head, env->border_heads, block) == NULL);
        pmap_insert(env->border_heads, block, head);
 
+       ir_nodeset_t live;
+       ir_nodeset_init(&live);
+
+       be_lv_t *const lv = be_get_irg_liveness(env->irg);
+
        /*
         * Make final uses of all values live out of the block.
         * They are necessary to build up real intervals.
         */
        be_lv_foreach_cls(lv, block, be_lv_state_end, env->cls, irn) {
-               DB((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_idx(irn)));
-               bitset_set(live, get_irn_idx(irn));
+               DB((dbg, LEVEL_3, "\tMaking live: %+F\n", irn));
+               ir_nodeset_insert(&live, irn);
                border_use(irn, step, 0);
        }
        ++step;
@@ -140,68 +127,41 @@ void create_borders(ir_node *block, void *env_ptr)
         * relevant for the interval borders.
         */
        sched_foreach_reverse(block, irn) {
-               DBG((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
-               DBG((dbg, LEVEL_2, "\tlive: %B\n", live));
-
-               if (get_irn_mode(irn) == mode_T) {
-                       foreach_out_edge(irn, edge) {
-                               ir_node *proj = get_edge_src_irn(edge);
-
-                               /*
-                                * If the node defines some value, which can put into a
-                                * register of the current class, make a border for it.
-                                */
-                               if (arch_irn_consider_in_reg_alloc(env->cls, proj)) {
-                                       int nr = get_irn_idx(proj);
-
-                                       bitset_clear(live, nr);
-                                       border_def(proj, step, 1);
-                               }
-                       }
-               } else {
+               DB((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
+
+               be_foreach_definition(irn, env->cls, def, req,
                        /*
                         * If the node defines some value, which can put into a
                         * register of the current class, make a border for it.
                         */
-                       if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
-                               int nr = get_irn_idx(irn);
-
-                               bitset_clear(live, nr);
-                               border_def(irn, step, 1);
-                       }
-               }
+                       ir_nodeset_remove(&live, def);
+                       border_def(def, step, 1);
+               );
 
                /*
                 * If the node is no phi node we can examine the uses.
                 */
                if (!is_Phi(irn)) {
-                       for (int i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                               ir_node *op = get_irn_n(irn, i);
-
-                               if (arch_irn_consider_in_reg_alloc(env->cls, op)) {
-                                       int nr = get_irn_idx(op);
-                                       const char *msg = "-";
+                       be_foreach_use(irn, env->cls, in_req_, op, op_req_,
+                               const char *msg = "-";
 
-                                       if (!bitset_is_set(live, nr)) {
-                                               border_use(op, step, 1);
-                                               bitset_set(live, nr);
-                                               msg = "X";
-                                       }
-
-                                       DBG((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i, op));
+                               if (ir_nodeset_insert(&live, op)) {
+                                       border_use(op, step, 1);
+                                       msg = "X";
                                }
-                       }
+
+                               DB((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i_, op));
+                       );
                }
                ++step;
        }
 
-       bitset_foreach(live, elm) {
-               ir_node *irn = get_idx_irn(env->irg, elm);
-               if (be_is_live_in(lv, block, irn))
-                       border_def(irn, step, 0);
+       foreach_ir_nodeset(&live, irn, iter) {
+               assert(be_is_live_in(lv, block, irn));
+               border_def(irn, step, 0);
        }
 
-       bitset_free(live);
+       ir_nodeset_destroy(&live);
 }
 
 ir_node *pre_process_constraints(be_chordal_env_t *env, be_insn_t **the_insn)