Adapted to new statev

[libfirm] / ir / be / beintlive_t.h

diff --git a/ir/be/beintlive_t.h b/ir/be/beintlive_t.h
index f096db3..e0871c2 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 "statev.h"
+
 #include "beirg_t.h"
 #include "besched_t.h"
+#include "belive_t.h"
 
 /**
  * Check dominance of two nodes in the same block.
@@ -33,6 +36,20 @@ static INLINE int _value_dominates_intrablock(const ir_node *a, const ir_node *b
        return as <= bs;
 }
 
+/**
+ * Check strict dominance of two nodes in the same block.
+ * @param a The first node.
+ * @param b The second node.
+ * @return 1 if a comes before b in the same block, 0 else.
+ */
+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);
+       return as < bs;
+}
+
 /**
  * Check, if one value dominates the other.
  * The dominance is not strict here.
@@ -59,6 +76,32 @@ static INLINE int _value_dominates(const ir_node *a, const ir_node *b)
        return _value_dominates_intrablock(a, b);
 }
 
+/**
+ * Check, if one value dominates the other.
+ * The dominance is strict here.
+ * @param a The first node.
+ * @param b The second node.
+ * @return 1 if a dominates b, 0 else.
+ */
+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);
+
+       /*
+        * a and b are not in the same block,
+        * so dominance is determined by the dominance of the blocks.
+        */
+       if(block_a != block_b) {
+               return block_dominates(block_a, block_b);
+       }
+
+       /*
+        * Dominance is determined by the time steps of the schedule.
+        */
+       return _value_strictly_dominates_intrablock(a, b);
+}
+
 /**
  * Check, if two values interfere.
  * @param lv Liveness information (in the future we should use a be_irg_t here).
@@ -70,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 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((a2b | b2a) > 0) {
+       if(a2b) {
                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(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.
@@ -108,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);
-                       if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && _value_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;
 }