be_add_reload_on_edge(spill_env, node, block, in, cls, 1);
} else {
be_add_reload_on_edge(spill_env, node, block, in, cls, 1);
} else {
- size_t n_live_nodes = ir_nodeset_size(live_nodes);
- size_t values_defined = 0;
- size_t free_regs_needed = 0;
- spill_candidate_t *candidates;
- ir_nodeset_iterator_t iter;
- int i, arity;
- size_t c;
- int spills_needed;
- size_t cand_idx;
- ir_node *n;
- ir_node *value;
-
+ size_t values_defined = 0;
be_foreach_definition(node, cls, value,
be_foreach_definition(node, cls, value,
assert(req_->width >= 1);
values_defined += req_->width;
);
/* we need registers for the non-live argument values */
assert(req_->width >= 1);
values_defined += req_->width;
);
/* we need registers for the non-live argument values */
- arity = get_irn_arity(node);
- for (i = 0; i < arity; ++i) {
- ir_node *pred = get_irn_n(node, i);
- if (arch_irn_consider_in_reg_alloc(cls, pred)
- && !ir_nodeset_contains(live_nodes, pred)) {
- free_regs_needed += get_value_width(pred);
+ size_t free_regs_needed = 0;
+ be_foreach_use(node, cls, in_req_, use, pred_req_,
+ if (!ir_nodeset_contains(live_nodes, use)) {
+ free_regs_needed += get_value_width(use);
/* we can reuse all reloaded values for the defined values, but we might
* need even more registers */
if (values_defined > free_regs_needed)
free_regs_needed = values_defined;
/* we can reuse all reloaded values for the defined values, but we might
* need even more registers */
if (values_defined > free_regs_needed)
free_regs_needed = values_defined;
if (spills_needed <= 0)
return;
DBG((dbg, LEVEL_2, "\tspills needed after %+F: %d\n", node, spills_needed));
if (spills_needed <= 0)
return;
DBG((dbg, LEVEL_2, "\tspills needed after %+F: %d\n", node, spills_needed));
foreach_ir_nodeset(live_nodes, n, iter) {
spill_candidate_t *candidate = & candidates[c];
foreach_ir_nodeset(live_nodes, n, iter) {
spill_candidate_t *candidate = & candidates[c];
if (cand_idx >= n_live_nodes) {
panic("can't spill enough values for node %+F", node);
}
if (cand_idx >= n_live_nodes) {
panic("can't spill enough values for node %+F", node);
}
++cand_idx;
if (arch_irn_is(skip_Proj_const(cand_node), dont_spill))
continue;
/* make sure the node is not an argument of the instruction */
++cand_idx;
if (arch_irn_is(skip_Proj_const(cand_node), dont_spill))
continue;
/* make sure the node is not an argument of the instruction */
ir_node *op = get_irn_n(node, i);
if (arch_irn_consider_in_reg_alloc(cls, op) &&
ir_node *op = get_irn_n(node, i);
if (arch_irn_consider_in_reg_alloc(cls, op) &&
foreach_ir_nodeset(nodeset, node, iter) {
ir_fprintf(stderr, "%+F ", node);
}
foreach_ir_nodeset(nodeset, node, iter) {
ir_fprintf(stderr, "%+F ", node);
}
DBG((dbg, LEVEL_1, "spilling block %+F\n", block));
/* construct set of live nodes at end of block */
DBG((dbg, LEVEL_1, "spilling block %+F\n", block));
/* construct set of live nodes at end of block */
ir_nodeset_init(&live_nodes);
be_liveness_end_of_block(lv, cls, block, &live_nodes);
/* remove already spilled nodes from liveset */
ir_nodeset_init(&live_nodes);
be_liveness_end_of_block(lv, cls, block, &live_nodes);
/* remove already spilled nodes from liveset */
- {
- ir_node *node;
- foreach_ir_nodeset(&live_nodes, node, iter) {
- DBG((dbg, LEVEL_2, "\t%+F is live-end... ", node));
- if (bitset_is_set(spilled_nodes, get_irn_idx(node))) {
- DBG((dbg, LEVEL_2, "but spilled; removing.\n"));
- ir_nodeset_remove_iterator(&live_nodes, &iter);
- } else {
- DBG((dbg, LEVEL_2, "keeping.\n"));
- }
+ foreach_ir_nodeset(&live_nodes, node, iter) {
+ DBG((dbg, LEVEL_2, "\t%+F is live-end... ", node));
+ if (bitset_is_set(spilled_nodes, get_irn_idx(node))) {
+ DBG((dbg, LEVEL_2, "but spilled; removing.\n"));
+ ir_nodeset_remove_iterator(&live_nodes, &iter);
+ } else {
+ DBG((dbg, LEVEL_2, "keeping.\n"));
/* until now only the values of some phis have been spilled the phis itself
* are still there and occupy registers, so we need to count them and might
* have to spill some of them. */
/* until now only the values of some phis have been spilled the phis itself
* are still there and occupy registers, so we need to count them and might
* have to spill some of them. */
- live_nodes_pressure = 0;
- {
- ir_node *node;
- foreach_ir_nodeset(&live_nodes, node, iter) {
- live_nodes_pressure += get_value_width(node);
- }
+ int live_nodes_pressure = 0;
+ foreach_ir_nodeset(&live_nodes, node, iter) {
+ live_nodes_pressure += get_value_width(node);
- regpressure = live_nodes_pressure + n_phi_values_spilled;
- phi_spills_needed = regpressure - n_regs;
+ int regpressure = live_nodes_pressure + n_phi_values_spilled;
+ int phi_spills_needed = regpressure - n_regs;
DBG((dbg, LEVEL_3, "Regpressure before phis: %d phispills: %d\n",
regpressure, phi_spills_needed));
DBG((dbg, LEVEL_3, "Regpressure before phis: %d phispills: %d\n",
regpressure, phi_spills_needed));