#include <stdlib.h>
-#include "besched_t.h"
+#include "besched.h"
#include "belistsched.h"
#include "belive_t.h"
#include "beutil.h"
#include "height.h"
#include "irtools.h"
#include "irgwalk.h"
-#include "benode_t.h"
+#include "benode.h"
#include "array_t.h"
// XXX there is no one time init for schedulers
/** An instance of the normal scheduler. */
typedef struct instance_t {
- ir_graph* irg; /**< the IR graph of this instance */
- struct obstack obst; /**< obstack for temporary data */
+ ir_graph* irg; /**< the IR graph of this instance */
+ struct obstack obst; /**< obstack for temporary data */
+ ir_node* curr_list; /**< current block schedule list */
} instance_t;
static int must_be_scheduled(const ir_node* const irn)
static ir_node *normal_select(void *block_env, ir_nodeset_t *ready_set,
ir_nodeset_t *live_set)
{
+ instance_t* inst = block_env;
+ ir_node* irn;
+ ir_node* next;
+ ir_node* last = NULL;
ir_nodeset_iterator_t iter;
- ir_node* block;
- ir_node* irn;
- ir_node** sched;
- int sched_count;
- (void)block_env;
(void)live_set;
- ir_nodeset_iterator_init(&iter, ready_set);
- irn = ir_nodeset_iterator_next(&iter);
- block = get_nodes_block(irn);
- sched = get_irn_link(block);
- sched_count = ARR_LEN(sched);
- for (; sched_count-- != 0; ++sched) {
- ir_node* irn = *sched;
- if (ir_nodeset_contains(ready_set, irn) &&
- !arch_irn_class_is(irn, branch)) {
+ for (irn = inst->curr_list; irn != NULL; last = irn, irn = next) {
+ next = get_irn_link(irn);
+ if (ir_nodeset_contains(ready_set, irn)) {
#if defined NORMAL_DBG
ir_fprintf(stderr, "scheduling %+F\n", irn);
#endif
+ if (last == NULL)
+ inst->curr_list = next;
+ else
+ set_irn_link(last, next);
return irn;
}
}
+ ir_nodeset_iterator_init(&iter, ready_set);
+ irn = ir_nodeset_iterator_next(&iter);
return irn;
}
int i;
ir_node* block = get_nodes_block(irn);
- fc = obstack_alloc(&inst->obst, sizeof(*fc) + sizeof(*fc->costs) * arity);
+ fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
fc->no_root = 0;
costs = fc->costs;
static void normal_sched_block(ir_node* block, void* env)
{
+ ir_node** roots = get_irn_link(block);
heights_t* heights = env;
- ir_node** roots = get_irn_link(block);
int root_count;
irn_cost_pair* root_costs;
int i;
static void *normal_init_graph(const list_sched_selector_t *vtab,
const be_irg_t *birg)
{
- instance_t *inst = XMALLOC(instance_t);
- ir_graph *irg = be_get_birg_irg(birg);
- heights_t *heights;
+ instance_t* inst = XMALLOC(instance_t);
+ ir_graph* irg = be_get_birg_irg(birg);
+ heights_t* heights;
(void)vtab;
- inst->irg = irg;
- obstack_init(&inst->obst);
-
be_clear_links(irg);
+ obstack_init(&inst->obst);
+ inst->irg = irg;
+
heights = heights_new(irg);
ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
return inst;
}
-
static void *normal_init_block(void *graph_env, ir_node *block)
{
- (void)graph_env;
- (void)block;
-
- return NULL;
+ instance_t* inst = graph_env;
+ ir_node** sched = get_irn_link(block);
+ ir_node* first = NULL;
+ int i;
+
+ /* turn into a list, so we can easily remove nodes.
+ The link field is used anyway. */
+ for (i = ARR_LEN(sched) - 1; i >= 0; --i) {
+ ir_node* irn = sched[i];
+ if (!is_cfop(irn)) {
+ set_irn_link(irn, first);
+ first = irn;
+ }
+ }
+ /* note: we can free sched here, there should be no attempt to schedule
+ a block twice */
+ DEL_ARR_F(sched);
+ set_irn_link(block, sched);
+ inst->curr_list = first;
+ return inst;
}
-void normal_finish_graph(void *env)
+static void normal_finish_graph(void *env)
{
instance_t *inst = env;