X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbecopyopt.h;h=07e52bb38db5ffd375ce0e871021c43e605fc57b;hb=e03dd955762d16d38fdec0e2d7c24bf36d0ecc2e;hp=5dd61ec89087391f33445bad649122d37e1d87e8;hpb=8ad8020b3352b471f4e1b18bb5e044f657aa3163;p=libfirm

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index 5dd61ec89..07e52bb38 100644
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -29,10 +29,13 @@
 #include "bechordal_t.h"
 #include "bearch.h"
 
-#define DEBUG_IRG "NONE spec.c__main__datab"
-#define DEBUG_LVL_CO   LEVEL_1
-#define DEBUG_LVL_HEUR LEVEL_1
-#define DEBUG_LVL_ILP  LEVEL_1
+#define DEBUG_IRG "!!deflate.c__longest_match__datab"
+#define DEBUG_IRG_LVL_CO   SET_LEVEL_1
+#define DEBUG_IRG_LVL_HEUR SET_LEVEL_1
+#define DEBUG_IRG_LVL_ILP  SET_LEVEL_1
+#define DEBUG_LVL_CO   SET_LEVEL_0
+#define DEBUG_LVL_HEUR SET_LEVEL_0
+#define DEBUG_LVL_ILP  SET_LEVEL_0
 
 typedef int(*cost_fct_t)(ir_node*, ir_node*, int);
 
@@ -57,21 +60,23 @@ typedef struct _unit_t {
 	int node_count;				/**< size of the nodes array */
 	ir_node **nodes;			/**< [0] is the root-node, others are non interfering args of it. */
 	int *costs;					/**< costs[i] are arising, if nodes[i] has a different color */
-	int complete_costs;			/**< sum of all costs[i] */
-	int minimal_costs;			/**< a lower bound for this ou, considering only ifg (not coloring conflicts) */
-
-	int sort_key;				/**< maximum costs. controls the order of ou's. */
+	int inevitable_costs;		/**< sum of costs of all args interfering with root */
+	int all_nodes_costs;		/**< sum of all costs[i] */
+	int min_nodes_costs;		/**< a lower bound for the costs in costs[], determined by a max indep. set */
+	int sort_key;				/**< maximum costs. controls the order of ou's in the struct list_head units. */
 
 	/* for heuristic */
-	struct list_head queue;		/**< list of (mis/color) sorted by size of mis */
+	struct list_head queue;		/**< list of qn's sorted by weight of qn-mis */
 } unit_t;
 
 /* Helpers */
+#define get_arch_env(co) ((co)->chordal_env->session_env->main_env->arch_env)
+#define get_irg(co)      ((co)->chordal_env->session_env->irg)
+#define get_irn_col(co, irn) \
+	arch_register_get_index(arch_get_irn_register(get_arch_env(co), irn, 0))
 #define set_irn_col(co, irn, col) \
-	arch_set_irn_register(co->chordal_env->arch_env, irn, 0, arch_register_for_index(co->chordal_env->cls, col))
+	arch_set_irn_register(get_arch_env(co), irn, 0, arch_register_for_index(co->chordal_env->cls, col))
 
-#define get_irn_col(co, irn) \
-	arch_register_get_index(arch_get_irn_register(co->chordal_env->arch_env, irn, 0))
 
 #define list_entry_units(lh) list_entry(lh, unit_t, units)
 
@@ -102,7 +107,7 @@ void free_copy_opt(copy_opt_t *co);
 /**
  * Checks if a node is optimizable, viz. is a target of a 'copy-op'
  */
-#define is_optimizable(arch_env, irn) (is_Phi(irn) || is_Copy(arch_env, irn))
+#define is_optimizable(arch_env, irn) ((is_Phi(irn) && mode_is_datab(get_irn_mode(irn))) || is_Copy(arch_env, irn))
 
 /**
  * Checks if the irn is a non-interfering argument of a node which 'is_optimizable'
@@ -125,13 +130,28 @@ int get_costs_loop_depth(ir_node *root, ir_node* arg, int pos);
 int get_costs_all_one(ir_node *root, ir_node* arg, int pos);
 
 /**
- * Returns the current costs the copies are causing
+ * Returns the maximal costs possible, i.e. the costs if all
+ * pairs would be assigned different registers.
+ */
+int co_get_max_copy_costs(const copy_opt_t *co);
+
+/**
+ * Returns the inevitable costs, i.e. the costs of
+ * all copy pairs which interfere.
+ */
+int co_get_inevit_copy_costs(const copy_opt_t *co);
+
+/**
+ * Returns the current costs the copies are causing.
+ * The result includes inevitable costs and the costs
+ * of the copies regarding the current register allocation
  */
 int co_get_copy_costs(const copy_opt_t *co);
 
 /**
- * Returns a lower bound for the costs of copies based on interfering
- * arguments and the size of a max indep. set (only ifg-edges) of the other args.
+ * Returns a lower bound for the costs of copies in this ou.
+ * The result includes inevitable costs and the costs of a
+ * minimal costs caused by the nodes of the ou.
  */
 int co_get_lower_bound(const copy_opt_t *co);
 
@@ -143,6 +163,6 @@ void co_heur_opt(copy_opt_t *co);
 /**
  * Solves the problem using mixed integer programming
  */
-void co_ilp_opt(copy_opt_t *co);
+void co_ilp_opt(copy_opt_t *co, double time_limit);
 
 #endif