projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify test case.
[libfirm]
/
ir
/
be
/
belistsched.c
diff --git
a/ir/be/belistsched.c
b/ir/be/belistsched.c
index
5e98db6
..
254da32
100644
(file)
--- a/
ir/be/belistsched.c
+++ b/
ir/be/belistsched.c
@@
-24,9
+24,7
@@
* @date 20.10.2004
* @version $Id$
*/
* @date 20.10.2004
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
@@
-142,8
+140,6
@@
typedef struct _sched_irn_t {
typedef struct _sched_env_t {
sched_irn_t *sched_info; /**< scheduling info per node */
const list_sched_selector_t *selector; /**< The node selector. */
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;
void *selector_env; /**< A pointer to give to the selector. */
} sched_env_t;
@@
-163,7
+159,7
@@
typedef struct _block_sched_env_t {
/**
* Returns non-zero if a node must be placed in the schedule.
*/
/**
* 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;
{
int res = -1;
@@
-181,7
+177,7
@@
static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void
/**
* Returns non-zero if the node is already scheduled
*/
/**
* 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);
{
int idx = get_irn_idx(n);
@@
-192,7
+188,7
@@
static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n)
/**
* Mark a node as already scheduled
*/
/**
* 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);
{
int idx = get_irn_idx(n);
@@
-209,7
+205,7
@@
static void add_to_sched(block_sched_env_t *env, ir_node *irn);
* @param irn The node to make ready.
* @return 1, if the node could be made ready, 0 else.
*/
* @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;
{
int i, n;
@@
-286,7
+282,7
@@
static void make_users_ready(block_sched_env_t *env, ir_node *irn)
/**
* Returns the number of not yet schedules users.
*/
/**
* 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));
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
@@
-296,7
+292,7
@@
static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
/**
* Sets the number of not yet schedules users.
*/
/**
* 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));
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
@@
-306,7
+302,7
@@
static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, in
/**
* Add @p num to the number of not yet schedules users and returns the result.
*/
/**
* 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));
int idx = get_irn_idx(n);
assert(idx < ARR_LEN(env->sched_info));
@@
-548,8
+544,7
@@
static void list_sched_block(ir_node *block, void *env_ptr)
/* List schedule a graph. */
void list_sched(be_irg_t *birg, be_options_t *be_opts)
{
/* 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;
int num_nodes;
sched_env_t env;
@@
-567,7
+562,7
@@
void list_sched(be_irg_t *birg, be_options_t *be_opts)
case BE_SCHED_SELECT_HEUR: sel = heuristic_selector; break;
case BE_SCHED_SELECT_NORMAL: sel = normal_selector; break;
default:
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
}
#if 1
@@
-577,8
+572,8
@@
void list_sched(be_irg_t *birg, be_options_t *be_opts)
*/
/* Assure, that we have no dangling out-edges to deleted stuff */
*/
/* 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) {
#endif
switch (list_sched_options.prep) {
@@
-596,9
+591,7
@@
void list_sched(be_irg_t *birg, be_options_t *be_opts)
/* initialize environment for list scheduler */
memset(&env, 0, sizeof(env));
/* initialize environment for list scheduler */
memset(&env, 0, sizeof(env));
- env.selector = arch_env_get_list_sched_selector(arch_env, &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]));
env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));
@@
-622,8
+615,7
@@
void list_sched(be_irg_t *birg, be_options_t *be_opts)
void list_sched_single_block(const be_irg_t *birg, ir_node *block,
be_options_t *be_opts)
{
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;
int num_nodes;
sched_env_t env;
@@
-644,16
+636,14
@@
void list_sched_single_block(const be_irg_t *birg, ir_node *block,
}
/* Assure, that the out edges are computed */
}
/* 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));
num_nodes = get_irg_last_idx(irg);
/* initialize environment for list scheduler */
memset(&env, 0, sizeof(env));
- env.selector = arch_env_get_list_sched_selector(arch_env, &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]));
env.sched_info = NEW_ARR_F(sched_irn_t, num_nodes);
memset(env.sched_info, 0, num_nodes * sizeof(env.sched_info[0]));