projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 0x prefix for printing ARM IncSP amount in hex.
[libfirm]
/
ir
/
be
/
beintlive_t.h
diff --git
a/ir/be/beintlive_t.h
b/ir/be/beintlive_t.h
index
49827ee
..
ee02f21
100644
(file)
--- a/
ir/be/beintlive_t.h
+++ b/
ir/be/beintlive_t.h
@@
-16,8
+16,11
@@
#include "irphase_t.h"
#include "iredges_t.h"
#include "irphase_t.h"
#include "iredges_t.h"
+#include "statev.h"
+
#include "beirg_t.h"
#include "besched_t.h"
#include "beirg_t.h"
#include "besched_t.h"
+#include "belive_t.h"
/**
* Check dominance of two nodes in the same block.
/**
* Check dominance of two nodes in the same block.
@@
-28,8
+31,8
@@
static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b)
{
/* TODO: ? : can be removed?! */
static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b)
{
/* TODO: ? : can be removed?! */
- sched_timestep_t as =
is_Phi(a) ? 0 : sched_get_time_step(a)
;
- sched_timestep_t bs =
is_Phi(b) ? 0 : sched_get_time_step(b)
;
+ sched_timestep_t as =
sched_is_scheduled(a) ? sched_get_time_step(a) : 0
;
+ sched_timestep_t bs =
sched_is_scheduled(b) ? sched_get_time_step(b) : 0
;
return as <= bs;
}
return as <= bs;
}
@@
-42,8
+45,8
@@
static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b
static INLINE int _value_strictly_dominates_intrablock(const ir_node *a, const ir_node *b)
{
/* TODO: ? : can be removed?! */
static INLINE int _value_strictly_dominates_intrablock(const ir_node *a, const ir_node *b)
{
/* TODO: ? : can be removed?! */
- sched_timestep_t as =
is_Phi(a) ? 0 : sched_get_time_step(a)
;
- sched_timestep_t bs =
is_Phi(b) ? 0 : sched_get_time_step(b)
;
+ sched_timestep_t as =
sched_is_scheduled(a) ? sched_get_time_step(a) : 0
;
+ sched_timestep_t bs =
sched_is_scheduled(b) ? sched_get_time_step(b) : 0
;
return as < bs;
}
return as < bs;
}
@@
-56,8
+59,8
@@
static INLINE int _value_strictly_dominates_intrablock(const ir_node *a, const i
*/
static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
{
*/
static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
{
- const ir_node *block_a = get_block(a);
- const ir_node *block_b = get_block(b);
+ const ir_node *block_a = get_block
_const
(a);
+ const ir_node *block_b = get_block
_const
(b);
/*
* a and b are not in the same block,
/*
* a and b are not in the same block,
@@
-82,8
+85,8
@@
static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
*/
static INLINE int _value_strictly_dominates(const ir_node *a, const ir_node *b)
{
*/
static INLINE int _value_strictly_dominates(const ir_node *a, const ir_node *b)
{
- const ir_node *block_a = get_block(a);
- const ir_node *block_b = get_block(b);
+ const ir_node *block_a = get_block
_const
(a);
+ const ir_node *block_b = get_block
_const
(b);
/*
* a and b are not in the same block,
/*
* a and b are not in the same block,
@@
-110,30
+113,36
@@
static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
{
int a2b = _value_dominates(a, b);
int b2a = _value_dominates(b, a);
{
int a2b = _value_dominates(a, b);
int b2a = _value_dominates(b, a);
+ int res = 0;
+
+ stat_ev_ctx_push("beintlive");
+
+ /*
+ * Adjust a and b so, that a dominates b if
+ * a dominates b or vice versa.
+ */
+ if(b2a) {
+ const ir_node *t = a;
+ a = b;
+ b = t;
+ a2b = 1;
+ }
/* If there is no dominance relation, they do not interfere. */
/* If there is no dominance relation, they do not interfere. */
- if(
(a2b | b2a) > 0
) {
+ if(
a2b
) {
const ir_edge_t *edge;
const ir_edge_t *edge;
- ir_node *bb;
+ ir_node *bb
= get_nodes_block(b)
;
- /*
- * Adjust a and b so, that a dominates b if
- * a dominates b or vice versa.
- */
- if(b2a) {
- const ir_node *t = a;
- a = b;
- b = t;
- }
-
- bb = get_nodes_block(b);
+ stat_ev_dbl("beintlive_ignore", arch_irn_is(lv->birg->main_env->arch_env, a, ignore));
/*
* If a is live end in b's block it is
* live at b's definition (a dominates b)
*/
/*
* If a is live end in b's block it is
* live at b's definition (a dominates b)
*/
- if(be_is_live_end(lv, bb, a))
- return 1;
+ if(be_is_live_end(lv, bb, a)) {
+ res = 1;
+ goto end;
+ }
/*
* Look at all usages of a.
/*
* Look at all usages of a.
@@
-148,12
+157,16
@@
static INLINE int _lv_values_interfere(const be_lv_t *lv, const ir_node *a, cons
*/
foreach_out_edge(a, edge) {
const ir_node *user = get_edge_src_irn(edge);
*/
foreach_out_edge(a, edge) {
const ir_node *user = get_edge_src_irn(edge);
- if(get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates(b, user))
- return 1;
+ if(get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates(b, user)) {
+ res = 1;
+ goto end;
+ }
}
}
}
}
- return 0;
+end:
+ stat_ev_ctx_pop("beintlive");
+ return res;
}
}