* - empty block elimination
* - a simple dead node elimination (set inputs of unreachable nodes to BAD)
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdlib.h>
#include "iredges_t.h"
#include "irgraph_t.h"
#include "irgopt.h"
+#include "irgmod.h"
#include "irprintf_t.h"
#include "irgwalk.h"
const arch_register_class_t *cls,
ir_node *pos)
{
- const arch_env_t *arch_env = birg->main_env->arch_env;
be_lv_t *lv = birg->lv;
ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
ir_graph *irg = get_irn_irg(bl);
DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
ir_nodeset_init(&live);
- be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
+ be_liveness_nodes_live_at(lv, cls, pos, &live);
n = ir_nodeset_size(&live);
if(n == 0) {
return NULL;
}
- nodes = xmalloc(n * sizeof(nodes[0]));
+ nodes = XMALLOCN(ir_node*, n);
DBG((dbg, LEVEL_1, "live:\n"));
i = 0;
curr = perm;
for (i = 0; i < n; ++i) {
ir_node *perm_op = get_irn_n(perm, i);
- const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
+ const arch_register_t *reg = arch_get_irn_register(perm_op);
be_ssa_construction_env_t senv;
ir_mode *mode = get_irn_mode(perm_op);
ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
- arch_set_irn_register(arch_env, proj, reg);
+ arch_set_irn_register(proj, reg);
curr = proj;
ir_node *succ_block;
ir_node *jump = NULL;
- if (irn_visited(block))
+ if (irn_visited_else_mark(block))
return;
- mark_irn_visited(block);
if (get_Block_n_cfgpreds(block) != 1)
goto check_preds;
assert(succ_block == NULL);
succ_block = get_edge_src_irn(edge);
+ if (has_Block_label(succ_block) && has_Block_label(block)) {
+ /*
+ * Currently we can add only one label for a block.
+ * Therefore we cannot combine them if both block already have one.
+ */
+ goto check_preds;
+ }
set_irn_n(succ_block, pos, pred);
}
+ if (has_Block_label(block)) {
+ /* move the label to the successor block */
+ ir_label_t label = get_Block_label(block);
+ set_Block_label(succ_block, label);
+ }
+
/* there can be some non-scheduled Pin nodes left in the block, move them
- * to the succ block */
+ * to the succ block (Pin) or pred block (Sync) */
foreach_out_edge_safe(block, edge, next) {
node = get_edge_src_irn(edge);
- if(node == jump)
+ if (node == jump)
continue;
if (is_Block(node)) {
/* a Block->Block edge: This should be the MacroBlock
assert(get_Block_MacroBlock(node) == block && "Wrong Block->Block edge");
continue;
}
+ /* we simply kill Pins, because there are some strange interactions
+ * between condeval, which produce PhiMs with Pins, we simply kill
+ * the pins here, everything is scheduled anyway */
if (is_Pin(node)) {
- set_nodes_block(node, succ_block);
+ exchange(node, get_Pin_op(node));
+ continue;
+ }
+ if (is_Sync(node)) {
+ set_nodes_block(node, get_nodes_block(pred));
+ continue;
+ }
+ if (is_End(node)) { /* End-keep, reroute it to the successor */
+ int pos = get_edge_src_pos(edge);
+ set_irn_n(node, pos, succ_block);
continue;
}
panic("Unexpected node %+F in block %+F with empty schedule", node, block);
}
set_Block_cfgpred(block, 0, new_Bad());
- be_kill_node(jump);
+ kill_node(jump);
blocks_removed = 1;
/* check predecessor */
blocks_removed = 0;
- set_using_irn_visited(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
inc_irg_visited(irg);
remove_empty_block(get_irg_end_block(irg));
end = get_irg_end(irg);
arity = get_irn_arity(end);
- for(i = 0; i < arity; ++i) {
+ for (i = 0; i < arity; ++i) {
ir_node *pred = get_irn_n(end, i);
- if(!is_Block(pred))
+ if (!is_Block(pred))
continue;
remove_empty_block(pred);
}
- clear_using_irn_visited(irg);
+ ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
if (blocks_removed) {
/* invalidate analysis info */
set_irg_doms_inconsistent(irg);
set_irg_extblk_inconsistent(irg);
set_irg_outs_inconsistent(irg);
+ set_irg_loopinfo_inconsistent(irg);
}
return blocks_removed;
}