X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fstat_dmp.c;h=16f7b6c590871abd6eaf34dde21087acc15febac;hb=7498ed3766f3f98604d96d1b75978a3a9e6768ed;hp=7516aae54276e223ad0c4a11629c525fe9b4ac0f;hpb=b6c5fd2c57307b714cfdea29030998dfe7fbf052;p=libfirm

diff --git a/ir/stat/stat_dmp.c b/ir/stat/stat_dmp.c
index 7516aae54..16f7b6c59 100644
--- a/ir/stat/stat_dmp.c
+++ b/ir/stat/stat_dmp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -72,14 +72,22 @@ static const struct {
 	{ FS_OPT_ADD_SUB,        "algebraic simplification: (a + x) - x = (a - x) + x = a" },
 	{ FS_OPT_ADD_MUL_A_X_A,  "algebraic simplification: a * x + a = a * (x + 1)" },
 	{ FS_OPT_SUB_0_A,        "algebraic simplification: 0 - a = -a" },
+	{ FS_OPT_MINUS_SUB,      "algebraic simplification: -(a - b) = b - a" },
+	{ FS_OPT_SUB_MINUS,      "algebraic simplification: a - (-b) = a + b" },
 	{ FS_OPT_SUB_MUL_A_X_A,  "algebraic simplification: a * x - a = a * (x - 1)" },
 	{ FS_OPT_SUB_SUB_X_Y_Z,  "algebraic simplification: (x - y) - z = x - (y + z)" },
+	{ FS_OPT_SUB_C_NOT_X,    "algebraic simplification: c - ~a = a + (c+1)" },
+	{ FS_OPT_SUB_TO_ADD,     "algebraic simplification: (-a) - b = -(a + b), a - (b - c) = a + (c - b), a - (b * C) -> a + (b * -C)" },
+	{ FS_OPT_MUL_MINUS,      "algebraic simplification: (-a) * (b - c) -> a * (c - b)" },
 	{ FS_OPT_MUL_MINUS_1,    "algebraic simplification: a * -1 = -a" },
+	{ FS_OPT_MINUS_MUL_C,    "algebraic simplification: (-a) * C = a * (-C)" },
+	{ FS_OPT_MUL_MINUS_MINUS,"algebraic simplification: (-a) * (-b) = a * b" },
 	{ FS_OPT_OR,             "algebraic simplification: a | a = a | 0 = 0 | a = a" },
-	{ FS_OPT_AND,            "algebraic simplification: a & 0b1...1 = 0b1...1 & a =  a & a = a" },
+	{ FS_OPT_AND,            "algebraic simplification: a & 0b1...1 = 0b1...1 & a = a & a = (a|X) & a = a" },
+	{ FS_OPT_TO_EOR,         "algebraic simplification: (a|b) & ~(a&b) = a^b" },
 	{ FS_OPT_EOR_A_A,        "algebraic simplification: a ^ a = 0" },
 	{ FS_OPT_EOR_TO_NOT_BOOL,"algebraic simplification: bool ^ 1 = !bool" },
-	{ FS_OPT_EOR_TO_NOT,     "algebraic simplification: x ^ 0b1..1 = ~x" },
+	{ FS_OPT_EOR_TO_NOT,     "algebraic simplification: x ^ 0b1..1 = ~x, (a ^ b) & b -> ~a & b" },
 	{ FS_OPT_NOT_CMP,        "algebraic simplification: !(a cmp b) = a !cmp b" },
 	{ FS_OPT_OR_SHFT_TO_ROT, "algebraic simplification: (x << c) | (x >> (bits - c)) == Rot(x, c)" },
 	{ FS_OPT_REASSOC_SHIFT,  "algebraic simplification: (x SHF c1) SHF c2 = x SHF (c1+c2)" },
@@ -100,8 +108,41 @@ static const struct {
 	{ FS_OPT_MINUS_NOT,      "algebraic simplification: -(~x) = x + 1" },
 	{ FS_OPT_NOT_MINUS_1,    "algebraic simplification: ~(x - 1) = -x" },
 	{ FS_OPT_NOT_PLUS_1,     "algebraic simplification: ~x + 1 = -x" },
-	{ FS_OPT_FP_INV_MUL,     "algebraic simplification:  x / y = x * (1.0/y)" },
+	{ FS_OPT_ADD_X_NOT_X,    "algebraic simplification: ~x + x = -1" },
+	{ FS_OPT_FP_INV_MUL,     "algebraic simplification: x / y = x * (1.0/y)" },
+	{ FS_OPT_ABS_MINUS_X,    "algebraic simplification: Abs(-x) = Abs(x)" },
 	{ FS_OPT_CONST_PHI,      "constant evaluation on Phi node" },
+	{ FS_OPT_PREDICATE,      "predicate optimization" },
+	{ FS_OPT_DEMORGAN,       "optimization using DeMorgan's law" },
+	{ FS_OPT_CMP_OP_OP,      "CMP optimization: Cmp(OP(x), OP(y)) = Cmp(x, y)" },
+	{ FS_OPT_CMP_OP_C,       "CMP optimization: Cmp(OP(x), c1) = Cmp(x, c2)" },
+	{ FS_OPT_CMP_CONV_CONV,  "CMP optimization: Cmp(Conv(x), Conv(y)) = Cmp(x, y)" },
+	{ FS_OPT_CMP_CONV,       "CMP optimization: Cmp(Conv(x), Conv(y)) = Cmp(Conv(x), y)" },
+	{ FS_OPT_CMP_TO_BOOL,    "CMP optimization: Cmp(x, y) = BoolOP(x, y)" },
+	{ FS_OPT_CMP_CNST_MAGN,  "CMP optimization: reduced magnitude of a const" },
+	{ FS_OPT_CMP_SHF_TO_AND, "CMP optimization: transformed shift into And" },
+	{ FS_OPT_CMP_MOD_TO_AND, "CMP optimization: transformed Mod into And" },
+	{ FS_OPT_RTS_ABS,        "RTS optimization: call to abs() replaced" },
+	{ FS_OPT_RTS_ALLOCA,     "RTS optimization: call to alloca() replaced" },
+	{ FS_OPT_RTS_SQRT,       "RTS optimization: call to sqrt() replaced" },
+	{ FS_OPT_RTS_CBRT,       "RTS optimization: call to cbrt() replaced" },
+	{ FS_OPT_RTS_POW,        "RTS optimization: call to pow() replaced" },
+	{ FS_OPT_RTS_EXP,        "RTS optimization: call to exp() replaced" },
+	{ FS_OPT_RTS_LOG,        "RTS optimization: call to log() replaced" },
+	{ FS_OPT_RTS_SIN,        "RTS optimization: call to sin() replaced" },
+	{ FS_OPT_RTS_COS,        "RTS optimization: call to cos() replaced" },
+	{ FS_OPT_RTS_TAN,        "RTS optimization: call to tan() replaced" },
+	{ FS_OPT_RTS_ASIN,       "RTS optimization: call to asin() replaced" },
+	{ FS_OPT_RTS_ACOS,       "RTS optimization: call to atan() replaced" },
+	{ FS_OPT_RTS_ATAN,       "RTS optimization: call to acos() replaced" },
+	{ FS_OPT_RTS_SINH,       "RTS optimization: call to sinh() replaced" },
+	{ FS_OPT_RTS_COSH,       "RTS optimization: call to cosh() replaced" },
+	{ FS_OPT_RTS_TANH,       "RTS optimization: call to tanh() replaced" },
+	{ FS_OPT_RTS_STRCMP,     "RTS optimization: call to strcmp() replaced" },
+	{ FS_OPT_RTS_STRNCMP,    "RTS optimization: call to strncmp() replaced" },
+	{ FS_OPT_RTS_MEMCPY,     "RTS optimization: call to memcpy() replaced" },
+	{ FS_OPT_RTS_MEMSET,     "RTS optimization: call to memset() replaced" },
+	{ FS_OPT_RTS_STRLEN,     "RTS optimization: call to strlen() replaced" },
 	{ FS_BE_IA32_LEA,        "ia32 Backend transformation: Lea was created" },
 	{ FS_BE_IA32_LOAD_LEA,   "ia32 Backend transformation: Load merged with a Lea" },
 	{ FS_BE_IA32_STORE_LEA,  "ia32 Backend transformation: Store merged with a Lea" },
@@ -160,17 +201,24 @@ static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
 }  /* simple_dump_opcode_hash */
 
 /**
- * dumps an optimization hash into human readable form
+ * Return the name of an optimization.
  */
-static void simple_dump_opt_hash(dumper_t *dmp, pset *set, int index)
-{
+static const char *get_opt_name(int index) {
 	assert(index < (int) ARR_SIZE(opt_names) && "index out of range");
 	assert((int) opt_names[index].kind == index && "opt_names broken");
+	return opt_names[index].name;
+}  /* get_opt_name */
 
+/**
+ * dumps an optimization hash into human readable form
+ */
+static void simple_dump_opt_hash(dumper_t *dmp, pset *set, int index)
+{
 	if (pset_count(set) > 0) {
 		opt_entry_t *entry;
+		const char *name = get_opt_name(index);
 
-		fprintf(dmp->f, "\n%s:\n", opt_names[index].name);
+		fprintf(dmp->f, "\n%s:\n", name);
 		fprintf(dmp->f, "%-16s %-8s\n", "Opcode", "deref");
 
 		foreach_pset(set, entry) {
@@ -250,7 +298,7 @@ static void simple_dump_be_block_sched_ready(dumper_t *dmp, graph_entry_t *entry
 static void add_distrib_entry(const distrib_entry_t *entry, void *env) {
 	distrib_tbl_t *sum_tbl = env;
 
-	stat_add_int_distrib_tbl(sum_tbl, (int)(entry->object), &entry->cnt);
+	stat_add_int_distrib_tbl(sum_tbl, PTR_TO_INT(entry->object), &entry->cnt);
 }  /* add_distrib_entry */
 
 /**
@@ -540,7 +588,7 @@ static void simple_dump_const_tbl(dumper_t *dmp, const constant_info_t *tbl)
 	fprintf(dmp->f, "-------------------------------\n");
 
 	for (i = 0; i < ARR_SIZE(tbl->int_bits_count); ++i) {
-		fprintf(dmp->f, "%5d %12u\n", i + 1, cnt_to_uint(&tbl->int_bits_count[i]));
+		fprintf(dmp->f, "%5u %12u\n", (unsigned) (i + 1), cnt_to_uint(&tbl->int_bits_count[i]));
 		cnt_add(&sum, &tbl->int_bits_count[i]);
 	}  /* for */
 	fprintf(dmp->f, "-------------------------------\n");
@@ -585,6 +633,24 @@ static void simple_dump_param_tbl(dumper_t *dmp, const distrib_tbl_t *tbl, graph
 	fprintf(dmp->f, "with local var adr params %12u\n", cnt_to_uint(&global->cnt[gcnt_call_with_local_adr]));
 }  /* simple_dump_param_tbl */
 
+/**
+ * dumps the optimization counter table
+ */
+static void simple_dump_opt_cnt(dumper_t *dmp, const counter_t *tbl, unsigned len) {
+	unsigned i;
+
+	fprintf(dmp->f, "\nOptimization counts:\n");
+	fprintf(dmp->f, "---------------------\n");
+
+	for (i = 0; i < len; ++i) {
+		unsigned cnt = cnt_to_uint(&tbl[i]);
+
+		if (cnt > 0) {
+			fprintf(dmp->f, "%8u %s\n", cnt, get_opt_name(i));
+		}
+	}
+}  /* simple_dump_opt_cnt */
+
 /**
  * initialize the simple dumper
  */
@@ -614,6 +680,7 @@ const dumper_t simple_dumper = {
 	simple_dump_graph,
 	simple_dump_const_tbl,
 	simple_dump_param_tbl,
+	simple_dump_opt_cnt,
 	simple_init,
 	simple_finish,
 	NULL,
@@ -715,6 +782,16 @@ static void csv_dump_param_tbl(dumper_t *dmp, const distrib_tbl_t *tbl, graph_en
 	/* FIXME: NYI */
 }  /* csv_dump_param_tbl */
 
+/**
+ * dumps the optimization counter
+ */
+static void csv_dump_opt_cnt(dumper_t *dmp, const counter_t *tbl, unsigned len) {
+	(void) dmp;
+	(void) tbl;
+	(void) len;
+	/* FIXME: NYI */
+}  /* csv_dump_opt_cnt */
+
 /**
  * initialize the simple dumper
  */
@@ -745,6 +822,7 @@ const dumper_t csv_dumper = {
 	csv_dump_graph,
 	csv_dump_const_tbl,
 	csv_dump_param_tbl,
+	csv_dump_opt_cnt,
 	csv_init,
 	csv_finish,
 	NULL,