X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=7fa9c069b356ba0dc55e735276a187031a908e0e;hb=31b2abc379998d08e0a50905cfadca0525e63b7b;hp=85bc5fbbb6140cd4942029658fa53992107cdb41;hpb=e1f6d63833df22cbb8771e7b1e3872949bdcd3e8;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 85bc5fbbb..7fa9c069b 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -13,6 +13,7 @@
 #include "irprog.h"
 #include "iredges.h"
 #include "phiclass_t.h"
+#include "beutil.h"
 #include "becopyopt.h"
 #include "becopystat.h"
 #include "xmalloc.h"
@@ -22,9 +23,9 @@
 #define DEBUG_LVL SET_LEVEL_1
 static firm_dbg_module_t *dbg = NULL;
 
-#define MAX_ARITY 10
-#define MAX_CLS_SIZE 10
-#define MAX_CLS_PHIS 10
+#define MAX_ARITY 20
+#define MAX_CLS_SIZE 20
+#define MAX_CLS_PHIS 20
 
 /**
  * For an explanation of these values see the code of copystat_dump_pretty
@@ -72,6 +73,8 @@ enum vals_t {
 	I_COPIES_MAX,		/* max possible costs of copies*/
 	I_COPIES_INIT,		/* number of copies in initial allocation */
 	I_COPIES_HEUR,		/* number of copies after heuristic */
+	I_COPIES_5SEC,		/* number of copies after ilp with max n sec */
+	I_COPIES_30SEC,		/* number of copies after ilp with max n sec */
 	I_COPIES_OPT,		/* number of copies after ilp */
 	I_COPIES_IF,		/* number of copies inevitable due to root-arg-interf */
 
@@ -86,6 +89,7 @@ int curr_vals[ASIZE];
 static pset *all_phi_nodes;
 static pset *all_phi_classes;
 static pset *all_copy_nodes;
+static ir_graph *last_irg;
 
 void copystat_init(void) {
 	dbg = firm_dbg_register("ir.be.copystat");
@@ -118,18 +122,19 @@ static void irg_stat_walker(ir_node *node, void *env) {
  	if (is_Block(node)) /* count all blocks */
  		curr_vals[I_BLOCKS]++;
 
-	//TODO
- 	if (is_Phi(node) && mode_is_datab(get_irn_mode(node))) /* collect phis */
+ 	if (is_Reg_Phi(node)) /* collect phis */
  		pset_insert_ptr(all_phi_nodes, node);
 
- 	if (is_Copy(arch_env, node))
+ 	if (is_Perm_Proj(arch_env, node))
  		pset_insert_ptr(all_copy_nodes, node);
+
+	/* TODO: Add 2-Addr-Code nodes */
 }
 
-void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
+static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
 	irg_walk_graph(irg, irg_stat_walker, NULL, arch_env);
-	curr_vals[I_BLOCKS] -= 2; /* substract 2 for start and end block */
 	all_phi_classes = phi_class_compute_by_phis(all_phi_nodes);
+	last_irg = irg;
 }
 
 /**
@@ -271,12 +276,18 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, pset *pc) {
 }
 
 #define is_curr_reg_class(irn) \
-  (arch_get_irn_reg_class(chordal_env->session_env->main_env->arch_env, irn, \
-                          arch_pos_make_out(0)) == chordal_env->cls)
+  (arch_get_irn_reg_class(chordal_env->main_env->arch_env, irn, \
+                          -1) == chordal_env->cls)
 
 void copystat_collect_cls(be_chordal_env_t *chordal_env) {
 	ir_node *n;
 	pset *pc;
+	ir_graph *irg = chordal_env->irg;
+
+	if (last_irg != irg) {
+		copystat_reset();
+		copystat_collect_irg(irg, chordal_env->main_env->arch_env);
+	}
 
 	for (n = pset_first(all_phi_nodes); n; n = pset_next(all_phi_nodes))
 		if (is_curr_reg_class(n))
@@ -306,6 +317,12 @@ void copystat_add_init_costs(int costs) {
 void copystat_add_heur_costs(int costs) {
 	curr_vals[I_COPIES_HEUR] += costs;
 }
+void copystat_add_ilp_5_sec_costs(int costs) {
+	curr_vals[I_COPIES_5SEC] += costs;
+}
+void copystat_add_ilp_30_sec_costs(int costs) {
+	curr_vals[I_COPIES_30SEC] += costs;
+}
 void copystat_add_opt_costs(int costs) {
 	curr_vals[I_COPIES_OPT] += costs;
 }