DBG_OPT_ALGSIM0 macro for constant evaluation added, calls to statistic

function hooks added

[r2942]

diff --git a/ir/ir/iropt_dbg.h b/ir/ir/iropt_dbg.h
index 9f64a7c..07b40d7 100644 (file)
--- a/ir/ir/iropt_dbg.h
+++ b/ir/ir/iropt_dbg.h
@@ -24,6 +24,7 @@
          ir_node *ons[2];                                         \
          ons[0] = oldn;                                           \
          ons[1] = get_Block_cfgpred(oldn, 0);                     \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_STG);    \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_straightening); \
        } while(0)
 
@@ -37,18 +38,26 @@
          ons[1] = a;                                                 \
          ons[2] = b;                                                 \
          ons[3] = get_Proj_pred(a);                                  \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_IFSIM);          \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_if_simplification); \
        } while(0)
 
 /**
  * Merge the debug info due to an algebraic_simplification
  */
+#define DBG_OPT_ALGSIM0                                                \
+  do {                                                                 \
+         stat_merge_nodes(&n, 1, &oldn, 1, STAT_OPT_CONST_EVAL);       \
+          __dbg_info_merge_pair(n, oldn, dbg_const_eval);              \
+       } while(0)
+
 #define DBG_OPT_ALGSIM1                                               \
   do {                                                          \
          ir_node *ons[3];                                            \
          ons[0] = oldn;                                              \
          ons[1] = a;                                                 \
          ons[2] = b;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_ALGSIM);    \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_algebraic_simplification); \
        } while(0)
 
@@ -58,6 +67,7 @@
          ons[0] = oldn;                                              \
          ons[1] = get_unop_op(n);                                    \
          ons[2] = n;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_ALGSIM);    \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_algebraic_simplification); \
        } while(0)
 
@@ -66,6 +76,7 @@
          ir_node *ons[2];                                            \
          ons[0] = oldn;                                              \
          ons[1] = a;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_ALGSIM);    \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_algebraic_simplification); \
        } while(0)
 
@@ -74,7 +85,8 @@
          ir_node *ons[2];                                            \
          ons[0] = oldn;                                              \
          ons[1] = first_val;                                         \
-         __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_opt_ssa);          \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_PHI);       \
+         __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_opt_ssa);   \
        } while(0)
 
 
@@ -83,6 +95,7 @@
          ir_node *ons[2];                                            \
          ons[0] = oldn;                                              \
          ons[1] = n;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_WAW);       \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_write_after_write);\
        } while(0)
 
@@ -91,6 +104,7 @@
          ir_node *ons[2];                                            \
          ons[0] = oldn;                                              \
          ons[1] = c;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_WAR);       \
          __dbg_info_merge_sets(&c, 1, ons, SIZ(ons), dbg_write_after_read); \
        } while(0)
 
@@ -100,6 +114,7 @@
          ons[0] = oldn;                                              \
          ons[1] = a;                                                 \
          ons[2] = n;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_TUPLE);     \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_opt_auxnode);      \
        } while(0)
 
@@ -108,5 +123,6 @@
          ir_node *ons[2];                                            \
          ons[0] = oldn;                                              \
          ons[1] = n;                                                 \
+         stat_merge_nodes(&n, 1, ons, SIZ(ons), STAT_OPT_ID);        \
          __dbg_info_merge_sets(&n, 1, ons, SIZ(ons), dbg_opt_auxnode);      \
        } while(0)