projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove compound path initializers.
[libfirm]
/
ir
/
be
/
beschednormal.c
diff --git
a/ir/be/beschednormal.c
b/ir/be/beschednormal.c
index
09ad7e2
..
7ca3f19
100644
(file)
--- a/
ir/be/beschednormal.c
+++ b/
ir/be/beschednormal.c
@@
-20,7
+20,6
@@
/**
* @brief Use the strong normal form theorem (though it does not hold)
* @author Christoph Mallon
/**
* @brief Use the strong normal form theorem (though it does not hold)
* @author Christoph Mallon
- * @version $Id$
*/
#include "config.h"
*/
#include "config.h"
@@
-31,10
+30,10
@@
#include "belive_t.h"
#include "beutil.h"
#include "heights.h"
#include "belive_t.h"
#include "beutil.h"
#include "heights.h"
-#include "irtools.h"
#include "irgwalk.h"
#include "benode.h"
#include "bemodule.h"
#include "irgwalk.h"
#include "benode.h"
#include "bemodule.h"
+#include "util.h"
#include "array_t.h"
// XXX there is no one time init for schedulers
#include "array_t.h"
// XXX there is no one time init for schedulers
@@
-120,7
+119,7
@@
static int count_result(const ir_node* irn)
if (mode == mode_T)
return 1;
if (mode == mode_T)
return 1;
- if (arch_get_
register_req_out
(irn)->type & arch_register_req_type_ignore)
+ if (arch_get_
irn_register_req
(irn)->type & arch_register_req_type_ignore)
return 0;
return 1;
return 0;
return 1;
@@
-152,7
+151,6
@@
static int normal_tree_cost(ir_node* irn, instance_t *inst)
if (fc == NULL) {
irn_cost_pair* costs;
if (fc == NULL) {
irn_cost_pair* costs;
- int i;
ir_node* block = get_nodes_block(irn);
fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
ir_node* block = get_nodes_block(irn);
fc = OALLOCF(&inst->obst, flag_and_cost, costs, arity);
@@
-161,7
+159,6
@@
static int normal_tree_cost(ir_node* irn, instance_t *inst)
for (i = 0; i < arity; ++i) {
ir_node* pred = get_irn_n(irn, i);
for (i = 0; i < arity; ++i) {
ir_node* pred = get_irn_n(irn, i);
- int cost;
if (is_Phi(irn) || get_irn_mode(pred) == mode_M || is_Block(pred)) {
cost = 0;
if (is_Phi(irn) || get_irn_mode(pred) == mode_M || is_Block(pred)) {
cost = 0;
@@
-172,7
+169,6
@@
static int normal_tree_cost(ir_node* irn, instance_t *inst)
ir_node* real_pred;
cost = normal_tree_cost(pred, inst);
ir_node* real_pred;
cost = normal_tree_cost(pred, inst);
- if (be_is_Barrier(pred)) cost = 1; // XXX hack: the barrier causes all users to have a reguse of #regs
if (!arch_irn_is_ignore(pred)) {
real_pred = (is_Proj(pred) ? get_Proj_pred(pred) : pred);
pred_fc = get_irn_fc(real_pred);
if (!arch_irn_is_ignore(pred)) {
real_pred = (is_Proj(pred) ? get_Proj_pred(pred) : pred);
pred_fc = get_irn_fc(real_pred);
@@
-201,6
+197,8
@@
static int normal_tree_cost(ir_node* irn, instance_t *inst)
mode = get_irn_mode(op);
if (mode == mode_M)
continue;
mode = get_irn_mode(op);
if (mode == mode_M)
continue;
+ if (arch_get_irn_flags(op) & arch_irn_flags_not_scheduled)
+ continue;
if (mode != mode_T && arch_irn_is_ignore(op))
continue;
cost = MAX(fc->costs[i].cost + n_op_res, cost);
if (mode != mode_T && arch_irn_is_ignore(op))
continue;
cost = MAX(fc->costs[i].cost + n_op_res, cost);
@@
-289,15
+287,19
@@
static int root_cmp(const void* a, const void* b)
const irn_cost_pair* const a1 = (const irn_cost_pair*)a;
const irn_cost_pair* const b1 = (const irn_cost_pair*)b;
int ret;
const irn_cost_pair* const a1 = (const irn_cost_pair*)a;
const irn_cost_pair* const b1 = (const irn_cost_pair*)b;
int ret;
- if (is_irn_forking(a1->irn)) {
+ if (is_irn_forking(a1->irn)
&& !is_irn_forking(b1->irn)
) {
ret = 1;
ret = 1;
- } else if (is_irn_forking(b1->irn)) {
+ } else if (is_irn_forking(b1->irn)
&& !is_irn_forking(a1->irn)
) {
ret = -1;
} else {
ret = b1->cost - a1->cost;
if (ret == 0) {
/* place live-out nodes later */
ret = (count_result(a1->irn) != 0) - (count_result(b1->irn) != 0);
ret = -1;
} else {
ret = b1->cost - a1->cost;
if (ret == 0) {
/* place live-out nodes later */
ret = (count_result(a1->irn) != 0) - (count_result(b1->irn) != 0);
+ if (ret == 0) {
+ /* compare node idx */
+ ret = get_irn_idx(a1->irn) - get_irn_idx(b1->irn);
+ }
}
}
#if defined NORMAL_DBG
}
}
#if defined NORMAL_DBG
@@
-447,7
+449,7
@@
static void sched_normal(ir_graph *irg)
be_list_sched_graph(irg, &normal_selector);
}
be_list_sched_graph(irg, &normal_selector);
}
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_normal)
;
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched_normal)
void be_init_sched_normal(void)
{
be_register_scheduler("normal", sched_normal);
void be_init_sched_normal(void)
{
be_register_scheduler("normal", sched_normal);