X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=4975e3d8bc80e951e1475d7be7ecb63a5467cf59;hb=63c22f8a9964eaedaa6ab509de10cca18604709e;hp=ad88f5ae868fe54c26d0bc88a995fbcb8afc1ceb;hpb=bd019d8cd785c1a433c19dee44bf3f9e82397286;p=libfirm diff --git a/ir/opt/combo.c b/ir/opt/combo.c index ad88f5ae8..4975e3d8b 100644 --- a/ir/opt/combo.c +++ b/ir/opt/combo.c @@ -27,9 +27,9 @@ * - supports all Firm direct (by a data edge) identities except Mux * (Mux can be a 2-input or 1-input identity, only 2-input is implemented yet) * - supports Confirm nodes (handle them like Copies but do NOT remove them) - * - let Cmp nodes calculate Top like all othe data nodes: this would let + * - let Cmp nodes calculate Top like all other data nodes: this would let * Mux nodes to calculate Unknown instead of taking the true result - * - let Cond(Top) always select FALSE/default: This is tricky. Nodes are only reavaluated + * - let Cond(Top) always select FALSE/default: This is tricky. Nodes are only reevaluated * IFF the predecessor changed its type. Because nodes are initialized with Top * this never happens, let all Proj(Cond) be unreachable. * We avoid this condition by the same way we work around Phi: whenever a Block @@ -83,7 +83,7 @@ #include "irpass.h" #include "tv_t.h" #include "irtools.h" -#include "opt_manage.h" +#include "firmstat_t.h" #include "irprintf.h" #include "irdump.h" @@ -145,8 +145,8 @@ struct node_t { node_t *race_next; /**< Next node on race list. */ lattice_elem_t type; /**< The associated lattice element "type". */ int max_user_input; /**< Maximum input number of Def-Use edges. */ - int next_edge; /**< Index of the next Def-Use edge to use. */ - int n_followers; /**< Number of Follower in the outs set. */ + unsigned next_edge; /**< Index of the next Def-Use edge to use. */ + unsigned n_followers; /**< Number of Follower in the outs set. */ unsigned on_touched:1; /**< Set, if this node is on the partition.touched set. */ unsigned on_cprop:1; /**< Set, if this node is on the partition.cprop list. */ unsigned on_fallen:1; /**< Set, if this node is on the fallen list. */ @@ -268,7 +268,6 @@ static int cmp_irn_opcode(const ir_node *a, const ir_node *b) */ static void check_partition(const partition_t *T) { - node_t *node; unsigned n = 0; list_for_each_entry(node_t, node, &T->Leader, node_list) { @@ -291,7 +290,6 @@ static void check_partition(const partition_t *T) */ static void check_opcode(const partition_t *Z) { - node_t *node; const ir_node *repr = NULL; list_for_each_entry(node_t, node, &Z->Leader, node_list) { @@ -309,7 +307,6 @@ static void check_all_partitions(environment_t *env) { #ifdef DEBUG_libfirm partition_t *P; - node_t *node; for (P = env->dbg_list; P != NULL; P = P->dbg_next) { check_partition(P); @@ -368,7 +365,6 @@ static inline lattice_elem_t get_partition_type(const partition_t *X); */ static void dump_partition(const char *msg, const partition_t *part) { - const node_t *node; int first = 1; lattice_elem_t type = get_partition_type(part); @@ -444,19 +440,22 @@ static void dump_all_partitions(const environment_t *env) static void dump_split_list(const partition_t *list) { const partition_t *p; + char split = ' '; DB((dbg, LEVEL_2, "Split by %s produced = {\n", what_reason)); - for (p = list; p != NULL; p = p->split_next) - DB((dbg, LEVEL_2, "part%u, ", p->nr)); + for (p = list; p != NULL; p = p->split_next) { + DB((dbg, LEVEL_2, "%c part%u", split, p->nr)); + split = ','; + } DB((dbg, LEVEL_2, "\n}\n")); } /* dump_split_list */ /** * Dump partition and type for a node. */ -static int dump_partition_hook(FILE *F, ir_node *n, ir_node *local) +static int dump_partition_hook(FILE *F, const ir_node *n, const ir_node *local) { - ir_node *irn = local != NULL ? local : n; + const ir_node *irn = local != NULL ? local : n; node_t *node = get_irn_node(irn); ir_fprintf(F, "info2 : \"partition %u type %+F\"\n", node->part->nr, node->type); @@ -489,7 +488,7 @@ static void verify_type(const lattice_elem_t old_type, node_t *node) /* bottom reached */ return; } - panic("combo: wrong translation from %+F to %+F on node %+F", old_type, node->type, node->node); + panic("wrong translation from %+F to %+F on node %+F", old_type, node->type, node->node); } /* verify_type */ #else @@ -544,7 +543,7 @@ static listmap_entry_t *listmap_find(listmap_t *map, void *id) key.id = id; key.list = NULL; key.next = NULL; - entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), HASH_PTR(id)); + entry = set_insert(listmap_entry_t, map->map, &key, sizeof(key), hash_ptr(id)); if (entry->list == NULL) { /* a new entry, put into the list */ @@ -566,12 +565,12 @@ static unsigned opcode_hash(const opcode_key_t *entry) /* we cannot use the ir ops hash function here, because it hashes the * predecessors. */ const ir_node *n = entry->irn; - ir_opcode code = get_irn_opcode(n); + ir_opcode code = (ir_opcode)get_irn_opcode(n); ir_mode *mode = get_irn_mode(n); unsigned hash = (unsigned)(PTR_TO_INT(mode) * 9 + code) + get_irn_arity(n); if (code == iro_Const) - hash ^= (unsigned)HASH_PTR(get_Const_tarval(n)); + hash ^= (unsigned)hash_ptr(get_Const_tarval(n)); else if (code == iro_Proj) hash += (unsigned)get_Proj_proj(n); return hash; @@ -608,12 +607,10 @@ static int cmp_def_use_edge(const void *a, const void *b) static void sort_irn_outs(node_t *node) { ir_node *irn = node->node; - int n_outs = get_irn_n_outs(irn); - - if (n_outs > 1) { - qsort(&irn->out[1], n_outs, sizeof(irn->out[0]), cmp_def_use_edge); - } - node->max_user_input = irn->out[n_outs].pos; + unsigned n_outs = get_irn_n_outs(irn); + qsort(irn->o.out->edges, n_outs, sizeof(irn->o.out->edges[0]), + cmp_def_use_edge); + node->max_user_input = n_outs > 0 ? irn->o.out->edges[n_outs-1].pos : -1; } /* sort_irn_outs */ /** @@ -848,9 +845,7 @@ static void add_to_cprop(node_t *y, environment_t *env) if (get_irn_mode(irn) == mode_T) { /* mode_T nodes always produce tarval_bottom, so we must explicitly * add its Projs to get constant evaluation to work */ - int i; - - for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) { + for (unsigned i = get_irn_n_outs(irn); i-- > 0; ) { node_t *proj = get_irn_node(get_irn_out(irn, i)); add_to_cprop(proj, env); @@ -891,33 +886,28 @@ static void update_worklist(partition_t *Z, partition_t *Z_prime, environment_t */ static void move_edges_to_leader(node_t *x) { - ir_node *irn = x->node; - int i, j, k; - - for (i = get_irn_arity(irn) - 1; i >= 0; --i) { + ir_node *irn = x->node; + for (int i = get_irn_arity(irn) - 1; i >= 0; --i) { node_t *pred = get_irn_node(get_irn_n(irn, i)); - ir_node *p; - int n; - - p = pred->node; - n = get_irn_n_outs(p); - for (j = 1; j <= pred->n_followers; ++j) { - if (p->out[j].pos == i && p->out[j].use == irn) { + ir_node *p = pred->node; + unsigned n = get_irn_n_outs(p); + for (unsigned j = 0; j < pred->n_followers; ++j) { + ir_def_use_edge edge = p->o.out->edges[j]; + if (edge.pos == i && edge.use == irn) { /* found a follower edge to x, move it to the Leader */ - ir_def_use_edge edge = p->out[j]; - /* remove this edge from the Follower set */ - p->out[j] = p->out[pred->n_followers]; --pred->n_followers; + p->o.out->edges[j] = p->o.out->edges[pred->n_followers]; /* sort it into the leader set */ - for (k = pred->n_followers + 2; k <= n; ++k) { - if (p->out[k].pos >= edge.pos) + unsigned k; + for (k = pred->n_followers+1; k < n; ++k) { + if (p->o.out->edges[k].pos >= edge.pos) break; - p->out[k - 1] = p->out[k]; + p->o.out->edges[k-1] = p->o.out->edges[k]; } /* place the new edge here */ - p->out[k - 1] = edge; + p->o.out->edges[k-1] = edge; /* edge found and moved */ break; @@ -974,10 +964,11 @@ static partition_t *split_no_followers(partition_t *Z, node_t *g, environment_t /* for now, copy the type info tag, it will be adjusted in split_by(). */ Z_prime->type_is_T_or_C = Z->type_is_T_or_C; - update_worklist(Z, Z_prime, env); - dump_partition("Now ", Z); dump_partition("Created new ", Z_prime); + + update_worklist(Z, Z_prime, env); + return Z_prime; } /* split_no_followers */ @@ -1005,7 +996,7 @@ typedef struct step_env { node_t *initial; /**< The initial node list. */ node_t *unwalked; /**< The unwalked node list. */ node_t *walked; /**< The walked node list. */ - int index; /**< Next index of Follower use_def edge. */ + unsigned index; /**< Next index of Follower use_def edge. */ unsigned side; /**< side number. */ } step_env; @@ -1097,7 +1088,7 @@ static int step(step_env *env) /* let n be the first node in unwalked */ n = env->unwalked; while (env->index < n->n_followers) { - const ir_def_use_edge *edge = &n->node->out[1 + env->index]; + const ir_def_use_edge *edge = &n->node->o.out->edges[env->index]; /* let m be n.F.def_use[index] */ node_t *m = get_irn_node(edge->use); @@ -1178,7 +1169,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) partition_t *X_prime; list_head tmp; step_env senv[2]; - node_t *g, *h, *node, *t; + node_t *g, *h; int max_input, transitions, winner, shf; unsigned n; DEBUG_ONLY(static int run = 0;) @@ -1198,7 +1189,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) /* Remove gg from X.Leader and put into g */ g = NULL; - for (node = gg; node != NULL; node = node->next) { + for (node_t *node = gg; node != NULL; node = node->next) { assert(node->part == X); assert(node->is_follower == 0); @@ -1232,7 +1223,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) * Some informations on the race that are not stated clearly in Click's * thesis. * 1) A follower stays on the side that reach him first. - * 2) If the other side reches a follower, if will be converted to + * 2) If the other side reaches a follower, if will be converted to * a leader. /This must be done after the race is over, else the * edges we are iterating on are renumbered./ * 3) /New leader might end up on both sides./ @@ -1269,7 +1260,7 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) X_prime = new_partition(env); max_input = 0; n = 0; - for (node = senv[winner].walked; node != NULL; node = node->race_next) { + for (node_t *node = senv[winner].walked; node != NULL; node = node->race_next) { list_del(&node->node_list); node->part = X_prime; if (node->is_follower) { @@ -1302,6 +1293,9 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) check_partition(X); check_partition(X_prime); + dump_partition("Now ", X); + dump_partition("Created new ", X_prime); + /* X' is the smaller part */ add_to_worklist(X_prime, env); @@ -1326,9 +1320,6 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) } } - dump_partition("Now ", X); - dump_partition("Created new ", X_prime); - /* we have to ensure that the partition containing g is returned */ if (winner != 0) { *pX = X_prime; @@ -1398,21 +1389,19 @@ static int type_is_neither_top_nor_const(const lattice_elem_t type) */ static void collect_touched(list_head *list, int idx, environment_t *env) { - node_t *x, *y; + node_t *y; int end_idx = env->end_idx; list_for_each_entry(node_t, x, list, node_list) { - int num_edges; - if (idx == -1) { /* leader edges start AFTER follower edges */ - x->next_edge = x->n_followers + 1; + x->next_edge = x->n_followers; } - num_edges = get_irn_n_outs(x->node); + unsigned num_edges = get_irn_n_outs(x->node); /* for all edges in x.L.def_use_{idx} */ - while (x->next_edge <= num_edges) { - const ir_def_use_edge *edge = &x->node->out[x->next_edge]; + while (x->next_edge < num_edges) { + const ir_def_use_edge *edge = &x->node->o.out->edges[x->next_edge]; ir_node *succ; /* check if we have necessary edges */ @@ -1464,18 +1453,16 @@ static void collect_touched(list_head *list, int idx, environment_t *env) */ static void collect_commutative_touched(list_head *list, environment_t *env) { - node_t *x, *y; + node_t *y; list_for_each_entry(node_t, x, list, node_list) { - int num_edges; + unsigned num_edges = get_irn_n_outs(x->node); - num_edges = get_irn_n_outs(x->node); - - x->next_edge = x->n_followers + 1; + x->next_edge = x->n_followers; /* for all edges in x.L.def_use_{idx} */ - while (x->next_edge <= num_edges) { - const ir_def_use_edge *edge = &x->node->out[x->next_edge]; + while (x->next_edge < num_edges) { + const ir_def_use_edge *edge = &x->node->o.out->edges[x->next_edge]; ir_node *succ; /* check if we have necessary edges */ @@ -1645,7 +1632,7 @@ static void cause_splits(environment_t *env) static partition_t *split_by_what(partition_t *X, what_func What, partition_t **P, environment_t *env) { - node_t *x, *S; + node_t *S; listmap_t map; listmap_entry_t *iter; partition_t *R; @@ -1703,7 +1690,7 @@ static void *lambda_opcode(const node_t *node, environment_t *env) key.irn = node->node; - entry = (opcode_key_t*)set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key)); + entry = set_insert(opcode_key_t, env->opcode2id_map, &key, sizeof(key), opcode_hash(&key)); return entry; } /* lambda_opcode */ @@ -1929,7 +1916,8 @@ static void compute_Block(node_t *node) int i; ir_node *block = node->node; - if (block == get_irg_start_block(current_ir_graph) || get_Block_entity(block) != NULL) { + ir_graph *const irg = get_Block_irg(block); + if (block == get_irg_start_block(irg) || get_Block_entity(block) != NULL) { /* start block and labelled blocks are always reachable */ node->type.tv = tarval_reachable; return; @@ -2761,20 +2749,19 @@ static node_t *identity(node_t *node) */ static void segregate_def_use_chain_1(const ir_node *follower, node_t *leader) { - ir_node *l = leader->node; - int j, i, n = get_irn_n_outs(l); - DB((dbg, LEVEL_2, "%+F is a follower of %+F\n", follower, leader->node)); /* The leader edges must remain sorted, but follower edges can be unsorted. */ - for (i = leader->n_followers + 1; i <= n; ++i) { - if (l->out[i].use == follower) { - ir_def_use_edge t = l->out[i]; - - for (j = i - 1; j >= leader->n_followers + 1; --j) - l->out[j + 1] = l->out[j]; + ir_node *l = leader->node; + unsigned n = get_irn_n_outs(l); + for (unsigned i = leader->n_followers; i < n; ++i) { + if (l->o.out->edges[i].use == follower) { + ir_def_use_edge t = l->o.out->edges[i]; + + for (unsigned j = i; j-- > leader->n_followers; ) + l->o.out->edges[j+1] = l->o.out->edges[j]; + l->o.out->edges[leader->n_followers] = t; ++leader->n_followers; - l->out[leader->n_followers] = t; break; } } @@ -2809,7 +2796,6 @@ static void propagate(environment_t *env) lattice_elem_t old_type; node_t *fallen; unsigned n_fallen, old_type_was_T_or_C; - int i; while (env->cprop != NULL) { void *oldopcode = NULL; @@ -2867,6 +2853,17 @@ static void propagate(environment_t *env) /* x will make the follower -> leader transition */ follower_to_leader(x); + + /* In case of a follower -> leader transition of a Phi node + * we have to ensure that the current partition will be split + * by lambda n.(n[i].partition). + * + * This split may already happened before when some predecessors + * of the Phi's Block are unreachable. Thus, we have to put the + * current partition in the worklist to repeat the check. + */ + if (is_Phi(x->node) && ! x->part->on_worklist) + add_to_worklist(x->part, env); } /* compute a new type for x */ @@ -2886,7 +2883,7 @@ static void propagate(environment_t *env) ++n_fallen; DB((dbg, LEVEL_2, "Add node %+F to fallen\n", x->node)); } - for (i = get_irn_n_outs(x->node) - 1; i >= 0; --i) { + for (unsigned i = get_irn_n_outs(x->node); i-- > 0; ) { ir_node *succ = get_irn_out(x->node, i); node_t *y = get_irn_node(succ); @@ -2912,8 +2909,6 @@ static void propagate(environment_t *env) x->on_fallen = 0; if (old_type_was_T_or_C) { - node_t *y, *tmp; - /* check if some nodes will make the leader -> follower transition */ list_for_each_entry_safe(node_t, y, tmp, &Y->Leader, node_list) { if (y->type.tv != tarval_top && ! is_con(y->type)) { @@ -2962,9 +2957,9 @@ static ir_node *get_leader(node_t *node) */ static int only_one_reachable_proj(ir_node *n) { - int i, k = 0; + int k = 0; - for (i = get_irn_n_outs(n) - 1; i >= 0; --i) { + for (unsigned i = get_irn_n_outs(n); i-- > 0; ) { ir_node *proj = get_irn_out(n, i); node_t *node; @@ -3048,7 +3043,8 @@ static void apply_cf(ir_node *block, void *ctx) } } - if (block == get_irg_end_block(current_ir_graph)) { + ir_graph *const irg = get_Block_irg(block); + if (block == get_irg_end_block(irg)) { /* Analysis found out that the end block is unreachable, * hence we remove all its control flow predecessors. */ set_irn_in(block, 0, NULL); @@ -3208,10 +3204,9 @@ static void exchange_leader(ir_node *irn, ir_node *leader) */ static int all_users_are_dead(const ir_node *irn) { - int i, n = get_irn_n_outs(irn); - - for (i = 1; i <= n; ++i) { - const ir_node *succ = irn->out[i].use; + unsigned n = get_irn_n_outs(irn); + for (unsigned i = 0; i < n; ++i) { + const ir_node *succ = get_irn_out(irn, i); const node_t *block = get_irn_node(get_nodes_block(succ)); const node_t *node; @@ -3463,8 +3458,8 @@ static void set_compute_functions(void) size_t i, n; /* set the default compute function */ - for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) { - ir_op *op = get_irp_opcode(i); + for (i = 0, n = ir_get_n_opcodes(); i < n; ++i) { + ir_op *op = ir_get_opcode(i); op->ops.generic = (op_func)default_compute; } @@ -3512,7 +3507,7 @@ static void add_memory_keeps(ir_node **kept_memory, size_t len) ir_nodeset_destroy(&set); } /* add_memory_keeps */ -static ir_graph_state_t do_combo(ir_graph *irg) +void combo(ir_graph *irg) { environment_t env; ir_node *initial_bl; @@ -3520,6 +3515,11 @@ static ir_graph_state_t do_combo(ir_graph *irg) ir_graph *rem = current_ir_graph; size_t len; + assure_irg_properties(irg, + IR_GRAPH_PROPERTY_NO_BADS + | IR_GRAPH_PROPERTY_CONSISTENT_OUTS + | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO); + current_ir_graph = irg; /* register a debug mask */ @@ -3622,20 +3622,9 @@ static ir_graph_state_t do_combo(ir_graph *irg) set_value_of_func(NULL); current_ir_graph = rem; - return 0; // cannot guarantee anything + confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_NONE); } /* combo */ -static optdesc_t opt_combo = { - "combo", - IR_GRAPH_STATE_NO_BADS | IR_GRAPH_STATE_CONSISTENT_OUTS | IR_GRAPH_STATE_CONSISTENT_LOOPINFO, - do_combo, -}; - -void combo(ir_graph *irg) -{ - perform_irg_optimization(irg, &opt_combo); -} - /* Creates an ir_graph pass for combo. */ ir_graph_pass_t *combo_pass(const char *name) {