add Abs(-x) = Abs(x)

[libfirm] / ir / stat / firmstat.c

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index b4de73b..bd2fcbb 100644 (file)
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -1,14 +1,28 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/firmstat.c
- * Purpose:     Statistics for Firm.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief   Statistics for Firm.
+ * @author  Michael Beck
+ * @version $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -181,6 +195,7 @@ static int opcode_cmp_2(const void *elt, const void *key) {
 static int address_mark_cmp(const void *elt, const void *key, size_t size) {
        const address_mark_entry_t *e1 = elt;
        const address_mark_entry_t *e2 = key;
+       (void) size;
 
        /* compare only the nodes, the rest is used as data container */
        return e1->node != e2->node;
@@ -273,7 +288,7 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 {
        graph_entry_t key;
        graph_entry_t *elem;
-       int i;
+       size_t i;
 
        key.irg = irg;
 
@@ -511,6 +526,15 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
        return pset_insert(hmap, elem, HASH_PTR(perm));
 }  /* perm_stat_get_entry */
 
+/**
+ * Clear optimizations counter,
+ */
+static void clear_optimization_counter(void)  {
+       int i;
+       for (i = 0; i < FS_OPT_MAX; ++i)
+               cnt_clr(&status->num_opts[i]);
+}
+
 /**
  * Returns the ir_op for an IR-node,
  * handles special cases and return pseudo op codes.
@@ -1064,7 +1088,7 @@ static void mark_address_calc(ir_node *node, void *env) {
        int i, n;
        unsigned mark_preds = MARK_REF_NON_ADR;
 
-       if (! mode_is_numP(mode))
+       if (! mode_is_data(mode))
                return;
 
        if (mode_is_reference(mode)) {
@@ -1089,7 +1113,7 @@ static void mark_address_calc(ir_node *node, void *env) {
                ir_node *pred = get_irn_n(node, i);
 
                mode = get_irn_op_mode(pred);
-               if (! mode_is_numP(mode))
+               if (! mode_is_data(mode))
                        continue;
 
                set_adr_mark(graph, pred, get_adr_mark(graph, pred) | mark_preds);
@@ -1231,6 +1255,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
  */
 static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 {
+       (void) global;
        if (graph->is_deleted) {
                /* deleted, ignore */
                return;
@@ -1309,10 +1334,22 @@ static void stat_dump_param_tbl(const distrib_tbl_t *tbl, graph_entry_t *global)
        dumper_t *dumper;
 
        for (dumper = status->dumper; dumper; dumper = dumper->next) {
-               if (dumper->dump_const_tbl)
+               if (dumper->dump_param_tbl)
                        dumper->dump_param_tbl(dumper, tbl, global);
        }  /* for */
-}
+}  /* stat_dump_param_tbl */
+
+/**
+ * Dumps the optimization counter
+ */
+static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len) {
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_opt_cnt)
+                       dumper->dump_opt_cnt(dumper, tbl, len);
+       }  /* for */
+}  /* stat_dump_opt_cnt */
 
 /**
  * Initialize the dumper.
@@ -1367,6 +1404,7 @@ ir_op *stat_get_op_from_opcode(ir_opcode code) {
  * @param op   the new IR opcode that was created.
  */
 static void stat_new_ir_op(void *ctx, ir_op *op) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1389,6 +1427,8 @@ static void stat_new_ir_op(void *ctx, ir_op *op) {
  * @param op   the IR opcode that is freed
  */
 static void stat_free_ir_op(void *ctx, ir_op *op) {
+       (void) ctx;
+       (void) op;
        if (! status->stat_options)
                return;
 
@@ -1406,6 +1446,8 @@ static void stat_free_ir_op(void *ctx, ir_op *op) {
  * @param node  the new IR node that was created
  */
 static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
+       (void) ctx;
+       (void) irg;
        if (! status->stat_options)
                return;
 
@@ -1439,6 +1481,7 @@ static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
  * @param node  the IR node that will be turned into an ID
  */
 static void stat_turn_into_id(void *ctx, ir_node *node) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1469,6 +1512,7 @@ static void stat_turn_into_id(void *ctx, ir_node *node) {
  * @param ent  the entity of this graph
  */
 static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1499,6 +1543,7 @@ static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent) {
  * information from being changed, it's "frozen" from now.
  */
 static void stat_free_graph(void *ctx, ir_graph *irg) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1527,6 +1572,9 @@ static void stat_free_graph(void *ctx, ir_graph *irg) {
  */
 static void stat_irg_walk(void *ctx, ir_graph *irg, generic_func *pre, generic_func *post)
 {
+       (void) ctx;
+       (void) pre;
+       (void) post;
        if (! status->stat_options)
                return;
 
@@ -1564,6 +1612,10 @@ static void stat_irg_walk_blkwise(void *ctx, ir_graph *irg, generic_func *pre, g
  */
 static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic_func *pre, generic_func *post)
 {
+       (void) ctx;
+       (void) node;
+       (void) pre;
+       (void) post;
        if (! status->stat_options)
                return;
 
@@ -1601,6 +1653,7 @@ static void stat_merge_nodes(
     ir_node **old_node_array, int old_num_entries,
     hook_opt_kind opt)
 {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1609,6 +1662,7 @@ static void stat_merge_nodes(
                int i, j;
                graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
 
+               cnt_inc(&status->num_opts[opt]);
                if (status->reassoc_run)
                        opt = HOOK_OPT_REASSOC;
 
@@ -1644,6 +1698,7 @@ static void stat_merge_nodes(
  * @param flag  if non-zero, reassociation is started else stopped
  */
 static void stat_reassociate(void *ctx, int flag) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1661,6 +1716,7 @@ static void stat_reassociate(void *ctx, int flag) {
  * @param node the IR node that will be lowered
  */
 static void stat_lower(void *ctx, ir_node *node) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1683,6 +1739,7 @@ static void stat_lower(void *ctx, ir_node *node) {
  */
 static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
 {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1704,6 +1761,7 @@ static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
  * @param ctx  the hook context
  */
 static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1722,6 +1780,7 @@ static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
  * @param ctx  the hook context
  */
 static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1741,6 +1800,8 @@ static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
  * @param ctx  the hook context
  */
 static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
+       (void) ctx;
+       (void) irg;
        if (! status->stat_options)
                return;
 
@@ -1753,6 +1814,10 @@ static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
 static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
                                int pos, ir_node *mux, if_result_t reason)
 {
+       (void) context;
+       (void) phi;
+       (void) pos;
+       (void) mux;
        if (! status->stat_options)
                return;
 
@@ -1770,6 +1835,8 @@ static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
  */
 static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
 {
+       (void) context;
+       (void) call;
        if (! status->stat_options)
                return;
 
@@ -1788,6 +1855,7 @@ static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
  * @param ctx  the hook context
  */
 static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1806,6 +1874,7 @@ static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
  * @param node  the division node that will be optimized
  */
 static void stat_arch_dep_replace_division_by_const(void *ctx, ir_node *node) {
+       (void) ctx;
        if (! status->stat_options)
                return;
 
@@ -1987,7 +2056,7 @@ void stat_dump_snapshot(const char *name, const char *phase)
                        ++p;
                        l = p - name;
 
-                       if (l > sizeof(fname) - 1)
+                       if (l > (int) (sizeof(fname) - 1))
                                l = sizeof(fname) - 1;
 
                        memcpy(fname, name, l);
@@ -2050,6 +2119,10 @@ void stat_dump_snapshot(const char *name, const char *phase)
                /* dump the parameter distribution */
                stat_dump_param_tbl(status->dist_param_cnt, global);
 
+               /* dump the optimization counter and clear them */
+               stat_dump_opt_cnt(status->num_opts, ARR_SIZE(status->num_opts));
+               clear_optimization_counter();
+
                stat_dump_finish();
 
                stat_finish_pattern_history(fname);
@@ -2192,6 +2265,8 @@ void firm_init_stat(unsigned enable_options)
        /* distribution table for parameter counts */
        status->dist_param_cnt = stat_new_int_distrib_tbl();
 
+       clear_optimization_counter();
+
 #undef HOOK
 #undef X
 }  /* firm_init_stat */