added after_ra hook

[libfirm] / ir / be / beraextern.c

diff --git a/ir/be/beraextern.c b/ir/be/beraextern.c
index 90cb9c2..be43239 100644 (file)
--- a/ir/be/beraextern.c
+++ b/ir/be/beraextern.c
@@ -709,6 +709,7 @@ static void execute(char *prog_to_call, char *out_file, char *result_file) {
 static INLINE void var_add_spills_and_reloads(be_raext_env_t *raenv, int var_nr) {
        var_info_t *vi = var_find(raenv->vars, var_nr);
        ir_node *spill=NULL, *ctx, *irn;
+       ir_mode *mode;
        const ir_edge_t *edge, *ne;
        pset *spills  = pset_new_ptr(4);        /* the spills of this variable */
        pset *reloads = pset_new_ptr(4);        /* the reloads of this variable */
@@ -744,6 +745,8 @@ static INLINE void var_add_spills_and_reloads(be_raext_env_t *raenv, int var_nr)
 
        assert(spill && "There must be at least one non-phi-node");
 
+       mode = get_irn_mode(get_irn_n(spill, 0));
+
        /* insert reloads and wire them arbitrary*/
        pset_foreach(vi->values, irn)
                foreach_out_edge_safe(irn, edge, ne) {
@@ -753,7 +756,8 @@ static INLINE void var_add_spills_and_reloads(be_raext_env_t *raenv, int var_nr)
 
                        /* all real uses must be reloaded */
                        DBG((raenv->dbg, LEVEL_2, "  reloading before %+F\n", src));
-                       reload = be_reload(raenv->aenv, raenv->cls, edge->src, edge->pos, get_irn_mode(get_irn_n(spill, 0)), spill);
+                       reload = be_reload(raenv->aenv, raenv->cls, edge->src, mode, spill);
+                       set_irn_n(edge->src, edge->pos, reload);
 
                        /* remember the reload */
                        pset_insert_ptr(reloads, reload);
@@ -852,6 +856,33 @@ static int read_and_apply_results(be_raext_env_t *raenv, char *filename) {
        return is_allocation;
 }
 
+static void check_allocation(be_raext_env_t *raenv) {
+       int i, o;
+
+       for (i=0; i<raenv->n_cls_vars; ++i) {
+               var_info_t *vi1 = raenv->cls_vars[i];
+
+               if (vi1->var_nr == SET_REMOVED)
+                       continue;
+
+               for (o=0; o<i; ++o) {
+                       var_info_t *vi2 = raenv->cls_vars[o];
+                       ir_node *irn1, *irn2;
+
+                       if (vi2->var_nr == SET_REMOVED)
+                               continue;
+
+                       pset_foreach(vi1->values, irn1)
+                               pset_foreach(vi2->values, irn2)
+                                       if (values_interfere(irn1, irn2)) {
+                                               dump_ir_block_graph_sched(raenv->irg, "ERROR");
+                                               ir_fprintf(stdout, "SSA values %+F and %+F interfere. They belong to varible %d and %d respectively.\n", irn1, irn2, vi1->var_nr, vi2->var_nr);
+                                               assert(0 && "ERROR graph dumped");
+                                       }
+               }
+       }
+}
+
 /******************************************************************************
     __  __       _
    |  \/  |     (_)
@@ -934,6 +965,8 @@ static void be_ra_extern_main(const be_irg_t *bi) {
                        round++;
                } while (!done);
 
+               check_allocation(&raenv);
+
                free(raenv.cls_vars);
        }