X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firedges.c;h=d110fbd92ea25f134aa591f77c69feff879a72e8;hb=44eb3083a03af79ddfbd85c542b11024aa88b9f5;hp=901af749d311d81277989acbd936a0e15c0eb639;hpb=0b4ffc9e2d57b0393ad86820e9415c0ccbc54549;p=libfirm diff --git a/ir/ir/iredges.c b/ir/ir/iredges.c index 901af749d..d110fbd92 100644 --- a/ir/ir/iredges.c +++ b/ir/ir/iredges.c @@ -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. */ /** @@ -22,14 +8,11 @@ * @brief Always available outs. * @author Sebastian Hack, Michael Beck, Andreas Schoesser * @date 14.1.2005 - * @version $Id$ - * @summary + * @brief * This are out-edges (also called def-use edges) that are dynamically * updated as the graph changes. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "irnode_t.h" #include "iropt_t.h" @@ -38,10 +21,11 @@ #include "irgwalk.h" #include "irdump_t.h" #include "irprintf.h" -#include "irhooks.h" #include "debug.h" #include "set.h" #include "bitset.h" +#include "error.h" +#include "irpass_t.h" #include "iredgeset.h" #include "hashptr.h" @@ -53,22 +37,25 @@ #define ValueType ir_edge_t* #define NullValue NULL #define DeletedValue ((ir_edge_t*)-1) -#define Hash(this,key) (HASH_PTR(key->src) ^ (key->pos * 40013)) +#define Hash(this,key) (hash_ptr(key->src) ^ (key->pos * 40013)) #define KeysEqual(this,key1,key2) ((key1->src) == (key2->src) && (key1->pos == key2->pos)) #define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0])) #define hashset_init ir_edgeset_init +void ir_edgeset_init_size(ir_edgeset_t *self, size_t size); #define hashset_init_size ir_edgeset_init_size #define hashset_destroy ir_edgeset_destroy #define hashset_insert ir_edgeset_insert #define hashset_remove ir_edgeset_remove +ir_edge_t *ir_edgeset_find(const ir_edgeset_t *self, const ir_edge_t*); #define hashset_find ir_edgeset_find +size_t ir_edgeset_size(const ir_edgeset_t *self); #define hashset_size ir_edgeset_size #define hashset_iterator_init ir_edgeset_iterator_init #define hashset_iterator_next ir_edgeset_iterator_next #define hashset_remove_iterator ir_edgeset_remove_iterator -#include "hashset.c" +#include "hashset.c.inl" /** * A function that allows for setting an edge. @@ -77,8 +64,15 @@ */ typedef void (set_edge_func_t)(ir_node *src, int pos, ir_node *tgt); +/** + * A function that returns the "arity" of a given edge kind + * for a node. + */ typedef int (get_edge_src_arity_func_t)(const ir_node *src); +/** + * A function that returns the pos'th edge of a given edge kind for a node. + */ typedef ir_node *(get_edge_src_n_func_t)(const ir_node *src, int pos); /** @@ -95,20 +89,28 @@ typedef struct { /** * Get the predecessor block. */ -static ir_node *get_block_n(const ir_node *irn, int pos) { - if (is_Block(irn)) - return get_Block_cfgpred_block(irn, pos); +static ir_node *get_block_n(const ir_node *block, int pos) +{ + if (is_Block(block)) + return get_Block_cfgpred_block(block, pos); /* might be a Bad */ return NULL; } +static ir_node *get_irn_safe_n(const ir_node *node, int n) +{ + if (n == -1 && is_Block(node)) + return NULL; + return get_irn_n(node, n); +} + static const ir_edge_kind_info_t edge_kind_info[EDGE_KIND_LAST] = { - { "normal" , set_irn_n, -1, get_irn_arity, get_irn_n }, - { "block succs", NULL, 0, get_irn_arity, get_block_n }, - { "dependency", set_irn_dep, 0, get_irn_deps, get_irn_dep } + { "normal" , set_irn_n, -1, get_irn_arity, get_irn_safe_n }, + { "block succs", NULL, 0, get_irn_arity, get_block_n }, + { "dependency", set_irn_dep, 0, get_irn_deps, get_irn_dep } }; -#define foreach_tgt(irn, i, n, kind) for(i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i) +#define foreach_tgt(irn, i, n, kind) for (i = edge_kind_info[kind].first_idx, n = edge_kind_info[kind].get_arity(irn); i < n; ++i) #define get_n(irn, pos, kind) (edge_kind_info[kind].get_n(irn, pos)) #define get_kind_str(kind) (edge_kind_info[kind].name) @@ -120,167 +122,60 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg;) */ static int edges_used = 0; -/** - * Summed size of all users private data - */ - -static int edges_private_size = 0; -#define EDGE_SIZE (sizeof(ir_edge_t) + edges_private_size) - /** * If set to 1, the list heads are checked every time an edge is changed. */ static int edges_dbg = 0; -#ifdef DEBUG_libfirm -/* a static variable holding the last number assigned to a new edge */ -static long last_edge_num = -1; -#endif - -static INLINE long edge_get_id(const ir_edge_t *e) { -#ifdef DEBUG_libfirm - return e->edge_nr; -#else /* DEBUG_libfirm */ - return (long)e; -#endif /* DEBUG_libfirm */ -} - -/** - * Announce to reserve extra space for each edge to be allocated. - * - * @param n: Size of the space to reserve - * - * @return Offset at which the private data will begin - * - * Several users can reserve extra space for private usage. - * Each user has to remember his given offset and the size of his private data. - * To be called before FIRM is initialized. - */ -int edges_register_private_data(size_t n) { - int res = edges_private_size; - - assert(!edges_used && "you cannot register private edge data, if edges have been initialized"); - - edges_private_size += n; - return res; -} - /** - * Reset the user's private data at offset 'offset' - * The user has to remember his offset and the size of his data! - * Caution: Using wrong values here can destroy other users private data! + * Returns an ID for the given edge. */ -void edges_reset_private_data(ir_graph *irg, int offset, size_t size) { - irg_edge_info_t *info = _get_irg_edge_info(irg, EDGE_KIND_NORMAL); - ir_edge_t *edge; - ir_edgeset_iterator_t iter; - - foreach_ir_edgeset(&info->edges, edge, iter) { - memset(edge + sizeof(*edge) + offset, 0, size); - } +static inline long edge_get_id(const ir_edge_t *e) +{ + return (long)e; } -#define TIMES37(x) (((x) << 5) + ((x) << 2) + (x)) - -#define get_irn_out_list_head(irn) (&get_irn_out_info(irn)->outs) - -#define edge_hash(edge) (TIMES37((edge)->pos) + HASH_PTR((edge)->src)) - -/** - * Initialize the out information for a graph. - * @note Dead node elimination can call this on an already initialized graph. - */ -void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) { +void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) +{ if (edges_activated_kind(irg, kind)) { - irg_edge_info_t *info = _get_irg_edge_info(irg, kind); - size_t amount = irg->estimated_node_count * 2; + irg_edge_info_t *info = get_irg_edge_info(irg, kind); + size_t amount = get_irg_last_idx(irg) * 5 / 4; edges_used = 1; - if(info->allocated) { + if (info->allocated) { amount = ir_edgeset_size(&info->edges); ir_edgeset_destroy(&info->edges); obstack_free(&info->edges_obst, NULL); } obstack_init(&info->edges_obst); + INIT_LIST_HEAD(&info->free_edges); ir_edgeset_init_size(&info->edges, amount); info->allocated = 1; } } -/** - * Get the edge object of an outgoing edge at a node. - * @param irg The graph, the node is in. - * @param src The node at which the edge originates. - * @param pos The position of the edge. - * @return The corresponding edge object or NULL, - * if no such edge exists. - */ -const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, ir_edge_kind_t kind) -{ - if (edges_activated_kind(irg, kind)) { - irg_edge_info_t *info = _get_irg_edge_info(irg, kind); - ir_edge_t key; - - key.src = (ir_node *)src; - key.pos = pos; - - return ir_edgeset_find(&info->edges, &key); - } - - return NULL; -} - -/** - * Get the edge object of an outgoing edge at a node. - * Looks for an edge for all kinds. - */ -const ir_edge_t *get_irn_edge(ir_graph *irg, const ir_node *src, int pos) { - const ir_edge_t *edge; - if((edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_NORMAL)) == NULL) - edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_BLOCK); - return(edge); -} - /** * Change the out count * * @param tgt the edge target * @param kind the kind of the edge */ -static INLINE void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs) { - irn_edge_info_t *info = _get_irn_edge_info(tgt, kind); +static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs) +{ + irn_edge_info_t *info = get_irn_edge_info(tgt, kind); info->out_count += ofs; - -#if 0 - assert(info->out_count >= 0); - if (info->out_count == 0 && kind == EDGE_KIND_NORMAL) { - /* tgt lost it's last user */ - int i; - - for (i = get_irn_arity(tgt) - 1; i >= -1; --i) { - ir_node *prev = get_irn_n(tgt, i); - - edges_notify_edge(tgt, i, NULL, prev, current_ir_graph); - } - for (i = get_irn_deps(tgt) - 1; i >= 0; --i) { - ir_node *prev = get_irn_dep(tgt, i); - - edges_notify_edge_kind(tgt, i, NULL, prev, EDGE_KIND_DEP, current_ir_graph); - - } - } -#endif } /** - * Verify the edge list of a node, ie. ensure it's a loop: + * Verify the edge list of a node, i.e. ensure it's a loop: * head -> e_1 -> ... -> e_n -> head */ -static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) { - int err = 0; - int num = 0; - pset *lh_set = pset_new_ptr(16); - const struct list_head *head = _get_irn_outs_head(irn, kind); +static inline void verify_list_head(ir_node *irn, ir_edge_kind_t kind) +{ + int err = 0; + int num = 0; + pset *lh_set = pset_new_ptr(16); + const struct list_head *head = &get_irn_edge_info(irn, kind)->outs_head; const struct list_head *pos; list_for_each(pos, head) { @@ -289,8 +184,6 @@ static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) { ir_fprintf(stderr, "EDGE Verifier: edge list broken (self loop not to head) for %+F:\n", irn); fprintf(stderr, "- at list entry %d\n", num); - if (edge->invalid) - fprintf(stderr, "- edge(%ld) is invalid\n", edge_get_id(edge)); if (edge->src) ir_fprintf(stderr, "- edge(%ld) %+F(%d)\n", edge_get_id(edge), edge->src, edge->pos); err = 1; @@ -305,57 +198,105 @@ static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) { assert(err == 0); } -/* The edge from (src, pos) -> old_tgt is redirected to tgt */ -void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, - ir_node *old_tgt, ir_edge_kind_t kind, - ir_graph *irg) +void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind) { - const char *msg = ""; irg_edge_info_t *info; ir_edgeset_t *edges; - ir_edge_t templ; - ir_edge_t *edge; - - assert(edges_activated_kind(irg, kind)); + ir_edgeset_iterator_t iter; + ir_edge_t *e; - /* - * Only do something, if the old and new target differ. - */ - if (tgt == old_tgt) + if (!edges_activated_kind(irg, kind)) return; - info = _get_irg_edge_info(irg, kind); + info = get_irg_edge_info(irg, kind); edges = &info->edges; + foreach_ir_edgeset(edges, e, iter) { + ir_printf("%+F %d\n", e->src, e->pos); + } +} + +static void add_edge(ir_node *src, int pos, ir_node *tgt, ir_edge_kind_t kind, + ir_graph *irg) +{ + assert(edges_activated_kind(irg, kind)); + irg_edge_info_t *info = get_irg_edge_info(irg, kind); + ir_edgeset_t *edges = &info->edges; + + struct list_head *head = &get_irn_edge_info(tgt, kind)->outs_head; + assert(head->next && head->prev && + "target list head must have been initialized"); + + /* The old target was NULL, thus, the edge is newly created. */ + ir_edge_t *edge; + if (list_empty(&info->free_edges)) { + edge = OALLOC(&info->edges_obst, ir_edge_t); + } else { + edge = list_entry(info->free_edges.next, ir_edge_t, list); + list_del(&edge->list); + } + + edge->src = src; + edge->pos = pos; +#ifdef DEBUG_libfirm + edge->present = 0; +#endif + + ir_edge_t *new_edge = ir_edgeset_insert(edges, edge); + assert(new_edge == edge); + (void)new_edge; + + list_add(&edge->list, head); + + edge_change_cnt(tgt, kind, +1); +} + +static void delete_edge(ir_node *src, int pos, ir_node *old_tgt, + ir_edge_kind_t kind, ir_graph *irg) +{ + assert(edges_activated_kind(irg, kind)); + + irg_edge_info_t *info = get_irg_edge_info(irg, kind); + ir_edgeset_t *edges = &info->edges; /* Initialize the edge template to search in the set. */ + ir_edge_t templ; templ.src = src; templ.pos = pos; - /* - * If the target is NULL, the edge shall be deleted. - */ - if (tgt == NULL) { - /* search the edge in the set. */ - edge = ir_edgeset_find(edges, &templ); - - /* mark the edge invalid if it was found */ - if (edge) { - msg = "deleting"; - list_del(&edge->list); - edge->invalid = 1; - edge->pos = -2; - edge->src = NULL; -#ifdef DEBUG_libfirm - edge->edge_nr = -1; -#endif /* DEBUG_libfirm */ - edge_change_cnt(old_tgt, kind, -1); - } + /* search the edge in the set. */ + ir_edge_t *edge = ir_edgeset_find(edges, &templ); - /* If the edge was not found issue a warning on the debug stream */ - else { - msg = "edge to delete not found!\n"; - } - } /* if */ + /* mark the edge invalid if it was found */ + if (edge == NULL) + return; + + list_del(&edge->list); + ir_edgeset_remove(edges, edge); + list_add(&edge->list, &info->free_edges); + edge->pos = -2; + edge->src = NULL; + edge_change_cnt(old_tgt, kind, -1); +} + +void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, + ir_node *old_tgt, ir_edge_kind_t kind, + ir_graph *irg) +{ + if (old_tgt == NULL) { + add_edge(src, pos, tgt, kind, irg); + return; + } else if (tgt == NULL) { + delete_edge(src, pos, old_tgt, kind, irg); + return; + } + + /* Only do something, if the old and new target differ. */ + if (tgt == old_tgt) + return; + + assert(edges_activated_kind(irg, kind)); + irg_edge_info_t *info = get_irg_edge_info(irg, kind); + ir_edgeset_t *edges = &info->edges; /* * The target is not NULL and the old target differs @@ -363,84 +304,61 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, * old target was != NULL) or added (if the old target was * NULL). */ - else { - struct list_head *head = _get_irn_outs_head(tgt, kind); - - assert(head->next && head->prev && - "target list head must have been initialized"); - - /* If the old target is not null, the edge is moved. */ - if (old_tgt) { - edge = ir_edgeset_find(edges, &templ); - assert(edge && "edge to redirect not found!"); - assert(! edge->invalid && "Invalid edge encountered"); - - msg = "redirecting"; + struct list_head *head = &get_irn_edge_info(tgt, kind)->outs_head; - list_move(&edge->list, head); - edge_change_cnt(old_tgt, kind, -1); - } - - /* The old target was null, thus, the edge is newly created. */ - else { - ir_edge_t *new_edge; - ir_edge_t *edge - = obstack_alloc(&info->edges_obst, EDGE_SIZE); - memset(edge, 0, EDGE_SIZE); - edge->src = src; - edge->pos = pos; - edge->kind = kind; - DEBUG_ONLY(edge->src_nr = get_irn_node_nr(src)); - - new_edge = ir_edgeset_insert(edges, edge); - if(new_edge != edge) { - obstack_free(&info->edges_obst, edge); - } + assert(head->next && head->prev && + "target list head must have been initialized"); - assert(! edge->invalid && "Freshly inserted edge is invalid?!?"); - assert(edge->list.next == NULL && edge->list.prev == NULL && - "New edge must not have list head initialized"); + /* Initialize the edge template to search in the set. */ + ir_edge_t templ; + templ.src = src; + templ.pos = pos; - msg = "adding"; - list_add(&edge->list, head); -#ifdef DEBUG_libfirm - edge->edge_nr = ++last_edge_num; -#endif /* DEBUG_libfirm */ - } + ir_edge_t *edge = ir_edgeset_find(edges, &templ); + assert(edge && "edge to redirect not found!"); - edge_change_cnt(tgt, kind, +1); - } /* else */ + list_move(&edge->list, head); + edge_change_cnt(old_tgt, kind, -1); + edge_change_cnt(tgt, kind, +1); #ifndef DEBUG_libfirm /* verify list heads */ if (edges_dbg) { if (tgt) - vrfy_list_head(tgt, kind); + verify_list_head(tgt, kind); if (old_tgt) - vrfy_list_head(old_tgt, kind); + verify_list_head(old_tgt, kind); } #endif - - DBG((dbg, LEVEL_5, "announce out edge: %+F %d-> %+F(%+F): %s\n", src, pos, tgt, old_tgt, msg)); } -void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir_graph *irg) +void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, + ir_graph *irg) { if (edges_activated_kind(irg, EDGE_KIND_NORMAL)) { edges_notify_edge_kind(src, pos, tgt, old_tgt, EDGE_KIND_NORMAL, irg); } - if (edges_activated_kind(irg, EDGE_KIND_BLOCK) && is_Block(src)) { - if (pos == -1) { - /* a MacroBlock edge: ignore it here */ - } else { - ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL; + if (edges_activated_kind(irg, EDGE_KIND_BLOCK)) { + if (is_Block(src)) { + ir_node *bl_old = old_tgt ? get_nodes_block(old_tgt) : NULL; ir_node *bl_tgt = NULL; if (tgt) - bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt)); + bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(tgt); edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg); + } else if (get_irn_mode(src) == mode_X && old_tgt != NULL && is_Block(old_tgt)) { + /* moving a jump node from one block to another */ + foreach_out_edge_kind_safe(old_tgt, edge, EDGE_KIND_BLOCK) { + ir_node *succ = get_edge_src_irn(edge); + int succ_pos = get_edge_src_pos(edge); + ir_node *block_pred = get_Block_cfgpred(succ, succ_pos); + if (block_pred != src) + continue; + edges_notify_edge_kind(succ, succ_pos, tgt, old_tgt, + EDGE_KIND_BLOCK, irg); + } } } } @@ -452,9 +370,10 @@ void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir * @param kind the kind of edges to remove * @param irg the irg of the old node */ -static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph *irg) +static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind) { int i, n; + ir_graph *irg = get_irn_irg(old); if (!edges_activated_kind(irg, kind)) return; @@ -463,44 +382,75 @@ static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph foreach_tgt(old, i, n, kind) { ir_node *old_tgt = get_n(old, i, kind); - edges_notify_edge_kind(old, i, NULL, old_tgt, kind, irg); + delete_edge(old, i, old_tgt, kind, irg); + } +} + +/** + * A node might be revivaled by CSE. Assure its edges. + * + * @param irn the node + * @param kind the kind of edges to remove + * @param irg the irg of the old node + */ +static void edges_node_revival_kind(ir_node *irn, ir_edge_kind_t kind) +{ + irn_edge_info_t *info; + int i, n; + ir_graph *irg = get_irn_irg(irn); + + if (!edges_activated_kind(irg, kind)) + return; + + info = get_irn_edge_info(irn, kind); + if (info->edges_built) + return; + + DBG((dbg, LEVEL_5, "node revivaled (kind: %s): %+F\n", get_kind_str(kind), irn)); + + foreach_tgt(irn, i, n, kind) { + ir_node *tgt = get_n(irn, i, kind); + add_edge(irn, i, tgt, kind, irg); } + info->edges_built = 1; } -struct build_walker { - ir_graph *irg; +typedef struct build_walker { ir_edge_kind_t kind; bitset_t *reachable; unsigned problem_found; -}; +} build_walker; /** * Post-Walker: notify all edges */ -static void build_edges_walker(ir_node *irn, void *data) { - struct build_walker *w = data; +static void build_edges_walker(ir_node *irn, void *data) +{ + build_walker *w = (build_walker*)data; int i, n; ir_edge_kind_t kind = w->kind; - ir_graph *irg = w->irg; - get_edge_src_n_func_t *get_n; + ir_graph *irg = get_irn_irg(irn); - get_n = edge_kind_info[kind].get_n; foreach_tgt(irn, i, n, kind) { ir_node *pred = get_n(irn, i, kind); - edges_notify_edge_kind(irn, i, pred, NULL, kind, irg); + if (pred != NULL) + add_edge(irn, i, pred, kind, irg); } + get_irn_edge_info(irn, kind)->edges_built = 1; } /** * Pre-Walker: initializes the list-heads and set the out-count * of all nodes to 0. */ -static void init_lh_walker(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edge_kind_t kind = w->kind; - list_head *head = _get_irn_outs_head(irn, kind); +static void init_lh_walker(ir_node *irn, void *data) +{ + build_walker *w = (build_walker*)data; + ir_edge_kind_t kind = w->kind; + list_head *head = &get_irn_edge_info(irn, kind)->outs_head; INIT_LIST_HEAD(head); - _get_irn_edge_info(irn, kind)->out_count = 0; + get_irn_edge_info(irn, kind)->edges_built = 0; + get_irn_edge_info(irn, kind)->out_count = 0; } /** @@ -514,22 +464,25 @@ static void init_lh_walker(ir_node *irn, void *data) { * b) it might be sufficient to add those stupid NO_REG nodes * to the anchor */ -static void init_lh_walker_dep(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edge_kind_t kind = w->kind; - list_head *head = _get_irn_outs_head(irn, kind); - int i; +static void init_lh_walker_dep(ir_node *irn, void *data) +{ + build_walker *w = (build_walker*)data; + ir_edge_kind_t kind = w->kind; + list_head *head = &get_irn_edge_info(irn, kind)->outs_head; + int i; INIT_LIST_HEAD(head); - _get_irn_edge_info(irn, kind)->out_count = 0; + get_irn_edge_info(irn, kind)->edges_built = 0; + get_irn_edge_info(irn, kind)->out_count = 0; for (i = get_irn_deps(irn) - 1; i >= 0; --i) { ir_node *dep = get_irn_dep(irn, i); - head = _get_irn_outs_head(dep, kind); + head = &get_irn_edge_info(dep, kind)->outs_head; INIT_LIST_HEAD(head); - _get_irn_edge_info(dep, kind)->out_count = 0; + get_irn_edge_info(dep, kind)->edges_built = 0; + get_irn_edge_info(dep, kind)->out_count = 0; } } @@ -542,48 +495,54 @@ typedef struct visitor_info_t { * Visitor: initializes the list-heads and set the out-count * of all nodes to 0 of nodes that are not seen so far. */ -static void visitor(ir_node *irn, void *data) { - visitor_info_t *info = data; +static void visitor(ir_node *irn, void *data) +{ + visitor_info_t *info = (visitor_info_t*)data; + + if (is_Deleted(irn)) + return; + if (!is_Block(irn) && is_Deleted(get_nodes_block(irn))) + return; - if (!irn_visited(irn)) { - mark_irn_visited(irn); + if (!irn_visited_else_mark(irn)) { info->visit(irn, info->data); } } -/* - * Build the initial edge set. - * Beware, this is not a simple task because it suffers from two - * difficulties: - * - the anchor set allows access to Nodes that may not be reachable from - * the End node - * - the identities add nodes to the "root set" that are not yet reachable - * from End. However, after some transformations, the CSE may revival these - * nodes - * - * These problems can be fixed using different strategies: - * - Add an age flag to every node. Whenever the edge of a node is older - * then the current edge, invalidate the edges of this node. - * While this would help for revivaled nodes, it increases memory and runtime. - * - Delete the identities set. - * Solves the revival problem, but may increase the memory consumption, as - * nodes cannot be revivaled at all. - * - Manually iterate over the identities root set. This did not consume more memory - * but increase the computation time because the |identities| >= |V| - * - * Currently, we use the last option. - */ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) { + /* + * Build the initial edge set. + * Beware, this is not a simple task because it suffers from two + * difficulties: + * - the anchor set allows access to Nodes that may not be reachable from + * the End node + * - the identities add nodes to the "root set" that are not yet reachable + * from End. However, after some transformations, the CSE may revival these + * nodes + * + * These problems can be fixed using different strategies: + * - Add an age flag to every node. Whenever the edge of a node is older + * then the current edge, invalidate the edges of this node. + * While this would help for revivaled nodes, it increases memory and runtime. + * - Delete the identities set. + * Solves the revival problem, but may increase the memory consumption, as + * nodes cannot be revivaled at all. + * - Manually iterate over the identities root set. This did not consume more memory + * but increase the computation time because the |identities| >= |V| + * + * Currently, we use the last option. + */ struct build_walker w; - irg_edge_info_t *info = _get_irg_edge_info(irg, kind); + irg_edge_info_t *info = get_irg_edge_info(irg, kind); visitor_info_t visit; - w.irg = irg; w.kind = kind; visit.data = &w; + assert(!info->activated); + info->activated = 1; edges_init_graph_kind(irg, kind); if (kind == EDGE_KIND_DEP) { @@ -593,15 +552,15 @@ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) visit_all_identities(irg, visitor, &visit); irg_walk_anchors(irg, NULL, build_edges_walker, &w); } else { - irg_walk_anchors(irg, init_lh_walker, build_edges_walker, &w); visit.visit = init_lh_walker; visit_all_identities(irg, visitor, &visit); + irg_walk_anchors(irg, init_lh_walker, build_edges_walker, &w); } } void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind) { - irg_edge_info_t *info = _get_irg_edge_info(irg, kind); + irg_edge_info_t *info = get_irg_edge_info(irg, kind); info->activated = 0; if (info->allocated) { @@ -609,27 +568,26 @@ void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind) ir_edgeset_destroy(&info->edges); info->allocated = 0; } + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES); } int (edges_activated_kind)(const ir_graph *irg, ir_edge_kind_t kind) { - return _edges_activated_kind(irg, kind); + return edges_activated_kind_(irg, kind); } +int (edges_activated)(const ir_graph *irg) +{ + return edges_activated_(irg); +} -/** - * Reroute all use-edges from a node to another. - * @param from The node whose use-edges shall be withdrawn. - * @param to The node to which all the use-edges of @p from shall be - * sent to. - * @param irg The graph. - */ -void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_graph *irg) +void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind) { + ir_graph *irg = get_irn_irg(from); set_edge_func_t *set_edge = edge_kind_info[kind].set_edge; - if(set_edge && edges_activated_kind(irg, kind)) { - struct list_head *head = _get_irn_outs_head(from, kind); + if (set_edge && edges_activated_kind(irg, kind)) { + struct list_head *head = &get_irn_edge_info(from, kind)->outs_head; DBG((dbg, LEVEL_5, "reroute from %+F to %+F\n", from, to)); @@ -641,10 +599,27 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap } } +void edges_reroute(ir_node *from, ir_node *to) +{ + edges_reroute_kind(from, to, EDGE_KIND_NORMAL); +} + +void edges_reroute_except(ir_node *from, ir_node *to, ir_node *exception) +{ + foreach_out_edge_safe(from, edge) { + ir_node *src = get_edge_src_irn(edge); + if (src == exception) + continue; + set_irn_n(src, edge->pos, to); + } +} + +#ifdef DEBUG_libfirm static void verify_set_presence(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edgeset_t *edges = &_get_irg_edge_info(w->irg, w->kind)->edges; + build_walker *w = (build_walker*)data; + ir_graph *irg = get_irn_irg(irn); + ir_edgeset_t *edges = &get_irg_edge_info(irg, w->kind)->edges; int i, n; foreach_tgt(irn, i, n, w->kind) { @@ -654,37 +629,28 @@ static void verify_set_presence(ir_node *irn, void *data) templ.pos = i; e = ir_edgeset_find(edges, &templ); - if(e != NULL) { + if (e != NULL) { e->present = 1; } else { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge %+F,%d -> %+F (kind: \"%s\") is missing\n", - irn, i, get_n(irn, i, w->kind), get_kind_str(w->kind)); -#endif } } } static void verify_list_presence(ir_node *irn, void *data) { - struct build_walker *w = data; - const ir_edge_t *e; + build_walker *w = (build_walker*)data; bitset_set(w->reachable, get_irn_idx(irn)); /* check list heads */ - vrfy_list_head(irn, w->kind); + verify_list_head(irn, w->kind); foreach_out_edge_kind(irn, e, w->kind) { ir_node *tgt; if (w->kind == EDGE_KIND_NORMAL && get_irn_arity(e->src) <= e->pos) { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F -> %+F recorded at src position %d, but src has arity %d\n", - edge_get_id(e), e->src, irn, e->pos, get_irn_arity(e->src)); -#endif continue; } @@ -692,22 +658,19 @@ static void verify_list_presence(ir_node *irn, void *data) if (irn != tgt) { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F,%d (kind \"%s\") is no out edge of %+F but of %+F\n", - edge_get_id(e), e->src, e->pos, get_kind_str(w->kind), irn, tgt); -#endif } } } +#endif int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) { +#ifdef DEBUG_libfirm struct build_walker w; - ir_edgeset_t *edges = &_get_irg_edge_info(irg, kind)->edges; + ir_edgeset_t *edges = &get_irg_edge_info(irg, kind)->edges; ir_edge_t *e; ir_edgeset_iterator_t iter; - w.irg = irg; w.kind = kind; w.reachable = bitset_alloca(get_irg_last_idx(irg)); w.problem_found = 0; @@ -725,13 +688,18 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) * edge set is wrong. */ foreach_ir_edgeset(edges, e, iter) { - if (! e->invalid && ! e->present && bitset_is_set(w.reachable, get_irn_idx(e->src))) { + if (! e->present && bitset_is_set(w.reachable, get_irn_idx(e->src))) { w.problem_found = 1; ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F,%d is superfluous\n", edge_get_id(e), e->src, e->pos); } } return w.problem_found; +#else + (void)irg; + (void)kind; + return 0; +#endif } #define IGNORE_NODE(irn) (is_Bad((irn)) || is_Block((irn))) @@ -739,31 +707,35 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) /** * Clear link field of all nodes. */ -static void clear_links(ir_node *irn, void *env) { - struct build_walker *w = env; - bitset_t *bs; +static void clear_links(ir_node *irn, void *env) +{ + bitset_t *bs; + ir_graph *irg; + (void) env; if (IGNORE_NODE(irn)) { set_irn_link(irn, NULL); return; } - bs = bitset_malloc(get_irg_last_idx(w->irg)); + irg = get_irn_irg(irn); + bs = bitset_malloc(get_irg_last_idx(irg)); set_irn_link(irn, bs); } /** * Increases count (stored in link field) for all operands of a node. */ -static void count_user(ir_node *irn, void *env) { +static void count_user(ir_node *irn, void *env) +{ int i; int first; (void) env; - first = -1; + first = is_Block(irn) ? 0 : -1; for (i = get_irn_arity(irn) - 1; i >= first; --i) { ir_node *op = get_irn_n(irn, i); - bitset_t *bs = get_irn_link(op); + bitset_t *bs = (bitset_t*)get_irn_link(op); if (bs) bitset_set(bs, get_irn_idx(irn)); @@ -773,36 +745,31 @@ static void count_user(ir_node *irn, void *env) { /** * Verifies if collected count, number of edges in list and stored edge count are in sync. */ -static void verify_edge_counter(ir_node *irn, void *env) { - struct build_walker *w = env; - bitset_t *bs; - int list_cnt; - int ref_cnt; - int edge_cnt; - unsigned long idx; - const struct list_head *head; - const struct list_head *pos; - +static void verify_edge_counter(ir_node *irn, void *env) +{ + build_walker *w = (build_walker*)env; if (IGNORE_NODE(irn)) return; - bs = get_irn_link(irn); - list_cnt = 0; - ref_cnt = 0; - edge_cnt = _get_irn_edge_info(irn, EDGE_KIND_NORMAL)->out_count; - head = _get_irn_outs_head(irn, EDGE_KIND_NORMAL); + bitset_t *bs = (bitset_t*)get_irn_link(irn); + int list_cnt = 0; + int edge_cnt = get_irn_edge_info(irn, EDGE_KIND_NORMAL)->out_count; + const struct list_head *head + = &get_irn_edge_info(irn, EDGE_KIND_NORMAL)->outs_head; /* We can iterate safely here, list heads have already been verified. */ + const struct list_head *pos; list_for_each(pos, head) { ++list_cnt; } /* check all nodes that reference us and count edges that point number * of ins that actually point to us */ - ref_cnt = 0; + ir_graph *irg = get_irn_irg(irn); + int ref_cnt = 0; bitset_foreach(bs, idx) { int i, arity; - ir_node *src = get_idx_irn(w->irg, idx); + ir_node *src = get_idx_irn(irg, idx); arity = get_irn_arity(src); for (i = 0; i < arity; ++i) { @@ -822,42 +789,19 @@ static void verify_edge_counter(ir_node *irn, void *env) { w->problem_found = 1; ir_fprintf(stderr, "Edge Verifier: %+F reachable by %d node(s), but the list contains %d edge(s)\n", irn, ref_cnt, list_cnt); - - /* Matze: buggy if a node has multiple ins pointing at irn */ -#if 0 - list_for_each(pos, head) { - ir_edge_t *edge = list_entry(pos, ir_edge_t, list); - bitset_flip(bs, get_irn_idx(edge->src)); - } - - if (ref_cnt < list_cnt) - fprintf(stderr," following nodes are recorded in list, but not as user:\n"); - else - fprintf(stderr," following nodes are user, but not recorded in list:\n"); - - fprintf(stderr," "); - bitset_foreach(bs, idx) { - ir_node *src = get_idx_irn(w->irg, idx); - ir_fprintf(stderr, " %+F", src); - } - fprintf(stderr, "\n"); -#endif } bitset_free(bs); } -/** - * Verifies the out edges of an irg. - */ -int edges_verify(ir_graph *irg) { +int edges_verify(ir_graph *irg) +{ struct build_walker w; int problem_found = 0; /* verify normal edges only */ problem_found = edges_verify_kind(irg, EDGE_KIND_NORMAL); - w.irg = irg; w.kind = EDGE_KIND_NORMAL; w.problem_found = 0; @@ -868,97 +812,169 @@ int edges_verify(ir_graph *irg) { return problem_found ? 1 : w.problem_found; } -void init_edges(void) { - FIRM_DBG_REGISTER(dbg, DBG_EDGES); - /* firm_dbg_set_mask(dbg, -1); */ +typedef struct pass_t { + ir_graph_pass_t pass; + unsigned assert_on_problem; +} pass_t; + +/** + * Wrapper to edges_verify to be run as an ir_graph pass. + */ +static int edges_verify_wrapper(ir_graph *irg, void *context) +{ + pass_t *pass = (pass_t*)context; + int problems_found = edges_verify(irg); + /* do NOT rerun the pass if verify is ok :-) */ + assert(problems_found && pass->assert_on_problem); + return 0; +} + +ir_graph_pass_t *irg_verify_edges_pass(const char *name, unsigned assert_on_problem) +{ + pass_t *pass = XMALLOCZ(pass_t); + + def_graph_pass_constructor( + &pass->pass, name ? name : "edges_verify", edges_verify_wrapper); + + /* neither dump nor verify */ + pass->pass.dump_irg = (DUMP_ON_IRG_FUNC)ir_prog_no_dump; + pass->pass.verify_irg = (RUN_ON_IRG_FUNC)ir_prog_no_verify; + + pass->assert_on_problem = assert_on_problem; + return &pass->pass; +} + +void init_edges(void) +{ + FIRM_DBG_REGISTER(dbg, "firm.ir.edges"); } -void edges_init_dbg(int do_dbg) { +void edges_init_dbg(int do_dbg) +{ edges_dbg = do_dbg; } -void edges_activate(ir_graph *irg) { +void edges_activate(ir_graph *irg) +{ edges_activate_kind(irg, EDGE_KIND_NORMAL); edges_activate_kind(irg, EDGE_KIND_BLOCK); - if (get_irg_phase_state(irg) == phase_backend) - edges_activate_kind(irg, EDGE_KIND_DEP); + edges_activate_kind(irg, EDGE_KIND_DEP); } -void edges_deactivate(ir_graph *irg) { - if (get_irg_phase_state(irg) == phase_backend) - edges_deactivate_kind(irg, EDGE_KIND_DEP); +void edges_deactivate(ir_graph *irg) +{ + edges_deactivate_kind(irg, EDGE_KIND_DEP); edges_deactivate_kind(irg, EDGE_KIND_BLOCK); edges_deactivate_kind(irg, EDGE_KIND_NORMAL); } -int edges_assure(ir_graph *irg) { - int activated = edges_activated(irg); - - if (!activated) - edges_activate(irg); - - return activated; +void assure_edges(ir_graph *irg) +{ + assure_edges_kind(irg, EDGE_KIND_BLOCK); + assure_edges_kind(irg, EDGE_KIND_NORMAL); + assure_edges_kind(irg, EDGE_KIND_DEP); + add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES); } -int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) { - int activated = edges_activated_kind(irg, kind); - - if (!activated) +void assure_edges_kind(ir_graph *irg, ir_edge_kind_t kind) +{ + if (!edges_activated_kind(irg, kind)) edges_activate_kind(irg, kind); +} - return activated; +void edges_node_deleted(ir_node *irn) +{ + edges_node_deleted_kind(irn, EDGE_KIND_NORMAL); + edges_node_deleted_kind(irn, EDGE_KIND_BLOCK); + edges_node_deleted_kind(irn, EDGE_KIND_DEP); } -void edges_node_deleted(ir_node *irn, ir_graph *irg) { - edges_node_deleted_kind(irn, EDGE_KIND_NORMAL, irg); - edges_node_deleted_kind(irn, EDGE_KIND_BLOCK, irg); +void edges_node_revival(ir_node *irn) +{ + edges_node_revival_kind(irn, EDGE_KIND_NORMAL); + edges_node_revival_kind(irn, EDGE_KIND_BLOCK); } +const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t kind) +{ + return get_irn_out_edge_first_kind_(irn, kind); +} -const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t kind) { - return _get_irn_out_edge_first_kind(irn, kind); +const ir_edge_t *(get_irn_out_edge_first)(const ir_node *irn) +{ + return get_irn_out_edge_first_kind_(irn, EDGE_KIND_NORMAL); } -const ir_edge_t *(get_irn_out_edge_next)(const ir_node *irn, const ir_edge_t *last) { - return _get_irn_out_edge_next(irn, last); +const ir_edge_t *(get_block_succ_first)(const ir_node *block) +{ + return get_irn_out_edge_first_kind_(block, EDGE_KIND_BLOCK); } -ir_node *(get_edge_src_irn)(const ir_edge_t *edge) { - return _get_edge_src_irn(edge); +const ir_edge_t *(get_irn_out_edge_next)(const ir_node *irn, const ir_edge_t *last, ir_edge_kind_t kind) +{ + return get_irn_out_edge_next_(irn, last, kind); } -int (get_edge_src_pos)(const ir_edge_t *edge) { - return _get_edge_src_pos(edge); +ir_node *(get_edge_src_irn)(const ir_edge_t *edge) +{ + return get_edge_src_irn_(edge); } -int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind) { - return _get_irn_n_edges_kind(irn, kind); +int (get_edge_src_pos)(const ir_edge_t *edge) +{ + return get_edge_src_pos_(edge); } -void dump_all_out_edges(ir_node *irn) { - int i; - for (i = 0; i < EDGE_KIND_LAST; ++i) { - const ir_edge_t *edge; +int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind) +{ + return get_irn_n_edges_kind_(irn, kind); +} - printf("kind \"%s\"\n", get_kind_str(i)); - foreach_out_edge_kind(irn, edge, i) { - ir_printf("\t%+F(%d)\n", edge->src, edge->pos); - } +static void irg_walk_edges2(ir_node *node, irg_walk_func *pre, + irg_walk_func *post, void *env) +{ + if (irn_visited_else_mark(node)) + return; + + if (pre != NULL) + pre(node, env); + + foreach_out_edge_kind_safe(node, edge, EDGE_KIND_NORMAL) { + /* find the corresponding successor block. */ + ir_node *pred = get_edge_src_irn(edge); + irg_walk_edges2(pred, pre, post, env); } + + if (post != NULL) + post(node, env); } -static void irg_block_edges_walk2(ir_node *bl, - irg_walk_func *pre, irg_walk_func *post, - void *env) { - const ir_edge_t *edge, *next; +void irg_walk_edges(ir_node *node, irg_walk_func *pre, irg_walk_func *post, + void *env) +{ + ir_graph *irg = get_irn_irg(node); + assert(edges_activated(irg)); + assert(is_Block(node)); + + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); + + inc_irg_visited(irg); + irg_walk_edges2(node, pre, post, env); + + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED); +} + +static void irg_block_edges_walk2(ir_node *bl, irg_walk_func *pre, + irg_walk_func *post, void *env) +{ if (!Block_block_visited(bl)) { mark_Block_block_visited(bl); if (pre) pre(bl, env); - foreach_out_edge_kind_safe(bl, edge, next, EDGE_KIND_BLOCK) { + foreach_out_edge_kind_safe(bl, edge, EDGE_KIND_BLOCK) { /* find the corresponding successor block. */ ir_node *pred = get_edge_src_irn(edge); irg_block_edges_walk2(pred, pre, post, env); @@ -969,17 +985,18 @@ static void irg_block_edges_walk2(ir_node *bl, } } -void irg_block_edges_walk(ir_node *node, - irg_walk_func *pre, irg_walk_func *post, - void *env) { +void irg_block_edges_walk(ir_node *node, irg_walk_func *pre, + irg_walk_func *post, void *env) +{ + ir_graph *irg = get_irn_irg(node); - assert(edges_activated(current_ir_graph)); + assert(edges_activated(irg)); assert(is_Block(node)); - ir_reserve_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED); + ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED); - inc_irg_block_visited(current_ir_graph); + inc_irg_block_visited(irg); irg_block_edges_walk2(node, pre, post, env); - ir_free_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED); + ir_free_resources(irg, IR_RESOURCE_BLOCK_VISITED); }