#include "irpass.h"
#include "tv_t.h"
#include "irtools.h"
-#include "opt_manage.h"
#include "irprintf.h"
#include "irdump.h"
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. */
*/
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) {
*/
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) {
{
#ifdef DEBUG_libfirm
partition_t *P;
- node_t *node;
for (P = env->dbg_list; P != NULL; P = P->dbg_next) {
check_partition(P);
*/
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);
/* 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
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 */
/* 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);
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 = irn->o.out->edges[n_outs-1].pos;
} /* sort_irn_outs */
/**
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);
*/
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;
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;
/* 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);
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;)
/* 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);
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) {
*/
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 */
*/
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;
-
- num_edges = get_irn_n_outs(x->node);
+ unsigned 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 */
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;
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 */
*/
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;
}
}
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;
++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);
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)) {
*/
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;
*/
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;
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;
}
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;
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 */
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)
{
projects / libfirm / blobdiff