X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firedges.c;h=73a52146133f206f5a23e46e6f7400f4933a3135;hb=202b43933e0cc0b71cc7fbe2b092b94efb7fd30e;hp=963f6a2b77a02e3fc100c02d28c47f35492d275b;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm diff --git a/ir/ir/iredges.c b/ir/ir/iredges.c index 963f6a2b7..73a521461 100644 --- a/ir/ir/iredges.c +++ b/ir/ir/iredges.c @@ -1,31 +1,33 @@ /* - * Project: libFIRM - * File name: ir/ir/iredges.c - * Purpose: Always available outs. - * Author: Sebastian Hack - * Modified by: Michael Beck, Andreas Schoesser - * Created: 14.1.2005 - * CVS-ID: $Id$ - * Copyright: (c) 1998-2006 Universität Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + * 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. */ /** - * Always available outs. - * @author Sebastian Hack - * @date 14.1.2005 + * @file + * @brief Always available outs. + * @author Sebastian Hack, Michael Beck, Andreas Schoesser + * @date 14.1.2005 + * @version $Id$ + * @summary + * 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 - -#ifdef HAVE_ALLOCA_H -#include -#endif -#ifdef HAVE_MALLOC_H -#include -#endif #include "irnode_t.h" #include "iropt_t.h" @@ -34,57 +36,77 @@ #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 "iredgeset.h" +#include "hashptr.h" + +#define DO_REHASH +#define SCALAR_RETURN +#define HashSet ir_edgeset_t +#define HashSetIterator ir_edgeset_iterator_t +#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 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 +#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 +#define hashset_find ir_edgeset_find +#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" /** -* A function that allows for setting an edge. -* This abstraction is necessary since different edge kind have -* different methods of setting edges. -*/ + * A function that allows for setting an edge. + * This abstraction is necessary since different edge kind have + * different methods of setting edges. + */ typedef void (set_edge_func_t)(ir_node *src, int pos, ir_node *tgt); typedef int (get_edge_src_arity_func_t)(const ir_node *src); -typedef int (get_edge_src_first_func_t)(const ir_node *src); - typedef ir_node *(get_edge_src_n_func_t)(const ir_node *src, int pos); /** -* Additional data for an edge kind. -*/ + * Additional data for an edge kind. + */ typedef struct { - const char *name; - set_edge_func_t *set_edge; - get_edge_src_first_func_t *get_first; - get_edge_src_arity_func_t *get_arity; - get_edge_src_n_func_t *get_n; + const char *name; /**< name of this edge kind */ + set_edge_func_t *set_edge; /**< the set_edge function */ + int first_idx; /**< index of the first possible edge */ + get_edge_src_arity_func_t *get_arity; /**< the get_arity function */ + get_edge_src_n_func_t *get_n; /**< the get_n function */ } ir_edge_kind_info_t; -static int get_zero(const ir_node *irn) -{ - return 0; -} - -static int get_irn_first(const ir_node *irn) -{ - return 0 - !is_Block(irn); -} - -static ir_node *get_block_n(const ir_node *irn, int pos) -{ - return is_Block(irn) ? get_Block_cfgpred_block((ir_node *) irn, pos) : 0; +/** + * 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); + /* might be a Bad */ + return NULL; } static const ir_edge_kind_info_t edge_kind_info[EDGE_KIND_LAST] = { - { "normal" , set_irn_n, get_irn_first, get_irn_arity, get_irn_n }, - { "block succs", NULL, get_zero, get_irn_arity, get_block_n }, - { "dependency", set_irn_dep, get_zero, get_irn_deps, get_irn_dep } + { "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 } }; -#define foreach_tgt(irn, i, n, kind) for(i = edge_kind_info[kind].get_first(irn), 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) @@ -113,7 +135,7 @@ static int edges_dbg = 0; static long last_edge_num = -1; #endif -static INLINE long edge_get_id(const ir_edge_t *e) { +static inline long edge_get_id(const ir_edge_t *e) { #ifdef DEBUG_libfirm return e->edge_nr; #else /* DEBUG_libfirm */ @@ -123,14 +145,16 @@ static INLINE long edge_get_id(const ir_edge_t *e) { /** * Announce to reserve extra space for each edge to be allocated. - * @Param n: Size of the space to reserve - * @ Returns: Offset at which the private data will begin + * + * @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 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"); @@ -139,19 +163,17 @@ int edges_register_private_data(size_t 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! */ +void edges_reset_private_data(ir_graph *irg, int offset, unsigned size) { + irg_edge_info_t *info = _get_irg_edge_info(irg, EDGE_KIND_NORMAL); + ir_edge_t *edge; + ir_edgeset_iterator_t iter; -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; - - foreach_set(info->edges, edge) - { + foreach_ir_edgeset(&info->edges, edge, iter) { memset(edge + sizeof(*edge) + offset, 0, size); } } @@ -160,37 +182,27 @@ void edges_reset_private_data(ir_graph *irg, int offset, size_t size) #define get_irn_out_list_head(irn) (&get_irn_out_info(irn)->outs) -static int edge_cmp(const void *p1, const void *p2, size_t len) -{ - const ir_edge_t *e1 = p1; - const ir_edge_t *e2 = p2; - - if(e1->src != e2->src) - return 1; - if(e1->pos != e1->pos) - return 1; - - return 0; -} - #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) -{ - if(edges_activated_kind(irg, 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); - int amount = 2048; + size_t amount = irg->estimated_node_count * 2; edges_used = 1; - if(info->edges) { - amount = set_count(info->edges); - del_set(info->edges); + if(info->allocated) { + amount = ir_edgeset_size(&info->edges); + ir_edgeset_destroy(&info->edges); + obstack_free(&info->edges_obst, NULL); } - info->edges = new_set(edge_cmp, amount); + obstack_init(&info->edges_obst); + INIT_LIST_HEAD(&info->free_edges); + ir_edgeset_init_size(&info->edges, amount); + info->allocated = 1; } } @@ -210,7 +222,8 @@ const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, i key.src = (ir_node *)src; key.pos = pos; - return set_find(info->edges, &key, EDGE_SIZE, edge_hash(&key)); + + return ir_edgeset_find(&info->edges, &key); } return NULL; @@ -220,9 +233,7 @@ const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, i * 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 *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); @@ -231,17 +242,40 @@ const ir_edge_t *get_irn_edge(ir_graph *irg, const ir_node *src, int pos) /** * 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) { +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: * head -> e_1 -> ... -> e_n -> head */ -static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) { +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); @@ -256,7 +290,7 @@ static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) { 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); + if (edge->src) ir_fprintf(stderr, "- edge(%ld) %+F(%d)\n", edge_get_id(edge), edge->src, edge->pos); err = 1; break; @@ -275,44 +309,40 @@ 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) { - const char *msg = ""; + const char *msg = ""; irg_edge_info_t *info; - set *edges; - ir_edge_t *templ; - ir_edge_t *edge; + ir_edgeset_t *edges; + ir_edge_t templ; + ir_edge_t *edge; assert(edges_activated_kind(irg, kind)); /* * Only do something, if the old and new target differ. */ - if(tgt == old_tgt) + if (tgt == old_tgt) return; info = _get_irg_edge_info(irg, kind); - edges = info->edges; - templ = alloca(EDGE_SIZE); + edges = &info->edges; /* Initialize the edge template to search in the set. */ - memset(templ, 0, EDGE_SIZE); - templ->src = src; - templ->pos = pos; - templ->invalid = 0; - templ->present = 0; - templ->kind = kind; - DEBUG_ONLY(templ->src_nr = get_irn_node_nr(src)); + 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 = set_find(edges, templ, EDGE_SIZE, edge_hash(templ)); + edge = ir_edgeset_find(edges, &templ); /* mark the edge invalid if it was found */ if (edge) { msg = "deleting"; list_del(&edge->list); + ir_edgeset_remove(edges, edge); + list_add(&edge->list, &info->free_edges); edge->invalid = 1; edge->pos = -2; edge->src = NULL; @@ -320,21 +350,17 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, edge->edge_nr = -1; #endif /* DEBUG_libfirm */ edge_change_cnt(old_tgt, kind, -1); - } - - /* If the edge was not found issue a warning on the debug stream */ - else { + } else { + /* If the edge was not found issue a warning on the debug stream */ msg = "edge to delete not found!\n"; } - } /* if */ - - /* - * The target is not NULL and the old target differs - * from the new target, the edge shall be moved (if the - * old target was != NULL) or added (if the old target was - * NULL). - */ - else { + } else { + /* + * The target is not NULL and the old target differs + * from the new target, the edge shall be moved (if the + * old target was != NULL) or added (if the old target was + * NULL). + */ struct list_head *head = _get_irn_outs_head(tgt, kind); assert(head->next && head->prev && @@ -342,7 +368,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, /* If the old target is not null, the edge is moved. */ if (old_tgt) { - edge = set_find(edges, templ, EDGE_SIZE, edge_hash(templ)); + edge = ir_edgeset_find(edges, &templ); assert(edge && "edge to redirect not found!"); assert(! edge->invalid && "Invalid edge encountered"); @@ -350,21 +376,36 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, list_move(&edge->list, head); edge_change_cnt(old_tgt, kind, -1); - } - - /* The old target was null, thus, the edge is newly created. */ - else { - edge = set_insert(edges, templ, EDGE_SIZE, edge_hash(templ)); - - 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"); + } else { + /* The old target was NULL, thus, the edge is newly created. */ + ir_edge_t *new_edge; + ir_edge_t *edge; + + if (list_empty(&info->free_edges)) { + edge = obstack_alloc(&info->edges_obst, EDGE_SIZE); + } else { + edge = list_entry(info->free_edges.next, ir_edge_t, list); + list_del(&edge->list); + } + + edge->src = src; + edge->pos = pos; + edge->invalid = 0; + edge->present = 0; + edge->kind = kind; + edge->list.next = NULL; + edge->list.prev = NULL; + memset(((char*)edge) + sizeof(ir_edge_t), 0, edges_private_size); + DEBUG_ONLY(edge->src_nr = get_irn_node_nr(src)); + + new_edge = ir_edgeset_insert(edges, edge); + if (new_edge != edge) { + panic("new edge exists already"); + } msg = "adding"; list_add(&edge->list, head); -#ifdef DEBUG_libfirm - edge->edge_nr = ++last_edge_num; -#endif /* DEBUG_libfirm */ + DEBUG_ONLY(edge->edge_nr = ++last_edge_num); } edge_change_cnt(tgt, kind, +1); @@ -385,28 +426,37 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, 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)) { + 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)) { - /* do not use get_nodes_block() here, it fails when running unpinned */ - ir_node *bl_old = old_tgt ? get_irn_n(skip_Proj(old_tgt), -1) : NULL; - ir_node *bl_tgt = NULL; + if (pos == -1) { + /* a MacroBlock edge: ignore it here */ + } else { + ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL; + ir_node *bl_tgt = NULL; - if (tgt) - bl_tgt = is_Bad(tgt) ? tgt : get_irn_n(skip_Proj(tgt), -1); + if (tgt) + bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt)); - edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg); + edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg); + } } } - -void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph *irg) +/** + * Delete all in edges of a given kind from the node old. + * + * @param old the node + * @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) { int i, n; - if(!edges_activated_kind(irg, kind)) + if (!edges_activated_kind(irg, kind)) return; DBG((dbg, LEVEL_5, "node deleted (kind: %s): %+F\n", get_kind_str(kind), old)); @@ -428,14 +478,17 @@ struct build_walker { * Post-Walker: notify all edges */ static void build_edges_walker(ir_node *irn, void *data) { - struct build_walker *w = data; - int i, n; - - if (! edges_activated_kind(w->irg, w->kind)) - return; - - foreach_tgt(irn, i, n, w->kind) - edges_notify_edge_kind(irn, i, get_n(irn, i, w->kind), NULL, w->kind, w->irg); + struct build_walker *w = data; + int i, n; + ir_edge_kind_t kind = w->kind; + ir_graph *irg = w->irg; + get_edge_src_n_func_t *get_n; + + 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); + } } /** @@ -443,19 +496,58 @@ static void build_edges_walker(ir_node *irn, void *data) { * of all nodes to 0. */ static void init_lh_walker(ir_node *irn, void *data) { - struct build_walker *w = data; - INIT_LIST_HEAD(_get_irn_outs_head(irn, w->kind)); - _get_irn_edge_info(irn, w->kind)->out_count = 0; + struct build_walker *w = data; + ir_edge_kind_t kind = w->kind; + list_head *head = _get_irn_outs_head(irn, kind); + INIT_LIST_HEAD(head); + _get_irn_edge_info(irn, kind)->out_count = 0; } +/** + * Pre-Walker: initializes the list-heads and set the out-count + * of all nodes to 0. + * + * Additionally touches DEP nodes, as they might be DEAD. + * THIS IS UGLY, but I don't find a better way until we + * + * a) ensure that dead nodes are not used as input + * 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; + + INIT_LIST_HEAD(head); + _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); + + INIT_LIST_HEAD(head); + _get_irn_edge_info(dep, kind)->out_count = 0; + } +} + +typedef struct visitor_info_t { + irg_walk_func *visit; + void *data; +} 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) { - if (irn_not_visited(irn)) { + visitor_info_t *info = data; + + if (!irn_visited(irn)) { mark_irn_visited(irn); - init_lh_walker(irn, data); + info->visit(irn, info->data); } } @@ -484,17 +576,29 @@ static void visitor(ir_node *irn, void *data) { void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) { 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); - //irg_walk_graph(irg, init_lh_walker, build_edges_walker, &w); - inc_irg_visited(irg); - irg_walk_anchors(irg, init_lh_walker, build_edges_walker, &w); - visit_all_identities(irg, visitor, &w); + if (kind == EDGE_KIND_DEP) { + irg_walk_anchors(irg, init_lh_walker_dep, NULL, &w); + /* Argh: Dep nodes might be dead, so we MUST visit identities first */ + visit.visit = init_lh_walker_dep; + 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); + } } void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind) @@ -502,9 +606,10 @@ void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind) irg_edge_info_t *info = _get_irg_edge_info(irg, kind); info->activated = 0; - if (info->edges) { - del_set(info->edges); - info->edges = NULL; + if (info->allocated) { + obstack_free(&info->edges_obst, NULL); + ir_edgeset_destroy(&info->edges); + info->allocated = 0; } } @@ -530,7 +635,7 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap DBG((dbg, LEVEL_5, "reroute from %+F to %+F\n", from, to)); - while(head != head->next) { + while (head != head->next) { ir_edge_t *edge = list_entry(head->next, ir_edge_t, list); assert(edge->pos >= -1); set_edge(edge->src, edge->pos, to); @@ -541,7 +646,7 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap static void verify_set_presence(ir_node *irn, void *data) { struct build_walker *w = data; - set *edges = _get_irg_edge_info(w->irg, w->kind)->edges; + ir_edgeset_t *edges = &_get_irg_edge_info(w->irg, w->kind)->edges; int i, n; foreach_tgt(irn, i, n, w->kind) { @@ -550,13 +655,15 @@ static void verify_set_presence(ir_node *irn, void *data) templ.src = irn; templ.pos = i; - e = set_find(edges, &templ, EDGE_SIZE, edge_hash(&templ)); + e = ir_edgeset_find(edges, &templ); 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 } } } @@ -576,8 +683,10 @@ static void verify_list_presence(ir_node *irn, void *data) 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; } @@ -585,8 +694,10 @@ 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 } } } @@ -594,8 +705,9 @@ static void verify_list_presence(ir_node *irn, void *data) int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) { struct build_walker w; - set *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; @@ -603,8 +715,9 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) w.problem_found = 0; /* Clear the present bit in all edges available. */ - for (e = set_first(edges); e; e = set_next(edges)) + foreach_ir_edgeset(edges, e, iter) { e->present = 0; + } irg_walk_graph(irg, verify_set_presence, verify_list_presence, &w); @@ -613,7 +726,7 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) * These edges are superfluous and their presence in the * edge set is wrong. */ - for (e = set_first(edges); e; e = set_next(edges)) { + foreach_ir_edgeset(edges, e, iter) { if (! e->invalid && ! 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); @@ -647,8 +760,9 @@ static void clear_links(ir_node *irn, void *env) { static void count_user(ir_node *irn, void *env) { int i; int first; + (void) env; - first = get_irn_first(irn); + first = -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); @@ -662,7 +776,7 @@ 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; + struct build_walker *w = env; bitset_t *bs; int list_cnt; int ref_cnt; @@ -676,13 +790,13 @@ static void verify_edge_counter(ir_node *irn, void *env) { bs = get_irn_link(irn); list_cnt = 0; - ref_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); /* We can iterate safely here, list heads have already been verified. */ list_for_each(pos, head) { - list_cnt++; + ++list_cnt; } /* check all nodes that reference us and count edges that point number @@ -693,10 +807,10 @@ static void verify_edge_counter(ir_node *irn, void *env) { ir_node *src = get_idx_irn(w->irg, idx); arity = get_irn_arity(src); - for(i = 0; i < arity; ++i) { + for (i = 0; i < arity; ++i) { ir_node *in = get_irn_n(src, i); - if(in == irn) - ref_cnt++; + if (in == irn) + ++ref_cnt; } } @@ -711,7 +825,7 @@ static void verify_edge_counter(ir_node *irn, void *env) { 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 + /* 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); @@ -750,16 +864,13 @@ int edges_verify(ir_graph *irg) { w.problem_found = 0; /* verify counter */ - inc_irg_visited(irg); irg_walk_anchors(irg, clear_links, count_user, &w); - inc_irg_visited(irg); irg_walk_anchors(irg, NULL, verify_edge_counter, &w); return problem_found ? 1 : w.problem_found; } -void init_edges(void) -{ +void init_edges(void) { FIRM_DBG_REGISTER(dbg, DBG_EDGES); /* firm_dbg_set_mask(dbg, -1); */ } @@ -768,64 +879,76 @@ 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); } -void edges_deactivate(ir_graph *irg) -{ - edges_deactivate_kind(irg, EDGE_KIND_NORMAL); +void edges_deactivate(ir_graph *irg) { + if (get_irg_phase_state(irg) == phase_backend) + 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); + int activated = 0; - if(!activated) - edges_activate(irg); + if (edges_activated_kind(irg, EDGE_KIND_BLOCK)) { + activated = 1; + } else { + edges_activate_kind(irg, EDGE_KIND_BLOCK); + } + if (edges_activated_kind(irg, EDGE_KIND_NORMAL)) { + activated = 1; + } else { + edges_activate_kind(irg, EDGE_KIND_NORMAL); + } return activated; } -void edges_node_deleted(ir_node *irn, ir_graph *irg) -{ +int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) { + int activated = edges_activated_kind(irg, kind); + + if (!activated) + edges_activate_kind(irg, kind); + + return activated; +} + +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); } -const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t 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_next)(const ir_node *irn, const ir_edge_t *last) -{ +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); } -ir_node *(get_edge_src_irn)(const ir_edge_t *edge) -{ +ir_node *(get_edge_src_irn)(const ir_edge_t *edge) { return _get_edge_src_irn(edge); } -int (get_edge_src_pos)(const ir_edge_t *edge) -{ +int (get_edge_src_pos)(const ir_edge_t *edge) { return _get_edge_src_pos(edge); } -int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind) -{ +int (get_irn_n_edges_kind)(const ir_node *irn, ir_edge_kind_t kind) { return _get_irn_n_edges_kind(irn, kind); } -void dump_all_out_edges(ir_node *irn) -{ +void dump_all_out_edges(ir_node *irn) { int i; - for(i = 0; i < EDGE_KIND_LAST; ++i) { + for (i = 0; i < EDGE_KIND_LAST; ++i) { const ir_edge_t *edge; printf("kind \"%s\"\n", get_kind_str(i)); @@ -834,3 +957,40 @@ void dump_all_out_edges(ir_node *irn) } } } + +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; + + 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) { + /* find the corresponding successor block. */ + ir_node *pred = get_edge_src_irn(edge); + irg_block_edges_walk2(pred, pre, post, env); + } + + if (post) + post(bl, env); + } +} + +void irg_block_edges_walk(ir_node *node, + irg_walk_func *pre, irg_walk_func *post, + void *env) { + + assert(edges_activated(current_ir_graph)); + assert(is_Block(node)); + + ir_reserve_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED); + + inc_irg_block_visited(current_ir_graph); + irg_block_edges_walk2(node, pre, post, env); + + ir_free_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED); +}