* @date 20.10.2004
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdarg.h>
#include "bestat.h"
#include "beirg_t.h"
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
} list_sched_options_t;
static list_sched_options_t list_sched_options = {
- BE_SCHED_SELECT_HEUR, /* mueller heuristic selector */
+ BE_SCHED_SELECT_NORMAL, /* mueller heuristic selector */
BE_SCHED_PREP_NONE, /* no scheduling preparation */
};
typedef struct _sched_env_t {
sched_irn_t *sched_info; /**< scheduling info per node */
const list_sched_selector_t *selector; /**< The node selector. */
- const arch_env_t *arch_env; /**< The architecture environment. */
- const ir_graph *irg; /**< The graph to schedule. */
void *selector_env; /**< A pointer to give to the selector. */
} sched_env_t;
/**
* Returns non-zero if a node must be placed in the schedule.
*/
-static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
+static inline int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
{
int res = -1;
/**
* Returns non-zero if the node is already scheduled
*/
-static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n)
+static inline int is_already_scheduled(block_sched_env_t *env, ir_node *n)
{
int idx = get_irn_idx(n);
/**
* Mark a node as already scheduled
*/
-static INLINE void set_already_scheduled(block_sched_env_t *env, ir_node *n)
+static inline void set_already_scheduled(block_sched_env_t *env, ir_node *n)
{
int idx = get_irn_idx(n);
* @param irn The node to make ready.
* @return 1, if the node could be made ready, 0 else.
*/
-static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn)
+static inline int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn)
{
int i, n;
/* if irn is an End we have keep-alives and op might be a block, skip that */
if (is_Block(op)) {
- assert(get_irn_op(irn) == op_End);
+ assert(is_End(irn));
continue;
}
/**
* Returns the number of not yet schedules users.
*/
-static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
+static inline int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
/**
* Sets the number of not yet schedules users.
*/
-static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
+static inline void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
/**
* Add @p num to the number of not yet schedules users and returns the result.
*/
-static INLINE int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
+static inline int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
else if (irn == start_node) {
/* The start block will be scheduled as the first node */
add_to_sched(&be, irn);
-#ifdef SCHEDULE_PROJS
- add_tuple_projs(&be, irn);
-#endif
}
else {
/* Other nodes must have all operands in other blocks to be made
/* Iterate over all remaining nodes */
while (ir_nodeset_size(&be.cands) > 0) {
ir_nodeset_iterator_t iter;
- /* collect statistics about amount of ready nodes */
- be_do_stat_sched_ready(block, &be.cands);
/* Keeps must be scheduled immediately */
foreach_ir_nodeset(&be.cands, irn, iter) {
/* List schedule a graph. */
void list_sched(be_irg_t *birg, be_options_t *be_opts)
{
- const arch_env_t *arch_env = birg->main_env->arch_env;
- ir_graph *irg = birg->irg;
+ ir_graph *irg = birg->irg;
int num_nodes;
sched_env_t env;
case BE_SCHED_SELECT_HEUR: sel = heuristic_selector; break;
case BE_SCHED_SELECT_NORMAL: sel = normal_selector; break;
default:
- case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector; break;
+ case BE_SCHED_SELECT_HMUCHNIK: sel = heuristic_selector; break;
}
#if 1
*/
/* Assure, that we have no dangling out-edges to deleted stuff */
- edges_deactivate(birg->irg);
- edges_activate(birg->irg);
+ edges_deactivate(irg);
+ edges_activate(irg);
#endif
switch (list_sched_options.prep) {
/* initialize environment for list scheduler */
memset(&env, 0, sizeof(env));
- env.selector = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
- env.arch_env = arch_env;
- env.irg = irg;
+ env.selector = arch_env_get_list_sched_selector(birg->main_env->arch_env, &sel);
env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
void list_sched_single_block(const be_irg_t *birg, ir_node *block,
be_options_t *be_opts)
{
- const arch_env_t *arch_env = birg->main_env->arch_env;
- ir_graph *irg = birg->irg;
+ ir_graph *irg = birg->irg;
int num_nodes;
sched_env_t env;
}
/* Assure, that the out edges are computed */
- edges_deactivate(birg->irg);
- edges_activate(birg->irg);
+ edges_deactivate(irg);
+ edges_activate(irg);
num_nodes = get_irg_last_idx(irg);
/* initialize environment for list scheduler */
memset(&env, 0, sizeof(env));
- env.selector = arch_env->isa->impl->get_list_sched_selector(arch_env->isa, &sel);
- env.arch_env = arch_env;
- env.irg = irg;
+ env.selector = arch_env_get_list_sched_selector(birg->main_env->arch_env, &sel);
env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
projects / libfirm / blobdiff