#include "irgwalk.h"
#include "array.h"
#include "irphase_t.h"
+#include "irdump.h"
#include "debug.h"
/* A region. */
struct ir_region {
- firm_kind kind; /**< Must be k_ir_region. */
- ir_region_kind type; /**< The type of this region. */
- ir_region *parent; /**< points to the parent. */
- ir_reg_or_blk *parts; /**< The list of all region parts. */
- ir_region **pred; /**< The predecessor (control flow) regions of this region. */
- ir_region **succ; /**< The successor (control flow) regions of this region. */
- unsigned prenum; /**< DFS pre-oder number */
- unsigned postnum; /**< DFS post-oder number */
- void *link; /**< A link field. */
- unsigned long nr; /**< for debugging */
- char visited; /**< The visited flag. */
+ firm_kind kind; /**< Must be k_ir_region. */
+ ir_region_kind type; /**< The type of this region. */
+ ir_region *parent; /**< points to the parent. */
+ ir_reg_or_blk *parts; /**< The list of all region parts. */
+ ir_region **pred; /**< The predecessor (control flow) regions of this region. */
+ ir_region **succ; /**< The successor (control flow) regions of this region. */
+ unsigned prenum; /**< DFS pre-oder number */
+ unsigned postnum; /**< DFS post-oder number */
+ void *link; /**< A link field. */
+ unsigned long nr; /**< for debugging */
+ unsigned visited:1; /**< The visited flag. */
+ unsigned exit:1; /**< If set, the parent region can be left by this node. */
+ unsigned enter:1; /**< If set, the parent region can be entered by this node. */
};
/* A helper type for unioning blocks and regions. */
*/
ir_region *get_block_region(const ir_node *block) {
assert(is_Block(block));
- return get_irn_link(block);
+ return block->attr.block.region;
}
/**
*/
void set_block_region(ir_node *block, ir_region *reg) {
assert(is_Block(block));
- set_irn_link(block, reg);
+ block->attr.block.region = reg;
}
/**
}
/**
- * Post-walker: wrap all blocks with a Block region
+ * Post-walker: wrap all blocks with a BasicBlock region
* and count them
*/
-static void wrap_blocks(ir_node *block, void *ctx) {
+static void wrap_BasicBlocks(ir_node *block, void *ctx) {
walk_env *env = ctx;
ir_region *reg;
/* Allocate a Block wrapper */
reg = obstack_alloc(env->obst, sizeof(*reg));
reg->kind = k_ir_region;
- reg->type = ir_rk_Block;
+ reg->type = ir_rk_BasicBlock;
reg->parent = NULL;
reg->prenum = 0;
reg->postnum = 0;
reg->visited = 0;
+ reg->exit = 0;
+ reg->enter = 0;
reg->link = NULL;
reg->nr = get_irn_node_nr(block);
reg->parts = NEW_ARR_D(ir_reg_or_blk, env->obst, 1);
set_irn_link(block, reg);
++env->l_post;
-} /* wrap_blocks */
+} /* wrap_BasicBlocks */
/**
* Create the pred and succ edges for Block wrapper.
* Kill edges to the Start and End blocks.
*/
-static void update_Block_regions(ir_node *blk, void *ctx) {
+static void update_BasicBlock_regions(ir_node *blk, void *ctx) {
walk_env *env = ctx;
ir_region *reg = get_irn_link(blk);
int i, j, len;
reg->succ[j++] = get_irn_link(succ);
}
ARR_SHRINKLEN(reg->succ, j);
-}
+} /* update_BasicBlock_regions */
/** Allocate a new region of a obstack */
#define ALLOC_REG(obst, reg, tp) \
(reg)->prenum = 0; \
(reg)->postnum = 0; \
(reg)->visited = 0; \
+ (reg)->exit = 0; \
+ (reg)->enter = 0; \
(reg)->link = NULL; \
} while (0)
* Creates a new Sequence region.
*/
static ir_region *new_Sequence(struct obstack *obst, ir_region *nset, int nset_len) {
- ir_region *reg;
+ ir_region *reg, *next;
int i;
ALLOC_REG(obst, reg, ir_rk_Sequence);
reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, nset_len);
/* beware: list is in reverse order, reverse */
+ next = nset;
for (i = nset_len - 1; i >= 0; --i) {
+ nset = next;
reg->parts[i].region = nset;
nset->parent = reg;
- nset = nset->link;
+ next = nset->link;
+ nset->link = NULL;
}
reg->nr = reg->parts[0].region->nr;
return reg;
} /* new_WhileLoop */
+/**
+ * Create a new new_NaturalLoop region.
+ */
+static ir_region *new_NaturalLoop(struct obstack *obst, ir_region *head) {
+ ir_region *reg, *c, *n;
+ int i, j, k, len, n_pred, n_succ;
+
+ /* count number of parts */
+ for (len = 0, c = head; c != NULL; c = c->link)
+ ++len;
+
+ ALLOC_REG(obst, reg, ir_rk_WhileLoop);
+
+ reg->nr = head->nr;
+ reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, len);
+
+ /* enter all parts */
+ for (i = 0, c = head; c != NULL; c = n) {
+ reg->parts[i++].region = c;
+ c->parent = reg;
+ n = c->link;
+ c->link = NULL;
+ }
+
+ /* count number of preds */
+ n_pred = 0;
+ for (i = get_region_n_preds(head) - 1; i >= 0; --i) {
+ ir_region *pred = get_region_pred(head, i);
+ if (pred->parent != reg)
+ ++n_pred;
+ }
+ reg->pred = NEW_ARR_D(ir_region *, obst, n_pred);
+ for (j = 0, i = get_region_n_preds(head) - 1; i >= 0; --i) {
+ ir_region *pred = get_region_pred(head, i);
+ if (pred->parent != reg)
+ reg->pred[j++] = pred;
+ }
+
+ /* count number of succs */
+ n_succ = 0;
+ for (j = 0; j < len; ++j) {
+ ir_region *c = reg->parts[j].region;
+ for (i = get_region_n_succs(c) - 1; i >= 0; --i) {
+ ir_region *succ = get_region_succ(c, i);
+ if (succ->parent != reg)
+ ++n_succ;
+ }
+ }
+ reg->succ = NEW_ARR_D(ir_region *, obst, n_succ);
+ k = 0;
+ for (j = 0; j < len; ++j) {
+ ir_region *c = reg->parts[j].region;
+ for (i = get_region_n_succs(c) - 1; i >= 0; --i) {
+ ir_region *succ = get_region_succ(c, i);
+ if (succ->parent != reg)
+ reg->succ[k++] = succ;
+ }
+ }
+
+ DEBUG_ONLY(
+ DB((dbg, LEVEL_2, " Created NaturalLoop(%u)Head(%u)\n", reg->nr, head->nr));
+ for (i = 1; i < len; ++i) {
+ ir_region *p = reg->parts[i].region;
+ DB((dbg, LEVEL_2, " Body(%u)\n", p->nr));
+ }
+ )
+ return reg;
+} /* new_NaturalLoop */
+
/**
* Return true if a is an ancestor of b in DFS search.
*/
return (a->prenum <= b->prenum && a->postnum > b->postnum);
}
+/**
+ * Return true if region pred is a predecessor of region n.
+ */
+static int pred_of(const ir_region *pred, const ir_region *n) {
+ int i;
+ for (i = get_region_n_preds(n) - 1; i >= 0; --i) {
+ if (get_region_pred(n, i) == pred)
+ return 1;
+ }
+ return 0;
+}
+
/**
* Return true if region succ is a successor of region n.
*/
}
if (node->link && improper) {
- /* found an improper region */
+ /* found an improper region, do minimization */
+
}
return node;
}
}
list = find_cyclic_region(node);
- if (list->link && !LINK(list)->link && get_region_n_succs(list->link) == 1) {
- return new_WhileLoop(obst, list);
+ if (list->link) {
+ if (!LINK(list)->link && get_region_n_succs(list->link) == 1) {
+ /* only one body block with only one successor (the head) */
+ return new_WhileLoop(obst, list);
+ }
+ /* A Loop with one head */
+ return new_NaturalLoop(obst, list);
}
return NULL;
*/
return new_IfThenElse(obst, node, n, m);
}
- if (n_succs == 1 && m_preds == 2 &&
+ if (n_succs == 1 &&
get_region_succ(n, 0) == m &&
- (get_region_pred(m, 0) == node ||
- get_region_pred(m, 1) == node)) {
+ pred_of(node, m)) {
/*
* node -->n-->m
* \-------/
*/
return new_IfThen(obst, node, n);
}
- if (m_succs == 1 && n_preds == 2 &&
+ if (m_succs == 1 &&
get_region_succ(m, 0) == m &&
- (get_region_pred(n, 0) == node ||
- get_region_pred(n, 1) == node)) {
+ pred_of(node, n)) {
/*
* node -->m-->n
* \-------/
return NULL;
}
-/**
- * Fill the given set recursively with all parts of the region (including itself)
- */
-static void fill_parts(pset *set, ir_region *reg) {
- int i;
-
- if (reg->type == ir_rk_Block) {
- pset_insert_ptr(set, reg);
- return;
- }
-
- for (i = ARR_LEN(reg->parts) - 1; i >= 0; --i) {
- fill_parts(set, reg->parts[i].region);
- }
-}
-
/**
* replace all pred edges from region pred that points to any of the set set
* to ONE edge to reg.
r = reg;
}
set_region_pred(succ, i, r);
+ } else {
+ /* the current region can be entered by this node */
+ pred->enter = 1;
}
}
ARR_SHRINKLEN(succ->pred, len);
r = reg;
}
set_region_succ(pred, i, r);
+ } else {
+ /* current region can be left by this node */
+ succ->exit = 1;
}
}
ARR_SHRINKLEN(pred->succ, len);
/* create the Block wrapper and count them */
env.l_post = 0;
env.obst = &res->obst;
- irg_block_walk_graph(irg, NULL, wrap_blocks, &env);
- irg_block_walk_graph(irg, NULL, update_Block_regions, &env);
+ irg_block_walk_graph(irg, NULL, wrap_BasicBlocks, &env);
+ irg_block_walk_graph(irg, NULL, update_BasicBlock_regions, &env);
env.post = NEW_ARR_F(ir_region *, env.l_post);
if (pre)
pre(reg, env);
- if (reg->type != ir_rk_Block) {
+ if (reg->type != ir_rk_BasicBlock) {
for (i = 0, n = ARR_LEN(reg->parts); i < n; ++i)
region_tree_walk2(reg->parts[i].region, pre, post, env);
}