use custom value_interfere function in verifiers (which is slower but doesn't rely...

diff --git a/ir/be/be.h b/ir/be/be.h
index a6a1a91..f0895c4 100644 (file)
--- a/ir/be/be.h
+++ b/ir/be/be.h
@@ -1,4 +1,3 @@
-
 #ifndef _BE_MAIN_H
 #define _BE_MAIN_H
 

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index b91550a..a02ab76 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -231,7 +231,7 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
 }
 
 #endif /* WITH_ILP */

diff --git a/ir/be/bera.c b/ir/be/bera.c
index f3b0139..9a1bb75 100644 (file)
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -71,29 +71,29 @@ int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b)
 
                bb = get_nodes_block(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 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;
 
-    /*
-     * Look at all usages of a.
-     * If there's one usage of a in the block of b, then
-     * we check, if this use is dominated by b, if that's true
-     * a and b interfere. Note that b must strictly dominate the user,
+               /*
+                * Look at all usages of a.
+                * If there's one usage of a in the block of b, then
+                * we check, if this use is dominated by b, if that's true
+                * a and b interfere. Note that b must strictly dominate the user,
                 * since if b is the last user of in the block, b and a do not
                 * interfere.
-     * Uses of a not in b's block can be disobeyed, because the
-     * check for a being live at the end of b's block is already
-     * performed.
-     */
-    foreach_out_edge(a, edge) {
-      const ir_node *user = edge->src;
-      if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user))
-        return 1;
-    }
+                * Uses of a not in b's block can be disobeyed, because the
+                * check for a being live at the end of b's block is already
+                * performed.
+                */
+               foreach_out_edge(a, edge) {
+                       const ir_node *user = edge->src;
+                       if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user))
+                               return 1;
+               }
   }
   return 0;
 }

diff --git a/ir/be/bespillslots.c b/ir/be/bespillslots.c
index f91a99e..46e4ca3 100644 (file)
--- a/ir/be/bespillslots.c
+++ b/ir/be/bespillslots.c
@@ -658,7 +658,7 @@ static void create_memperms(ss_env_t *env) {
                        be_set_MemPerm_in_entity(mempermnode, i, entry->in);
                        be_set_MemPerm_out_entity(mempermnode, i, entry->out);
                        proj = new_Proj(mempermnode, get_irn_mode(arg), i);
-                       set_irn_n(arg, entry->pos, proj);
+                       set_irn_n(entry->node, entry->pos, proj);
                }
                ir_printf("Memperm created in block %+F\n", memperm->block);
        }

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 08151c6..b18a305 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -18,10 +18,14 @@
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "irdump_t.h"
+#include "iredges.h"
 #include "set.h"
 #include "array.h"
 #include "benode_t.h"
 
+static int my_value_dominates(const ir_node *a, const ir_node *b);
+static int my_values_interfere(const ir_node *a, const ir_node *b);
+
 typedef struct be_verify_register_pressure_env_t_ {
        ir_graph                    *irg;                 /**< the irg to verify */
         be_lv_t                    *lv;                  /**< Liveness information. */
@@ -204,6 +208,9 @@ int be_verify_schedule(ir_graph *irg)
 
 
 
+//---------------------------------------------------------------------------
+
+
 
 typedef struct _spill_t {
        ir_node *spill;
@@ -212,7 +219,6 @@ typedef struct _spill_t {
 
 typedef struct {
        ir_graph *irg;
-       be_lv_t *lv;
        set *spills;
        ir_node **reloads;
        int problem_found;
@@ -362,7 +368,7 @@ static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
                        if(sp1->ent != sp2->ent)
                                continue;
 
-                       if(values_interfere(env->lv, sp1->spill, sp2->spill)) {
+                       if(my_values_interfere(sp1->spill, sp2->spill)) {
                                ir_fprintf(stderr, "Verify warning: Spillslots for %+F in block %+F(%s) and %+F in block %+F(%s) interfere\n",
                                        sp1->spill, get_nodes_block(sp1->spill), get_irg_dump_name(env->irg),
                                        sp2->spill, get_nodes_block(sp2->spill), get_irg_dump_name(env->irg));
@@ -380,7 +386,6 @@ int be_verify_spillslots(ir_graph *irg)
        env.spills = new_set(cmp_spill, 10);
        env.reloads = NEW_ARR_F(ir_node*, 0);
        env.problem_found = 0;
-       env.lv = be_liveness(irg);
 
        irg_walk_graph(irg, collect_spills_walker, NULL, &env);
 
@@ -388,11 +393,95 @@ int be_verify_spillslots(ir_graph *irg)
 
        DEL_ARR_F(env.reloads);
        del_set(env.spills);
-       be_liveness_free(env.lv);
 
        return ! env.problem_found;
 }
 
-/* Ideas for further verifiers:
- *   - make sure that each use is dominated by its definition (except phi arguments)
+
+
+//---------------------------------------------------------------------------
+
+
+
+static int my_value_dominates(const ir_node *a, const ir_node *b)
+{
+       int res = 0;
+       const ir_node *ba = get_block(a);
+       const ir_node *bb = get_block(b);
+
+       /*
+        * a and b are not in the same block,
+        * so dominance is determined by the dominance of the blocks.
+        */
+       if(ba != bb) {
+               res = block_dominates(ba, bb);
+
+       /*
+        * Dominance is determined by the time steps of the schedule.
+        */
+       } else {
+               sched_timestep_t as = sched_get_time_step(a);
+               sched_timestep_t bs = sched_get_time_step(b);
+               res = as <= bs;
+       }
+
+       return res;
+}
+
+/**
+ * Check, if two values interfere.
+ * @param a The first value.
+ * @param b The second value.
+ * @return 1, if a and b interfere, 0 if not.
  */
+static int my_values_interfere(const ir_node *a, const ir_node *b)
+{
+       const ir_edge_t *edge;
+       ir_node *bb;
+       int a2b = my_value_dominates(a, b);
+       int b2a = my_value_dominates(b, a);
+
+       /* If there is no dominance relation, they do not interfere. */
+       if(!a2b && !b2a)
+               return 0;
+
+       /*
+        * 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);
+
+       /*
+        * Look at all usages of a.
+        * If there's one usage of a in the block of b, then
+        * we check, if this use is dominated by b, if that's true
+        * a and b interfere. Note that b must strictly dominate the user,
+        * since if b is the last user of in the block, b and a do not
+        * interfere.
+        * Uses of a not in b's block can be disobeyed, because the
+        * check for a being live at the end of b's block is already
+        * performed.
+        */
+       foreach_out_edge(a, edge) {
+               const ir_node *user = get_edge_src_irn(edge);
+               if(b == user)
+                       continue;
+
+               // in case of phi arguments we compare with the block the value comes from
+               if(is_Phi(user)) {
+                       ir_node *phiblock = get_nodes_block(user);
+                       user = get_irn_n(phiblock, get_edge_src_pos(edge));
+               }
+
+               if(my_value_dominates(b, user))
+                       return 1;
+       }
+
+       return 0;
+}