X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fdistrib.c;h=8c693328a804a4f6ca6387b8b35c421a82cfd03f;hb=e97a86a5e90141c2cb4ccdc34195cab035627c3f;hp=bebba630feb9380e1da8d462eaea52aa474690af;hpb=5251238cbd55623a30a438de6972a0c3d48f514e;p=libfirm

diff --git a/ir/stat/distrib.c b/ir/stat/distrib.c
index bebba630f..8c693328a 100644
--- a/ir/stat/distrib.c
+++ b/ir/stat/distrib.c
@@ -1,26 +1,26 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/distrib.c
- * Purpose:     Statistics for Firm. Distribution tables.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
+ */
 
+/**
+ * @file
+ * @brief   Statistics for Firm. Distribution tables.
+ * @author  Michael Beck
+ */
+#include "config.h"
+
+#include "hashptr.h"
+#include "util.h"
+#include "xmalloc.h"
 #include "firmstat_t.h"
 
 /**
  * calculates a hash value for an address
- * Addresses are typically aligned at 32bit, so we ignore the lowest bits
  */
 static unsigned addr_hash(const void *object)
 {
-  return (unsigned)object >> 3;
+	return hash_ptr(object);
 }
 
 /**
@@ -28,7 +28,7 @@ static unsigned addr_hash(const void *object)
  */
 static unsigned int_hash(const void *object)
 {
-  return (unsigned)object;
+	return (unsigned)PTR_TO_INT(object);
 }
 
 /**
@@ -36,10 +36,12 @@ static unsigned int_hash(const void *object)
  */
 static int int_cmp_fun(const void *elt, const void *key)
 {
-  int p1 = (int)elt;
-  int p2 = (int)key;
+	const distrib_entry_t *p1 = (const distrib_entry_t*)elt;
+	const distrib_entry_t *p2 = (const distrib_entry_t*)key;
 
-  return p1 - p2;
+	if (p1->object == p2->object)
+		return 0;
+	return p1->object < p2->object ? -1 : 1;
 }
 
 /*
@@ -47,21 +49,16 @@ static int int_cmp_fun(const void *elt, const void *key)
  */
 distrib_tbl_t *stat_new_distrib_tbl(pset_cmp_fun cmp_func, distrib_hash_fun hash_func)
 {
-  distrib_tbl_t *res;
-
-  res = malloc(sizeof(*res));
+	distrib_tbl_t *res = XMALLOC(distrib_tbl_t);
 
-  if (! res)
-    return res;
+	obstack_init(&res->cnts);
 
-  obstack_init(&res->cnts);
+	/* create the hash-table */
+	res->hash_map  = new_pset(cmp_func, 8);
+	res->hash_func = hash_func ? hash_func : addr_hash;
+	res->int_dist  = 0;
 
-  /* create the hash-table */
-  res->hash_map  = new_pset(cmp_func, 8);
-  res->hash_func = hash_func ? hash_func : addr_hash;
-  res->int_dist  = 0;
-
-  return res;
+	return res;
 }
 
 /*
@@ -69,12 +66,12 @@ distrib_tbl_t *stat_new_distrib_tbl(pset_cmp_fun cmp_func, distrib_hash_fun hash
  */
 distrib_tbl_t *stat_new_int_distrib_tbl(void)
 {
-  distrib_tbl_t *res = stat_new_distrib_tbl(int_cmp_fun, int_hash);
+	distrib_tbl_t *res = stat_new_distrib_tbl(int_cmp_fun, int_hash);
 
-  if (res)
-    res->int_dist = 1;
+	if (res)
+		res->int_dist = 1;
 
-  return res;
+	return res;
 }
 
 /*
@@ -82,13 +79,13 @@ distrib_tbl_t *stat_new_int_distrib_tbl(void)
  */
 void stat_delete_distrib_tbl(distrib_tbl_t *tbl)
 {
-  if (tbl) {
-    /* free all entries */
-    obstack_free(&tbl->cnts, NULL);
+	if (tbl) {
+		/* free all entries */
+		obstack_free(&tbl->cnts, NULL);
 
-    /* delete the hash table */
-    del_pset(tbl->hash_map);
-  }
+		/* delete the hash table */
+		del_pset(tbl->hash_map);
+	}
 }
 
 /**
@@ -96,23 +93,23 @@ void stat_delete_distrib_tbl(distrib_tbl_t *tbl)
  */
 static distrib_entry_t *distrib_get_entry(distrib_tbl_t *tbl, const void *object)
 {
-  distrib_entry_t key;
-  distrib_entry_t *elem;
+	distrib_entry_t key;
+	distrib_entry_t *elem;
 
-  key.object = object;
+	key.object = object;
 
-  elem = pset_find(tbl->hash_map, &key, tbl->hash_func(object));
-  if (elem)
-    return elem;
+	elem = (distrib_entry_t*)pset_find(tbl->hash_map, &key, tbl->hash_func(object));
+	if (elem)
+		return elem;
 
-  elem = obstack_alloc(&tbl->cnts, sizeof(*elem));
+	elem = OALLOC(&tbl->cnts, distrib_entry_t);
 
-  /* clear counter */
-  cnt_clr(&elem->cnt);
+	/* clear counter */
+	cnt_clr(&elem->cnt);
 
-  elem->object = object;
+	elem->object = object;
 
-  return pset_insert(tbl->hash_map, elem, tbl->hash_func(object));
+	return (distrib_entry_t*)pset_insert(tbl->hash_map, elem, tbl->hash_func(object));
 }
 
 /*
@@ -120,74 +117,139 @@ static distrib_entry_t *distrib_get_entry(distrib_tbl_t *tbl, const void *object
  */
 void stat_add_distrib_tbl(distrib_tbl_t *tbl, const void *object, const counter_t *cnt)
 {
-  distrib_entry_t *elem = distrib_get_entry(tbl, object);
+	distrib_entry_t *elem = distrib_get_entry(tbl, object);
 
-  cnt_add(&elem->cnt, cnt);
+	cnt_add(&elem->cnt, cnt);
 }
 
