X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillremat.c;h=4380b3bfd65658294136e403f653b1030fc18d6e;hb=a92ff34e623ded0eb85277c1f37235947855dffb;hp=13f58f865a87b9209528498f5e88d8e6fa776554;hpb=6981dd3274e6753e50f66c8cbe17b37bd41708e5;p=libfirm

diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c
index 13f58f865..4380b3bfd 100644
--- a/ir/be/bespillremat.c
+++ b/ir/be/bespillremat.c
@@ -29,6 +29,7 @@
 #include "irnode_t.h"
 #include "ircons_t.h"
 #include "irloop_t.h"
+#include "irnodeset.h"
 #include "phiclass.h"
 #include "iredges.h"
 #include "execfreq.h"
@@ -41,10 +42,11 @@
 #include <lpp/lpp_cplex.h>
 
 #include "be_t.h"
+#include "beirg_t.h"
 #include "belive_t.h"
 #include "besched_t.h"
-#include "beirgmod.h"
-#include "bearch.h"
+#include "bessaconstr.h"
+#include "bearch_t.h"
 #include "beabi.h"
 #include "benode_t.h"
 #include "beutil.h"
@@ -77,14 +79,14 @@
 #define REMATS_NOINVERSE   2
 #define REMATS_ALL         3
 
-static int opt_dump_flags   = 0;
+static unsigned opt_dump_flags = 0;
 static int opt_log = 0;
-static int opt_keep_alive   = 0;
+static unsigned opt_keep_alive = 0;
 static int opt_goodwin = 1;
 static int opt_memcopies = 1;
 static int opt_memoperands = 1;
 static int opt_verify = VERIFY_MEMINTERF;
-static int opt_remats = REMATS_ALL;
+static unsigned opt_remats = REMATS_ALL;
 static int opt_repair_schedule = 0;
 static int opt_no_enlarge_liveness = 0;
 static int opt_remat_while_live = 1;
@@ -1588,6 +1590,7 @@ luke_endwalker(ir_node * bb, void * data)
 	del_pset(use_end);
 }
 
+#ifndef NDEBUG
 /**
  * Find a remat of value @p value in the epilog of @p pos
  */
@@ -1615,6 +1618,7 @@ find_post_remat(const ir_node * value, const ir_node * pos)
 
 	return NULL;
 }
+#endif
 
 static spill_t *
 add_to_spill_bb(spill_ilp_t * si, ir_node * bb, ir_node * irn)
@@ -1909,7 +1913,7 @@ luke_blockwalker(ir_node * bb, void * data)
 		pset       *used;
 		pset       *remat_defs;
 		keyval_t   *keyval;
-		ilp_cst_t   one_memoperand;
+		ilp_cst_t   one_memoperand = -1;
 
 		/* iterate only until first phi */
 		if(is_Phi(irn))
@@ -2439,11 +2443,13 @@ skip_one_must_die:
 			assert(has_reg_class(si, tmp));
 		}
 
+#ifndef NDEBUG
 		for (n=get_irn_arity(irn)-1; n>=0; --n) {
 			ir_node        *arg = get_irn_n(irn, n);
 
 			assert(!find_post_remat(arg, irn) && "there should be no post remat for an argument of an op");
 		}
+#endif
 
 		del_pset(remat_defs);
 		del_pset(used);
@@ -4126,10 +4132,10 @@ static void
 rewire_uses(spill_ilp_t * si)
 {
 	defs_t               *defs;
-	pset                 *ignore = pset_new_ptr(1);
-	be_dom_front_info_t *dom_front = si->birg->dom_front;
+	ir_nodeset_t         ignore;
 
-	pset_insert_ptr(ignore, get_irg_end(si->birg->irg));
+	ir_nodeset_init(&ignore);
+	ir_nodeset_insert(&ignore, get_irg_end(si->birg->irg));
 
 	/* then fix uses of spills */
 	set_foreach(si->values, defs) {
@@ -4152,11 +4158,25 @@ rewire_uses(spill_ilp_t * si)
 		spills = get_spills_for_value(si, defs->value);
 		DBG((si->dbg, LEVEL_2, "\t  %d remats, %d reloads, and %d spills for value %+F\n", remats, pset_count(reloads), pset_count(spills), defs->value));
 		if(pset_count(spills) > 1) {
+			be_ssa_construction_env_t senv;
+			ir_node *node;
 			//assert(pset_count(reloads) > 0);
 			//				print_irn_pset(spills);
 			//				print_irn_pset(reloads);
 
-			be_ssa_constr_set_ignore(dom_front, si->lv, spills, ignore);
+			be_ssa_construction_init(&senv, si->birg);
+			be_ssa_construction_set_ignore_uses(&senv, &ignore);
+			pset_foreach(spills, node) {
+				be_ssa_construction_add_copy(&senv, node);
+			}
+			pset_foreach(spills, node) {
+				be_ssa_construction_fix_users(&senv, node);
+			}
+			be_ssa_construction_update_liveness_phis(&senv, si->lv);
+			pset_foreach(spills, node) {
+				be_liveness_update(si->lv, node);
+			}
+			be_ssa_construction_destroy(&senv);
 		}
 
 		del_pset(reloads);
@@ -4165,29 +4185,51 @@ rewire_uses(spill_ilp_t * si)
 
 	/* first fix uses of remats and reloads */
 	set_foreach(si->values, defs) {
-		pset           *nodes;
 		const ir_node  *next = defs->remats;
 		int             orig_kept = 0;
 
 		if(next) {
-			nodes = pset_new_ptr_default();
+			be_ssa_construction_env_t senv;
+
+			be_ssa_construction_init(&senv, si->birg);
+
 			if(sched_is_scheduled(defs->value)) {
-				pset_insert_ptr(nodes, defs->value);
+				be_ssa_construction_add_copy(&senv, (ir_node*) defs->value);
 				orig_kept = 1;
 			}
 
+			next = defs->remats;
+			while(next) {
+				be_ssa_construction_add_copy(&senv, (ir_node*) next);
+				next = get_irn_link(next);
+			}
+
+			if(sched_is_scheduled(defs->value)) {
+				be_ssa_construction_fix_users(&senv, (ir_node*) defs->value);
+			}
+
+			next = defs->remats;
 			while(next) {
-				pset_insert_ptr(nodes, next);
+				be_ssa_construction_fix_users(&senv, (ir_node*) next);
 				next = get_irn_link(next);
 			}
 
-			DBG((si->dbg, LEVEL_4, "\t    %d new definitions for value %+F\n", pset_count(nodes)-orig_kept, defs->value));
-			be_ssa_constr_set(dom_front, si->lv, nodes);
+			be_ssa_construction_update_liveness_phis(&senv, si->lv);
+			if(sched_is_scheduled(defs->value)) {
+				be_liveness_update(si->lv, (ir_node*) defs->value);
+			}
+
+			next = defs->remats;
+			while(next) {
+				be_liveness_update(si->lv, (ir_node*) next);
+				next = get_irn_link(next);
+			}
 
-			del_pset(nodes);
+			be_ssa_construction_destroy(&senv);
 		}
 	}
 
+	ir_nodeset_destroy(&ignore);
 //	remove_unused_defs(si);
 }