changed code placement so it can work in more environments:

[libfirm] / ir / ana / field_temperature.c

diff --git a/ir/ana/field_temperature.c b/ir/ana/field_temperature.c
index 53d526b..626612e 100644 (file)
--- a/ir/ana/field_temperature.c
+++ b/ir/ana/field_temperature.c
@@ -29,7 +29,6 @@
 /* initialize, global variables.                                               */
 /* *************************************************************************** */
 
-
 /* *************************************************************************** */
 /*   Access routines for irnodes                                               */
 /* *************************************************************************** */
@@ -43,8 +42,6 @@ entity *get_Sel_accessed_entity(ir_node *sel, int pos) {
   return get_Sel_entity(sel);
 }
 
-
-
 /* *************************************************************************** */
 /* The heuristic                                                               */
 /* *************************************************************************** */
@@ -54,7 +51,7 @@ int get_irn_loop_call_depth(ir_node *n) {
   return get_irg_loop_depth(irg);
 }
 
-int get_irn_loop_depth(ir_node *n) {
+int get_irn_cfloop_depth(ir_node *n) {
   ir_loop *l = get_irn_loop(get_nodes_block(n));
   if (l)
     return get_loop_depth(l);
@@ -68,9 +65,10 @@ int get_irn_recursion_depth(ir_node *n) {
 }
 
 
+/**   @@@ the second version of the heuristic. */
 int get_weighted_loop_depth(ir_node *n) {
   int loop_call_depth = get_irn_loop_call_depth(n);
-  int loop_depth      = get_irn_loop_depth(n);
+  int loop_depth      = get_irn_cfloop_depth(n);
   int recursion_depth = get_irn_recursion_depth(n);
 
   return loop_call_depth + loop_depth + recursion_depth;
@@ -83,15 +81,17 @@ int get_weighted_loop_depth(ir_node *n) {
 
 static int default_recursion_weight = 5;
 
-
 /* The final evaluation of a node.  In this function we can
-   adapt the heuristic.  Combine execution freqency with
-   recursion depth. */
+   adapt the heuristic.  Combine execution frequency with
+   recursion depth.
+   @@@ the second version of the heuristic. */
 double get_irn_final_cost(ir_node *n) {
-  double cost_loop = get_irn_exec_freq(n);
-  int    rec_depth = get_irn_recursion_depth(n);
-  double cost_rec  = pow(default_recursion_weight, rec_depth);
-  return cost_loop + cost_rec;
+  double cost_loop   = get_irn_exec_freq(n);
+  double cost_method = get_irg_method_execution_frequency(get_irn_irg(n));
+  int    rec_depth   = get_irn_recursion_depth(n);
+  double cost_rec    = 0;
+  if (rec_depth) cost_rec = pow(default_recursion_weight, rec_depth);
+  return cost_loop*(cost_method + cost_rec);
 }
 
 double get_type_estimated_n_instances(type *tp) {
@@ -106,6 +106,7 @@ double get_type_estimated_n_instances(type *tp) {
 
 double get_type_estimated_mem_consumption_bytes(type *tp) {
   assert(0);
+  return 0.0;
 }
 
 int get_type_estimated_n_fields(type *tp) {
@@ -326,10 +327,9 @@ double get_entity_estimated_n_dyncalls(entity *ent) {
   return n_calls;
 }
 
-
-/* *************************************************************************** */
-/* Auxiliary                                                                   */
-/* *************************************************************************** */
+/* ------------------------------------------------------------------------- */
+/* Auxiliary                                                                 */
+/* ------------------------------------------------------------------------- */
 
 int is_jack_rts_name(ident *name) {
   return  0;