#include "irgwalk.h"
#include "array_t.h"
-#include "bearch_t.h"
+#include "bearch.h"
#include "belower.h"
-#include "benode_t.h"
-#include "besched_t.h"
+#include "benode.h"
+#include "besched.h"
#include "bestat.h"
#include "bessaconstr.h"
#include "beintlive_t.h"
static void lower_perm_node(ir_node *irn, lower_env_t *env)
{
const arch_register_class_t *const reg_class = arch_get_irn_register(get_irn_n(irn, 0))->reg_class;
- ir_graph *const irg = get_irn_irg(irn);
ir_node *const block = get_nodes_block(irn);
int const arity = get_irn_arity(irn);
- reg_pair_t *const pairs = alloca(arity * sizeof(pairs[0]));
+ reg_pair_t *const pairs = ALLOCAN(reg_pair_t, arity);
int keep_perm = 0;
int do_copy = env->do_copy;
/* Get the schedule predecessor node to the perm.
pair = &pairs[n++];
pair->in_node = in;
- pair->in_reg = arch_get_irn_register(in);
+ pair->in_reg = in_reg;
pair->out_node = out;
- pair->out_reg = arch_get_irn_register(out);
+ pair->out_reg = out_reg;
pair->checked = 0;
}
DBG((dbg, LEVEL_1, "%+F (%+F, %s) and (%+F, %s)\n",
irn, res1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
- cpyxchg = be_new_Perm(reg_class, irg, block, 2, in);
+ cpyxchg = be_new_Perm(reg_class, block, 2, in);
if (i > 0) {
/* cycle is not done yet */
int pidx = get_pairidx_for_in_regidx(pairs, n, cycle.elems[i]->index);
/* create intermediate proj */
- res1 = new_r_Proj(irg, block, cpyxchg, get_irn_mode(res1), 0);
+ res1 = new_r_Proj(block, cpyxchg, get_irn_mode(res1), 0);
/* set as in for next Perm */
pairs[pidx].in_node = res1;
arch_set_irn_register(res1, cycle.elems[i]);
/* insert the copy/exchange node in schedule after the magic schedule node (see above) */
- sched_add_after(sched_point, cpyxchg);
+ sched_add_after(skip_Proj(sched_point), cpyxchg);
- DBG((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
+ DB((dbg, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point));
/* set the new scheduling point */
sched_point = res1;
} else {
ir_node *cpyxchg;
- DBG((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
+ DB((dbg, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n",
irn, arg1, cycle.elems[i]->name, res2, cycle.elems[i + 1]->name));
- cpyxchg = be_new_Copy(reg_class, irg, block, arg1);
+ cpyxchg = be_new_Copy(reg_class, block, arg1);
arch_set_irn_register(cpyxchg, cycle.elems[i + 1]);
/* exchange copy node and proj */
exchange(res2, cpyxchg);
/* insert the copy/exchange node in schedule after the magic schedule node (see above) */
- sched_add_after(sched_point, cpyxchg);
+ sched_add_after(skip_Proj(sched_point), cpyxchg);
/* set the new scheduling point */
sched_point = cpyxchg;
ir_node *keep, *cpy;
op_copy_assoc_t *entry;
- if (arch_irn_is(other_different, ignore) ||
+ if (arch_irn_is_ignore(other_different) ||
!mode_is_datab(get_irn_mode(other_different))) {
- DBG((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
+ DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
return;
}
irg = be_get_birg_irg(env->birg);
op_set = &env->op_set;
block = get_nodes_block(irn);
- cls = arch_get_irn_reg_class(other_different, -1);
+ cls = arch_get_irn_reg_class_out(other_different);
/* Make a not spillable copy of the different node */
/* this is needed because the different irn could be */
/* check if already exists such a copy in the schedule immediately before */
cpy = find_copy(skip_Proj(irn), other_different);
if (! cpy) {
- cpy = be_new_Copy(cls, irg, block, other_different);
- be_node_set_flags(cpy, BE_OUT_POS(0), arch_irn_flags_dont_spill);
- DBG((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
+ cpy = be_new_Copy(cls, block, other_different);
+ arch_irn_set_flags(cpy, arch_irn_flags_dont_spill);
+ DB((dbg_constr, LEVEL_1, "created non-spillable %+F for value %+F\n", cpy, other_different));
} else {
- DBG((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different));
+ DB((dbg_constr, LEVEL_1, "using already existing %+F for value %+F\n", cpy, other_different));
}
/* Add the Keep resp. CopyKeep and reroute the users */
/* of the other_different irn in case of CopyKeep. */
if (has_irn_users(other_different)) {
- keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different));
- be_node_set_reg_class(keep, 1, cls);
+ keep = be_new_CopyKeep_single(cls, block, cpy, irn, get_irn_mode(other_different));
+ be_node_set_reg_class_in(keep, 1, cls);
} else {
ir_node *in[2];
in[0] = irn;
in[1] = cpy;
- keep = be_new_Keep(cls, irg, block, 2, in);
+ keep = be_new_Keep(block, 2, in);
}
- DBG((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
+ DB((dbg_constr, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy));
/* insert copy and keep into schedule */
assert(sched_is_scheduled(irn) && "need schedule to assure constraints");
if (! sched_is_scheduled(cpy))
sched_add_before(skip_Proj(irn), cpy);
- sched_add_after(irn, keep);
+ sched_add_after(skip_Proj(irn), keep);
/* insert the other different and it's copies into the map */
entry = ir_nodemap_get(op_set, other_different);
if (! entry) {
- entry = obstack_alloc(&env->obst, sizeof(*entry));
+ entry = OALLOC(&env->obst, op_copy_assoc_t);
entry->cls = cls;
ir_nodeset_init(&entry->copies);
* (or Projs of the same node), copying the same operand.
*/
static void melt_copykeeps(constraint_env_t *cenv) {
- be_irg_t *birg = cenv->birg;
- ir_graph *irg = be_get_birg_irg(birg);
ir_nodemap_iterator_t map_iter;
ir_nodemap_entry_t map_entry;
ref_mode_T = skip_Proj(get_irn_n(ref, 1));
obstack_grow(&obst, &ref, sizeof(ref));
- DBG((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref));
+ DB((dbg_constr, LEVEL_1, "Trying to melt %+F:\n", ref));
/* check for copykeeps pointing to the same mode_T node as the reference copykeep */
for (j = 0; j < num_ck; ++j) {
if (j != idx && cur_ck && skip_Proj(get_irn_n(cur_ck, 1)) == ref_mode_T) {
obstack_grow(&obst, &cur_ck, sizeof(cur_ck));
ir_nodeset_remove(&entry->copies, cur_ck);
- DBG((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck));
+ DB((dbg_constr, LEVEL_1, "\t%+F\n", cur_ck));
ck_arr[j] = NULL;
++n_melt;
sched_remove(cur_ck);
/* check, if we found some candidates for melting */
if (n_melt == 1) {
- DBG((dbg_constr, LEVEL_1, "\tno candidate found\n"));
+ DB((dbg_constr, LEVEL_1, "\tno candidate found\n"));
continue;
}
}
#ifdef KEEP_ALIVE_COPYKEEP_HACK
- new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
+ new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, mode_ANY);
keep_alive(new_ck);
#else
- new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
+ new_ck = be_new_CopyKeep(entry->cls, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
#endif /* KEEP_ALIVE_COPYKEEP_HACK */
/* set register class for all kept inputs */
for (j = 1; j <= n_melt; ++j)
- be_node_set_reg_class(new_ck, j, entry->cls);
+ be_node_set_reg_class_in(new_ck, j, entry->cls);
ir_nodeset_insert(&entry->copies, new_ck);
} while (be_is_Keep(sched_pt) || be_is_CopyKeep(sched_pt));
sched_add_before(sched_pt, new_ck);
- DBG((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt));
+ DB((dbg_constr, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt));
/* finally: kill the reference copykeep */
kill_node(ref);
void assure_constraints(be_irg_t *birg) {
ir_graph *irg = be_get_birg_irg(birg);
constraint_env_t cenv;
- ir_node **nodes;
ir_nodemap_iterator_t map_iter;
ir_nodemap_entry_t map_entry;
/* for all */
foreach_ir_nodemap(&cenv.op_set, map_entry, map_iter) {
- op_copy_assoc_t *entry = map_entry.data;
- int n;
- ir_node *cp;
- ir_nodeset_iterator_t iter;
+ op_copy_assoc_t *entry = map_entry.data;
+ int n = ir_nodeset_size(&entry->copies);
+ ir_node **nodes = ALLOCAN(ir_node*, n);
+ ir_node *cp;
+ ir_nodeset_iterator_t iter;
be_ssa_construction_env_t senv;
- n = ir_nodeset_size(&entry->copies);
- nodes = alloca(n * sizeof(nodes[0]));
-
/* put the node in an array */
DBG((dbg_constr, LEVEL_1, "introduce copies for %+F ", map_entry.node));
/* so we transform unnecessary ones into Keeps. */
foreach_ir_nodeset(&entry->copies, cp, iter) {
if (be_is_CopyKeep(cp) && get_irn_n_edges(cp) < 1) {
+ int n = get_irn_arity(cp);
ir_node *keep;
- int n = get_irn_arity(cp);
- keep = be_new_Keep(arch_get_irn_reg_class(cp, -1),
- irg, get_nodes_block(cp), n, get_irn_in(cp) + 1);
+ keep = be_new_Keep(get_nodes_block(cp), n, get_irn_in(cp) + 1);
sched_add_before(cp, keep);
/* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */
int n_moved;
int new_size;
ir_node *frontier = bl;
-
+ ir_node *irn;
int i, n;
- const ir_edge_t *edge;
- ir_node *one_proj = NULL, *irn;
- const arch_register_class_t *cls = NULL;
-
- DBG((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
/* get some Proj and find out the register class of that Proj. */
- edge = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
- one_proj = get_edge_src_irn(edge);
+ const ir_edge_t *edge = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL);
+ ir_node *one_proj = get_edge_src_irn(edge);
+ const arch_register_class_t *cls = arch_get_irn_reg_class_out(one_proj);
assert(is_Proj(one_proj));
- cls = arch_get_irn_reg_class(one_proj, -1);
+
+ DB((dbg_permmove, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
/* Find the point in the schedule after which the
* potentially movable nodes must be defined.
for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
ir_node *op = get_irn_n(irn, i);
if (arch_irn_consider_in_reg_alloc(cls, op) &&
- !values_interfere(env->birg, op, one_proj)) {
+ !be_values_interfere(env->birg->lv, op, one_proj)) {
frontier = irn;
goto found_front;
}
}
found_front:
- DBG((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
+ DB((dbg_permmove, LEVEL_2, "\tfrontier: %+F\n", frontier));
node = sched_prev(perm);
n_moved = 0;
new_size = arity - n_moved;
if(new_size == 0) {
+ sched_remove(perm);
+ kill_node(perm);
return 0;
}
- map = alloca(new_size * sizeof(map[0]));
- proj_map = alloca(arity * sizeof(proj_map[0]));
+ map = ALLOCAN(int, new_size);
+ proj_map = ALLOCAN(int, arity);
memset(proj_map, -1, sizeof(proj_map[0]));
n = 0;
for (i = 0; i < arity; ++i) {
projects / libfirm / blobdiff