/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* Two block are congruent, if they contains only equal calculations.
*/
#include "config.h"
-#include "ircons.h"
+
#include "iroptimize.h"
+#include "ircons.h"
#include "irgmod.h"
#include "irgraph_t.h"
#include "irnode_t.h"
#include "set.h"
#include "irpass.h"
#include "debug.h"
+#include "irtools.h"
/* define this for general block shaping: congruent blocks
are found not only before the end block but anywhere in the graph */
/** An opcode map key. */
struct opcode_key_t {
- ir_opcode code; /**< The Firm opcode. */
+ unsigned code; /**< The Firm opcode. */
ir_mode *mode; /**< The mode of all nodes in the partition. */
int arity; /**< The arity of this opcode (needed for Phi etc. */
union {
long proj; /**< For Proj nodes, its proj number */
ir_entity *ent; /**< For Sel nodes, its entity */
- tarval *tv; /**< For Const nodes, its tarval */
+ ir_tarval *tv; /**< For Const nodes, its tarval */
symconst_symbol sym; /**< For SymConst nodes, its symbol .*/
void *addr; /**< Alias all addresses. */
int intVal; /**< For Conv/Div nodes: strict/remainderless. */
/**
* Dump partition to output.
*/
-static void dump_partition(const char *msg, const partition_t *part) {
+static void dump_partition(const char *msg, const partition_t *part)
+{
const block_t *block;
int first = 1;
/**
* Dumps a list.
*/
-static void dump_list(const char *msg, const block_t *block) {
+static void dump_list(const char *msg, const block_t *block)
+{
const block_t *p;
int first = 1;
/**
* Compare two pointer values of a listmap.
*/
-static int listmap_cmp_ptr(const void *elt, const void *key, size_t size) {
- const listmap_entry_t *e1 = elt;
- const listmap_entry_t *e2 = key;
+static int listmap_cmp_ptr(const void *elt, const void *key, size_t size)
+{
+ const listmap_entry_t *e1 = (const listmap_entry_t*)elt;
+ const listmap_entry_t *e2 = (const listmap_entry_t*)key;
(void) size;
return e1->id != e2->id;
*
* @param map the listmap
*/
-static void listmap_init(listmap_t *map) {
+static void listmap_init(listmap_t *map)
+{
map->map = new_set(listmap_cmp_ptr, 16);
map->values = NULL;
} /* listmap_init */
*
* @param map the listmap
*/
-static void listmap_term(listmap_t *map) {
+static void listmap_term(listmap_t *map)
+{
del_set(map->map);
} /* listmap_term */
*
* @return the associated listmap entry for the given id
*/
-static listmap_entry_t *listmap_find(listmap_t *map, void *id) {
+static listmap_entry_t *listmap_find(listmap_t *map, void *id)
+{
listmap_entry_t key, *entry;
key.id = id;
key.list = NULL;
key.next = NULL;
- entry = set_insert(map->map, &key, sizeof(key), HASH_PTR(id));
+ entry = (listmap_entry_t*)set_insert(map->map, &key, sizeof(key), HASH_PTR(id));
if (entry->list == NULL) {
/* a new entry, put into the list */
*
* @return a hash value for the given opcode map entry
*/
-static unsigned opcode_hash(const opcode_key_t *entry) {
+static unsigned opcode_hash(const opcode_key_t *entry)
+{
/* assume long >= int */
- return (entry->mode - (ir_mode *)0) * 9 + entry->code + entry->u.proj * 3 + HASH_PTR(entry->u.addr) + entry->arity;
+ return (unsigned)(PTR_TO_INT(entry->mode) * 9 + entry->code + entry->u.proj * 3 + HASH_PTR(entry->u.addr) + entry->arity);
} /* opcode_hash */
/**
* Compare two entries in the opcode map.
*/
-static int cmp_opcode(const void *elt, const void *key, size_t size) {
- const opcode_key_t *o1 = elt;
- const opcode_key_t *o2 = key;
+static int cmp_opcode(const void *elt, const void *key, size_t size)
+{
+ const opcode_key_t *o1 = (opcode_key_t*)elt;
+ const opcode_key_t *o2 = (opcode_key_t*)key;
(void) size;
return o1->code != o2->code || o1->mode != o2->mode ||
* @param meet_block the control flow meet block of this partition
* @param env the environment
*/
-static partition_t *create_partition(ir_node *meet_block, environment_t *env) {
+static partition_t *create_partition(ir_node *meet_block, environment_t *env)
+{
partition_t *part = OALLOC(&env->obst, partition_t);
INIT_LIST_HEAD(&part->blocks);
* @param partition the partition to add to
* @param env the environment
*/
-static block_t *create_block(ir_node *block, int meet_input, partition_t *partition, environment_t *env) {
+static block_t *create_block(ir_node *block, int meet_input, partition_t *partition, environment_t *env)
+{
block_t *bl = OALLOC(&env->obst, block_t);
set_irn_link(block, bl);
* @param block the block to add to
* @param env the environment
*/
-static node_t *create_node(ir_node *irn, block_t *block, environment_t *env) {
+static node_t *create_node(ir_node *irn, block_t *block, environment_t *env)
+{
node_t *node = OALLOC(&env->obst, node_t);
node->node = irn;
* @param idx the index of the block input in node's predecessors
* @param env the environment
*/
-static void add_pair(block_t *block, ir_node *irn, int idx, environment_t *env) {
+static void add_pair(block_t *block, ir_node *irn, int idx, environment_t *env)
+{
pair_t *pair = OALLOC(&env->obst, pair_t);
pair->next = block->input_pairs;
* @param phi the Phi node
* @param env the environment
*/
-static void add_phi(block_t *block, ir_node *phi, environment_t *env) {
+static void add_phi(block_t *block, ir_node *phi, environment_t *env)
+{
phi_t *node = OALLOC(&env->obst, phi_t);
node->next = block->phis;
/**
* Creates an opcode from a node.
*/
-static opcode_key_t *opcode(const node_t *node, environment_t *env) {
+static opcode_key_t *opcode(const node_t *node, environment_t *env)
+{
opcode_key_t key, *entry;
ir_node *irn = node->node;
break;
}
- entry = set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
+ entry = (opcode_key_t*)set_insert(env->opcode2id_map, &key, sizeof(key), opcode_hash(&key));
return entry;
} /* opcode */
*
* @return a new partition containing the nodes of g
*/
-static partition_t *split(partition_t *Z, block_t *g, environment_t *env) {
+static partition_t *split(partition_t *Z, block_t *g, environment_t *env)
+{
partition_t *Z_prime;
block_t *block;
unsigned n = 0;
/**
* Return non-zero if pred should be tread as a input node.
*/
-static int is_input_node(ir_node *pred, ir_node *irn, int index) {
+static int is_input_node(ir_node *pred, ir_node *irn, int index)
+{
/* for now, do NOT turn direct calls into indirect one */
if (index != 1)
return 1;
* @param part the partition
* @param env the environment
*/
-static void propagate_blocks(partition_t *part, environment_t *env) {
+static void propagate_blocks(partition_t *part, environment_t *env)
+{
block_t *ready_blocks = NULL;
unsigned n_ready = 0;
block_t *bl, *next;
*
* @param env the environment
*/
-static void propagate(environment_t *env) {
+static void propagate(environment_t *env)
+{
partition_t *part, *next;
list_for_each_entry_safe(partition_t, part, next, &env->partitions, part_list) {
/**
* Map a block to the phi[block->input] live-trough.
*/
-static void *live_throughs(const block_t *bl, const ir_node *phi) {
+static void *live_throughs(const block_t *bl, const ir_node *phi)
+{
ir_node *input = get_Phi_pred(phi, bl->meet_input);
/* If this input is inside our block, this
* @param part the partition
* @param env the environment
*/
-void propagate_blocks_live_troughs(partition_t *part, environment_t *env) {
+static void propagate_blocks_live_troughs(partition_t *part, environment_t *env)
+{
const ir_node *meet_block = part->meet_block;
block_t *bl, *next;
listmap_t map;
listmap_entry_t *entry;
/* Add bl to map[live_trough(bl)]. */
- id = live_throughs(bl, phi);
+ id = (opcode_key_t*)live_throughs(bl, phi);
entry = listmap_find(&map, id);
bl->next = entry->list;
entry->list = bl;
*
* @param env the environment
*/
-void propagate_live_troughs(environment_t *env) {
+static void propagate_live_troughs(environment_t *env)
+{
partition_t *part, *next;
list_for_each_entry_safe(partition_t, part, next, &env->partitions, part_list) {
*
* @param part the partition to process
*/
-static void apply(ir_graph *irg, partition_t *part) {
+static void apply(ir_graph *irg, partition_t *part)
+{
block_t *repr = list_entry(part->blocks.next, block_t, block_list);
block_t *bl;
ir_node *block, *end, *meet_block, *p, *next;
* @param end_block the end block
* @param env the environment
*/
-static void partition_for_end_block(ir_node *end_block, environment_t *env) {
+static void partition_for_end_block(ir_node *end_block, environment_t *env)
+{
partition_t *part = create_partition(end_block, env);
ir_node *end;
int i;
}
/* collect all no-return blocks */
- end = get_irg_end(current_ir_graph);
+ end = get_irg_end(get_irn_irg(end_block));
for (i = get_End_n_keepalives(end) - 1; i >= 0; --i) {
ir_node *ka = get_End_keepalive(end, i);
ir_node *block;
* @param n_preds number of elements in preds
* @param env the environment
*/
-static void partition_for_block(ir_node *block, pred_t preds[], int n_preds, environment_t *env) {
+static void partition_for_block(ir_node *block, pred_t preds[], int n_preds, environment_t *env)
+{
partition_t *part = create_partition(block, env);
int i;
* Walker: clear the links of all block phi lists and normal
* links.
*/
-static void clear_phi_links(ir_node *irn, void *env) {
+static void clear_phi_links(ir_node *irn, void *env)
+{
(void) env;
if (is_Block(irn)) {
set_Block_phis(irn, NULL);
/**
* Walker, detect live-out nodes.
*/
-static void find_liveouts(ir_node *irn, void *ctx) {
- environment_t *env = ctx;
+static void find_liveouts(ir_node *irn, void *ctx)
+{
+ environment_t *env = (environment_t*)ctx;
ir_node **live_outs = env->live_outs;
ir_node *this_block;
int i;
} /* find_liveouts */
/**
- * Check if the current block is the meet block of a its predecessors.
+ * Check if the current block is the meet block of its predecessors.
*/
-static void check_for_cf_meet(ir_node *block, void *ctx) {
- environment_t *env = ctx;
+static void check_for_cf_meet(ir_node *block, void *ctx)
+{
+ environment_t *env = (environment_t*)ctx;
int i, k, n;
pred_t *preds;
- if (block == get_irg_end_block(current_ir_graph)) {
+ if (block == get_irg_end_block(get_irn_irg(block))) {
/* always create a partition for the end block */
partition_for_end_block(block, env);
return;
k = 0;
for (i = n - 1; i >= 0; --i) {
ir_node *pred = get_Block_cfgpred(block, i);
- ir_node *pred_block;
/* pred must be a direct jump to us */
if (! is_Jmp(pred) && ! is_Raise(pred) && !is_Bad(pred))
continue;
- pred_block = get_nodes_block(skip_Proj(pred));
-
- preds[k].pred = pred;
- preds[k].index = i;
+ preds[k++].pred = pred;
+ preds[k++].index = i;
}
if (k > 1)
/**
* Compare two nodes for root ordering.
*/
-static int cmp_nodes(const void *a, const void *b) {
- const ir_node *const *pa = a;
- const ir_node *const *pb = b;
+static int cmp_nodes(const void *a, const void *b)
+{
+ const ir_node *const *pa = (const ir_node*const*)a;
+ const ir_node *const *pb = (const ir_node*const*)b;
const ir_node *irn_a = *pa;
const ir_node *irn_b = *pb;
- ir_opcode code_a = get_irn_opcode(irn_a);
- ir_opcode code_b = get_irn_opcode(irn_b);
+ unsigned code_a = get_irn_opcode(irn_a);
+ unsigned code_b = get_irn_opcode(irn_b);
ir_mode *mode_a, *mode_b;
unsigned idx_a, idx_b;
/**
* Add the roots to all blocks.
*/
-static void add_roots(ir_graph *irg, environment_t *env) {
+static void add_roots(ir_graph *irg, environment_t *env)
+{
unsigned idx, n = get_irg_last_idx(irg);
ir_node **live_outs = env->live_outs;
block_t *bl;
* Else, we will split identical blocks if we start which different roots.
*/
for (bl = env->all_blocks; bl != NULL; bl = bl->all_next) {
- int i, n = ARR_LEN(bl->roots);
+ size_t i, n = ARR_LEN(bl->roots);
#if 1
/* TODO: is this really needed? The roots are already in
#endif /* GENERAL_SHAPE */
/* Combines congruent end blocks into one. */
-int shape_blocks(ir_graph *irg) {
- ir_graph *rem;
+int shape_blocks(ir_graph *irg)
+{
environment_t env;
partition_t *part;
block_t *bl;
int res, n;
- rem = current_ir_graph;
- current_ir_graph = irg;
-
/* register a debug mask */
FIRM_DBG_REGISTER(dbg, "firm.opt.blocks");
if (res) {
/* control flow changed */
- set_irg_outs_inconsistent(irg);
set_irg_extblk_inconsistent(irg);
set_irg_doms_inconsistent(irg);
- set_irg_loopinfo_inconsistent(irg);
/* Calls might be removed. */
set_trouts_inconsistent();
-
- // dump_ir_block_graph(irg, "-after");
}
for (bl = env.all_blocks; bl != NULL; bl = bl->all_next) {
DEL_ARR_F(env.live_outs);
del_set(env.opcode2id_map);
obstack_free(&env.obst, NULL);
- current_ir_graph = rem;
return res;
} /* shape_blocks */
-ir_graph_pass_t *shape_blocks_pass(const char *name) {
+ir_graph_pass_t *shape_blocks_pass(const char *name)
+{
return def_graph_pass_ret(name ? name : "shape_blocks", shape_blocks);
} /* shape_blocks_pass */