X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fexecution_frequency.c;h=a005f4dcd1fef5c0ac0dcd05e06895c333520968;hb=e775a978fff2841e0722c47f13545b54d48b8f98;hp=b11f178371777e7e542110918ef1436efd5eef63;hpb=0fbcef83aa6060534172bb13e71cdadb04428806;p=libfirm

diff --git a/ir/ana/execution_frequency.c b/ir/ana/execution_frequency.c
index b11f17837..a005f4dcd 100644
--- a/ir/ana/execution_frequency.c
+++ b/ir/ana/execution_frequency.c
@@ -28,10 +28,10 @@
 
 #include "execution_frequency.h"
 
-#include "firm_common_t.h"
 #include "set.h"
 #include "pdeq.h"
 #include "hashptr.h"
+#include "error.h"
 
 #include "irprog_t.h"
 #include "irgraph_t.h"
@@ -57,7 +57,8 @@ typedef struct {
 /* We use this set for all nodes in all irgraphs. */
 static set *exec_freq_set = NULL;
 
-static int exec_freq_cmp(const void *e1, const void *e2, size_t size) {
+static int exec_freq_cmp(const void *e1, const void *e2, size_t size)
+{
   reg_exec_freq *ef1 = (reg_exec_freq *)e1;
   reg_exec_freq *ef2 = (reg_exec_freq *)e2;
   (void) size;
@@ -65,23 +66,26 @@ static int exec_freq_cmp(const void *e1, const void *e2, size_t size) {
   return (ef1->reg != ef2->reg);
 }
 
-static INLINE unsigned int exec_freq_hash(reg_exec_freq *e) {
+static inline unsigned int exec_freq_hash(reg_exec_freq *e)
+{
   return HASH_PTR(e->reg);
 }
 
-static INLINE void set_region_exec_freq(void *reg, double freq) {
+static inline void set_region_exec_freq(void *reg, double freq)
+{
   reg_exec_freq ef;
   ef.reg  = reg;
   ef.freq = freq;
   set_insert(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
 }
 
-double get_region_exec_freq(void *reg) {
+double get_region_exec_freq(void *reg)
+{
   reg_exec_freq ef, *found;
   ef.reg  = reg;
   assert(exec_freq_set);
 
-  found = set_find(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
+  found = (reg_exec_freq*) set_find(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
 
   /* Not found if information is invalid. */
   if (found)
@@ -91,11 +95,13 @@ double get_region_exec_freq(void *reg) {
 }
 
 /* Returns the number of times the block is executed. */
-double     get_Block_exec_freq(ir_node *b) {
+double     get_Block_exec_freq(ir_node *b)
+{
   return get_region_exec_freq((void *)b);
 }
 
-double get_irn_exec_freq(ir_node *n) {
+double get_irn_exec_freq(ir_node *n)
+{
   if (!is_Block(n)) n = get_nodes_block(n);
   return get_Block_exec_freq(n);
 }
@@ -125,18 +131,20 @@ static int just_passed_a_Raise = 0;
 static ir_node *Cond_list = NULL;
 
 /* We do not use an extra set, as Projs are not yet in the existing one. */
-void set_ProjX_probability(ir_node *n, Cond_prob prob) {
+static void set_ProjX_probability(ir_node *n, Cond_prob prob)
+{
   reg_exec_freq ef;
   ef.reg  = n;
   ef.prob = prob;
   set_insert(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
 }
 
-Cond_prob get_ProjX_probability(ir_node *n) {
+static Cond_prob get_ProjX_probability(ir_node *n)
+{
   reg_exec_freq ef, *found;
   ef.reg  = n;
 
-  found = set_find(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
+  found = (reg_exec_freq*) set_find(exec_freq_set, &ef, sizeof(ef), exec_freq_hash(&ef));
 
   if (found)
     return (Cond_prob)found->prob;
@@ -146,16 +154,16 @@ Cond_prob get_ProjX_probability(ir_node *n) {
 
 /* A walker that only visits the nodes we want to see. */
 
-static void
-my_irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env) {
+static void my_irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void * env)
+{
   int i;
   set_irn_visited(node, current_ir_graph->visited);
 
   pre(node, env);
 
-  if (node->op != op_Block) {
+  if (!is_Block(node)) {
     ir_node *pred;
-    if (node->op == op_Proj)
+    if (is_Proj(node))
       pred = get_irn_n(node, 0);
     else
       pred = get_irn_n(node, -1);
@@ -171,7 +179,7 @@ my_irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
     }
   }
 
-  if (node->op == op_End) {
+  if (is_End(node)) {
     for (i = get_irn_arity(node) - 1; i >= 0; --i) {
       ir_node *pred = get_irn_n(node, i);
       if ((pred->op == op_Block) && (pred->visited < current_ir_graph->visited))
@@ -181,7 +189,8 @@ my_irg_walk_2_both(ir_node *node, irg_walk_func *pre, irg_walk_func *post, void
 
   post(node, env);
 }
-static void my_irg_walk_current_graph(irg_walk_func *pre, irg_walk_func *post, void *env) {
+static void my_irg_walk_current_graph(irg_walk_func *pre, irg_walk_func *post, void *env)
+{
   inc_irg_visited(current_ir_graph);
   my_irg_walk_2_both(get_irg_end(current_ir_graph), pre, post, env);
 }
@@ -237,7 +246,8 @@ static void walk_post(ir_node *n, void *env)
 /** Precompute which Conds test for an exception.
  *
  *  Operates on current_ir_graph. */
-void precompute_cond_evaluation(void) {
+static void precompute_cond_evaluation(void)
+{
   ir_node *c;
 
   compute_irg_outs(current_ir_graph);
@@ -246,7 +256,7 @@ void precompute_cond_evaluation(void) {
   Cond_list = NULL;
   my_irg_walk_current_graph(walk_pre, walk_post, NULL);
 
-  for (c = Cond_list; c; c = get_irn_link(c)) {
+  for (c = Cond_list; c; c = (ir_node*)get_irn_link(c)) {
     ir_node *p0, *p1;
 
     assert(get_irn_n_outs(c) == 2 && "encountered a switch cond");
@@ -256,10 +266,12 @@ void precompute_cond_evaluation(void) {
     /* both are exceptions */
     if ((get_ProjX_probability(p0) == Cond_prob_exception_taken) &&
         (get_ProjX_probability(p1) == Cond_prob_exception_taken)   ) {
-      assert(0 && "I tried to avoid these!");
+      panic("I tried to avoid these!");
+#if 0
       /* It's a */
       set_ProjX_probability(p0, Cond_prob_normal);
       set_ProjX_probability(p1, Cond_prob_normal);
+#endif
     }
 
     /* p0 is exception */
@@ -280,7 +292,8 @@ void precompute_cond_evaluation(void) {
   }
 }
 
-int is_fragile_Proj(ir_node *n) {
+int is_fragile_Proj(ir_node *n)
+{
   return is_Proj(n) && (get_ProjX_probability(n) == Cond_prob_exception_taken);
 }
 
@@ -295,7 +308,7 @@ int is_fragile_Proj(ir_node *n) {
 
 static double exception_prob = 0.001;
 
-static INLINE int is_loop_head(ir_node *cond)
+static inline int is_loop_head(ir_node *cond)
 {
   (void) cond;
   return 0;
@@ -305,7 +318,8 @@ static INLINE int is_loop_head(ir_node *cond)
  *
  *  Given all outs of the predecessor region, we can compute the weight of
  *  this single edge. */
-static INLINE double get_weighted_region_exec_freq(void *reg, int pos) {
+static inline double get_weighted_region_exec_freq(void *reg, int pos)
+{
   void *pred_reg        = get_region_in(reg, pos);
   double res, full_freq = get_region_exec_freq (pred_reg);
   int n_outs            = get_region_n_outs    (pred_reg);
@@ -318,7 +332,7 @@ static INLINE double get_weighted_region_exec_freq(void *reg, int pos) {
       cfop = skip_Proj(cfop);
   } else {
     assert(is_ir_loop(reg));
-    cfop = get_loop_cfop(reg, pos);
+    cfop = (ir_node*)get_loop_cfop(reg, pos);
   }
 
   if (is_fragile_op(cfop) || is_fragile_Proj(cfop)) {
@@ -332,12 +346,11 @@ static INLINE double get_weighted_region_exec_freq(void *reg, int pos) {
   return res;
 }
 
-static INLINE void compute_region_freqency(void *reg, double head_weight) {
+static inline void compute_region_freqency(void *reg, double head_weight)
+{
   int i, n_ins = get_region_n_ins(reg);
   double my_freq = 0;
 
-  //printf("head weight %lf: ", head_weight); DDMR(reg);
-
   for (i = 0; i < n_ins; ++i) {
     void *pred_reg = get_region_in(reg, i);
     if (pred_reg) {
@@ -362,7 +375,8 @@ static void check_proper_head(ir_loop *l, void *reg)
 }
 
 /* Compute the ex freq for current_ir_graph */
-static void compute_frequency(int default_loop_weight) {
+static void compute_frequency(int default_loop_weight)
+{
   ir_loop *outermost_l = get_irg_loop(current_ir_graph);
   pdeq *block_worklist = new_pdeq1(outermost_l);
 
@@ -372,7 +386,7 @@ static void compute_frequency(int default_loop_weight) {
 
   while (!pdeq_empty(block_worklist)) {
     ir_loop *l = (ir_loop *)pdeq_getl(block_worklist);
-    int i, n_elems = get_loop_n_elements(l);
+    size_t i, n_elems = get_loop_n_elements(l);
 
     /* The header is initialized with the frequency of the full loop times the iteration weight. */
     check_proper_head(l, get_loop_element(l, 0).son);
@@ -392,7 +406,8 @@ static void compute_frequency(int default_loop_weight) {
  * irg:                 The graph to be analyzed.
  * default_loop_weight: The number of executions of a loop.
  */
-void compute_execution_frequency(ir_graph *irg, int default_loop_weight, double exception_probability) {
+void compute_execution_frequency(ir_graph *irg, int default_loop_weight, double exception_probability)
+{
   ir_graph *rem = current_ir_graph;
   current_ir_graph = irg;
   exception_prob = exception_probability;
@@ -416,8 +431,9 @@ void compute_execution_frequency(ir_graph *irg, int default_loop_weight, double
 }
 
 
-void compute_execution_frequencies(int default_loop_weight, double exception_probability) {
-  int i, n_irgs = get_irp_n_irgs();
+void compute_execution_frequencies(int default_loop_weight, double exception_probability)
+{
+  size_t i, n_irgs = get_irp_n_irgs();
   free_intervals();
   for (i = 0; i < n_irgs; ++i) {
     compute_execution_frequency(get_irp_irg(i), default_loop_weight, exception_probability);
@@ -426,8 +442,9 @@ void compute_execution_frequencies(int default_loop_weight, double exception_pro
 }
 
 /** free occupied memory, reset */
-void free_execution_frequency(void) {
-  int i, n_irgs = get_irp_n_irgs();
+void free_execution_frequency(void)
+{
+  size_t i, n_irgs = get_irp_n_irgs();
   free_intervals();
   del_set(exec_freq_set);
 
@@ -436,10 +453,12 @@ void free_execution_frequency(void) {
   set_irp_exec_freq_state(exec_freq_none);
 }
 
-exec_freq_state get_irg_exec_freq_state(ir_graph *irg) {
+exec_freq_state get_irg_exec_freq_state(ir_graph *irg)
+{
   return irg->execfreq_state;
 }
-void            set_irg_exec_freq_state(ir_graph *irg, exec_freq_state s) {
+void            set_irg_exec_freq_state(ir_graph *irg, exec_freq_state s)
+{
   if ((get_irp_exec_freq_state() == exec_freq_consistent && s != exec_freq_consistent) ||
       (get_irp_exec_freq_state() == exec_freq_none       && s != exec_freq_none))
     irp->execfreq_state = exec_freq_inconsistent;
@@ -447,28 +466,32 @@ void            set_irg_exec_freq_state(ir_graph *irg, exec_freq_state s) {
 }
 
 /* Sets irg and irp exec freq state to inconsistent if it is set to consistent. */
-void            set_irg_exec_freq_state_inconsistent(ir_graph *irg) {
+void            set_irg_exec_freq_state_inconsistent(ir_graph *irg)
+{
   if (get_irg_exec_freq_state(irg) == exec_freq_consistent)
     set_irg_exec_freq_state(irg, exec_freq_inconsistent);
 }
 
-void set_irp_exec_freq_state(exec_freq_state s) {
+void set_irp_exec_freq_state(exec_freq_state s)
+{
   irp->execfreq_state = s;
 }
 
-exec_freq_state get_irp_exec_freq_state(void) {
+exec_freq_state get_irp_exec_freq_state(void)
+{
   return irp->execfreq_state;
 }
 
 /* Sets irp and all irg exec freq states to inconsistent if it is set to consistent. */
-void            set_irp_exec_freq_state_inconsistent(void) {
-  if (get_irp_exec_freq_state() != exec_freq_none) {
-    int i, n_irgs = get_irp_n_irgs();
-    set_irp_exec_freq_state(exec_freq_inconsistent);
-    for (i = 0; i < n_irgs; ++i) {
-      ir_graph *irg = get_irp_irg(i);
-      if (get_irg_exec_freq_state(irg) != exec_freq_none)
-	irg->execfreq_state = exec_freq_inconsistent;
-    }
-  }
+void            set_irp_exec_freq_state_inconsistent(void)
+{
+	if (get_irp_exec_freq_state() != exec_freq_none) {
+		size_t i, n_irgs = get_irp_n_irgs();
+		set_irp_exec_freq_state(exec_freq_inconsistent);
+		for (i = 0; i < n_irgs; ++i) {
+			ir_graph *irg = get_irp_irg(i);
+			if (get_irg_exec_freq_state(irg) != exec_freq_none)
+				irg->execfreq_state = exec_freq_inconsistent;
+		}
+	}
 }