-/**
+/*
  * adds a new key count into the integer distribution table
  */
 void stat_add_int_distrib_tbl(distrib_tbl_t *tbl, int key, const counter_t *cnt)
 {
-   stat_add_distrib_tbl(tbl, (const void *)key, cnt);
+	stat_add_distrib_tbl(tbl, INT_TO_PTR(key), cnt);
 }
 
 /*
- * calculates the mean value of a distribution
+ * increases object count by one
  */
-double stat_calc_mean_distrib_tbl(distrib_tbl_t *tbl)
+void stat_inc_distrib_tbl(distrib_tbl_t *tbl, const void *object)
 {
-  distrib_entry_t *entry;
-  unsigned count;
-  double sum;
+	distrib_entry_t *elem = distrib_get_entry(tbl, object);
 
-  if (tbl->int_dist) {
-    /* integer distribution, need min, max */
-    int min, max;
-
-    entry = pset_first(tbl->hash_map);
+	cnt_inc(&elem->cnt);
+}
 
-    if (! entry)
-      return 0.0;
+/*
+ * increases key count by one
+ */
+void stat_inc_int_distrib_tbl(distrib_tbl_t *tbl, int key)
+{
+	stat_inc_distrib_tbl(tbl, INT_TO_PTR(key));
+}
 
-    min =
-    max = (int)entry->object;
-    sum = cnt_to_dbl(&entry->cnt);
+/*
+ * inserts a new object with count 0 into the distribution table
+ * if object is already present, nothing happens
+ */
+void stat_insert_distrib_tbl(distrib_tbl_t *tbl, const void *object)
+{
+	/* executed for side effect */
+	(void)distrib_get_entry(tbl, object);
+}
 
+/*
+ * inserts a new key with count 0 into the integer distribution table
+ * if key is already present, nothing happens
+ */
+void stat_insert_int_distrib_tbl(distrib_tbl_t *tbl, int key)
+{
+	stat_insert_distrib_tbl(tbl, INT_TO_PTR(key));
+}
 
-    for (entry = pset_next(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
-      int value = (int)entry->object;
+/*
+ * returns the sum over all counters in a distribution table
+ */
+int stat_get_count_distrib_tbl(distrib_tbl_t *tbl)
+{
+	counter_t cnt = ZERO_CNT;
 
-      if (value < min)
-	min = value;
-      if (value > max);
-        max = value;
+	foreach_pset(tbl->hash_map, distrib_entry_t, entry)
+		cnt_add(&cnt, &entry->cnt);
+	return cnt_to_uint(&cnt);
+}
 
-      sum += cnt_to_dbl(&entry->cnt);
-    }
-    count = max - min + 1;
-  }
-  else {
-    sum = 0.0;
-    count = 0;
-    for (entry = pset_first(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
-      sum += cnt_to_dbl(&entry->cnt);
-      ++count;
-    }
-  }
+/*
+ * calculates the mean value of a distribution
+ */
+double stat_calc_mean_distrib_tbl(distrib_tbl_t *tbl)
+{
+	size_t count;
+	double sum;
+
+	if (tbl->int_dist) {
+		/* integer distribution, need min, max */
+		if (pset_count(tbl->hash_map) == 0)
+			return 0.0;
+
+		int min = INT_MAX;
+		int max = INT_MIN;
+		sum = 0.0;
+
+		foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+			int value = PTR_TO_INT(entry->object);
+
+			if (value < min)
+				min = value;
+			if (value > max)
+				max = value;
+
+			sum += cnt_to_dbl(&entry->cnt);
+		}
+		count = max - min + 1;
+	} else {
+		sum = 0.0;
+		count = 0;
+		foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+			sum += cnt_to_dbl(&entry->cnt);
+			++count;
+		}
+	}
+
+	return count ? sum / (double)count : 0.0;
+}
 
-  return count ? sum / (double)count : 0.0;
+/*
+ * calculates the average value of a distribution
+ */
+double stat_calc_avg_distrib_tbl(distrib_tbl_t *tbl)
+{
+	size_t count = 0;
+	double sum   = 0.0;
+
+	if (tbl->int_dist) {
+		if (pset_count(tbl->hash_map) <= 0)
+			return 0.0;
+
+		foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+			sum   += cnt_to_dbl(&entry->cnt) * PTR_TO_INT(entry->object);
+			count += cnt_to_uint(&entry->cnt);
+		}
+	} else {
+		foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+			sum += cnt_to_dbl(&entry->cnt);
+			++count;
+		}
+	}
+
+	return count ? sum / (double)count : 0.0;
 }
 
 /**
  * iterates over all entries in a distribution table
  */
-void stat_iterate_distrib_tbl(distrib_tbl_t *tbl, eval_distrib_entry_fun eval)
+void stat_iterate_distrib_tbl(const distrib_tbl_t *tbl, eval_distrib_entry_fun eval, void *env)
 {
-  distrib_entry_t *entry;
-
-  for (entry = pset_first(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
-    eval(entry);
-  }
+	foreach_pset(tbl->hash_map, distrib_entry_t, entry)
+		eval(entry, env);
 }