/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* spilled. So in some situations (for example 2 adc-nodes that use the flags of
* a single add node on x86) operations have to be repeated to work correctly.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "irgwalk.h"
#include "irnode_t.h"
#include "error.h"
#include "beflags.h"
-#include "bearch_t.h"
-#include "beirg_t.h"
-#include "besched_t.h"
-#include "benode_t.h"
+#include "bearch.h"
+#include "beirg.h"
+#include "besched.h"
+#include "benode.h"
+#include "belive.h"
-static const arch_env_t *arch_env = NULL;
static const arch_register_class_t *flag_class = NULL;
static const arch_register_t *flags_reg = NULL;
static func_rematerialize remat = NULL;
+static int changed;
static ir_node *default_remat(ir_node *node, ir_node *after)
{
}
/**
- * tests wether we can legally move node node after node after
+ * tests whether we can legally move node node after node after
* (only works for nodes in same block)
*/
static int can_move(ir_node *node, ir_node *after)
assert(get_irn_n_edges_kind(out, EDGE_KIND_DEP) == 0);
foreach_out_edge(out, edge2) {
ir_node *out2 = get_edge_src_irn(edge2);
- /* phi represents a usage at block end */
- if(is_Phi(out2))
+ /* Phi or End represents a usage at block end. */
+ if(is_Phi(out2) || is_End(out2))
continue;
if(is_Sync(out2)) {
const ir_edge_t *edge3;
foreach_out_edge(out2, edge3) {
ir_node *out3 = get_edge_src_irn(edge3);
- /* phi represents a usage at block end */
- if(is_Phi(out3))
+ /* Phi or End represents a usage at block end. */
+ if(is_Phi(out3) || is_End(out3))
continue;
assert(!is_Sync(out3));
if(sched_get_time_step(out3) <= sched_get_time_step(after)) {
}
static void rematerialize_or_move(ir_node *flags_needed, ir_node *node,
- ir_node *flag_consumers, int pn)
+ ir_node *flag_consumers, int pn, be_lv_t *lv)
{
ir_node *n;
ir_node *copy;
/* move it */
sched_remove(flags_needed);
sched_add_after(node, flags_needed);
+ /* No need to update liveness, because the node stays in the same block */
return;
}
- copy = remat(flags_needed, node);
+ changed = 1;
+ copy = remat(flags_needed, node);
if(get_irn_mode(copy) == mode_T) {
ir_node *block = get_nodes_block(copy);
ir_mode *mode = flag_class->mode;
- value = new_rd_Proj(NULL, current_ir_graph, block,
- copy, mode, pn);
+ value = new_rd_Proj(NULL, block, copy, mode, pn);
} else {
value = copy;
}
}
n = get_irn_link(n);
} while(n != NULL);
+
+ /* No need to introduce the copy, because it only lives in this block, but
+ * we have to update the liveness of all operands */
+ if (is_Block(node) ||
+ get_nodes_block(node) != get_nodes_block(flags_needed)) {
+ int i;
+
+ if (lv != NULL) {
+ for (i = get_irn_arity(copy) - 1; i >= 0; --i) {
+ be_liveness_update(lv, get_irn_n(copy, i));
+ }
+ }
+ }
}
static int is_modify_flags(ir_node *node) {
int i, arity;
- if(arch_irn_is(arch_env, node, modify_flags))
+ if (arch_irn_is(node, modify_flags))
return 1;
if(!be_is_Keep(node))
return 0;
for(i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
in = skip_Proj(in);
- if(arch_irn_is(arch_env, in, modify_flags))
+ if (arch_irn_is(in, modify_flags))
return 1;
}
ir_node *node;
ir_node *flags_needed = NULL;
ir_node *flag_consumers = NULL;
- int pn;
- (void) env;
+ int pn = -1;
sched_foreach_reverse(block, node) {
int i, arity;
flag_consumers = NULL;
}
- /* test wether node destroys the flags */
+ /* test whether node destroys the flags */
if(flags_needed != NULL && is_modify_flags(node)) {
/* rematerialize */
- rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+ rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
flags_needed = NULL;
flag_consumers = NULL;
}
- /* test wether the current node needs flags */
+ /* test whether the current node needs flags */
arity = get_irn_arity(node);
for(i = 0; i < arity; ++i) {
- //ir_node *in = get_irn_n(node, i);
- const arch_register_class_t *cls
- = arch_get_irn_reg_class(arch_env, node, i);
+ const arch_register_class_t *cls = arch_get_irn_reg_class(node, i);
if(cls == flag_class) {
assert(new_flags_needed == NULL);
new_flags_needed = get_irn_n(node, i);
continue;
/* spiller can't (correctly) remat flag consumers at the moment */
- assert(!arch_irn_is(arch_env, node, rematerializable));
- if(new_flags_needed != flags_needed) {
+ assert(!arch_irn_is(node, rematerializable));
+
+ if(skip_Proj(new_flags_needed) != flags_needed) {
if(flags_needed != NULL) {
/* rematerialize node */
- rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+ rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
flags_needed = NULL;
flag_consumers = NULL;
}
flags_needed = new_flags_needed;
- arch_set_irn_register(arch_env, flags_needed, flags_reg);
+ arch_set_irn_register(flags_needed, flags_reg);
if(is_Proj(flags_needed)) {
pn = get_Proj_proj(flags_needed);
flags_needed = get_Proj_pred(flags_needed);
}
flag_consumers = node;
set_irn_link(flag_consumers, NULL);
- assert(arch_irn_is(arch_env, flags_needed, rematerializable));
+ assert(arch_irn_is(flags_needed, rematerializable));
} else {
/* link all consumers in a list */
set_irn_link(node, flag_consumers);
if(flags_needed != NULL) {
assert(get_nodes_block(flags_needed) != block);
- rematerialize_or_move(flags_needed, node, flag_consumers, pn);
+ rematerialize_or_move(flags_needed, node, flag_consumers, pn, env);
flags_needed = NULL;
flag_consumers = NULL;
}
{
ir_graph *irg = be_get_birg_irg(birg);
- arch_env = be_get_birg_arch_env(birg);
flag_class = flag_cls;
flags_reg = & flag_class->regs[0];
remat = remat_func;
+ changed = 0;
if(remat == NULL)
remat = &default_remat;
- set_using_irn_link(irg);
- irg_block_walk_graph(irg, fix_flags_walker, NULL, NULL);
- clear_using_irn_link(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+ irg_block_walk_graph(irg, fix_flags_walker, NULL, birg->lv);
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+
+ if(changed) {
+ be_remove_dead_nodes_from_schedule(birg);
+ }
}
projects / libfirm / blobdiff