X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fstat_dmp.c;h=04d254e899f520e1c863ea0ca5c7f16c16026246;hb=0b8424d61870271814e24634e50d6bed7a532ea3;hp=bd6efc700faa8ddf2bc56211a2224e0f1dd4335e;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/stat/stat_dmp.c b/ir/stat/stat_dmp.c
index bd6efc700..04d254e89 100644
--- a/ir/stat/stat_dmp.c
+++ b/ir/stat/stat_dmp.c
@@ -77,8 +77,8 @@ static const struct {
 	{ 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_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" },
@@ -86,10 +86,11 @@ static const struct {
 	{ 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, (a ^ b) & b -> ~a & b" },
+	{ FS_OPT_EOR_A_B_A,      "algebraic simplification: (a ^ b) ^ a = b" },
+	{ FS_OPT_EOR_TO_NOT_BOOL,"boolean simplification: bool ^ 1 = !bool" },
+	{ 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_OR_SHFT_TO_ROTL,"algebraic simplification: (x << c) | (x >> (bits - c)) == Rotl(x, c)" },
 	{ FS_OPT_REASSOC_SHIFT,  "algebraic simplification: (x SHF c1) SHF c2 = x SHF (c1+c2)" },
 	{ FS_OPT_SHIFT_AND,      "algebraic simplification: (a SHF c) AND (b SHF c) = (a AND b) SHF c" },
 	{ FS_OPT_SHIFT_OR,       "algebraic simplification: (a SHF c) OR (b SHF c) = (a OR b) SHF c" },
@@ -97,6 +98,12 @@ static const struct {
 	{ FS_OPT_CONV,           "algebraic simplification: Conv could be removed" },
 	{ FS_OPT_CAST,           "algebraic simplification: a Cast could be removed" },
 	{ FS_OPT_MIN_MAX_EQ,     "algebraic simplification: Min(a,a) = Max(a,a) = a" },
+	{ FS_OPT_MUX_BOOL,       "boolean simplification: Muxb(sel, true, false) = sel" },
+	{ FS_OPT_MUX_NOT_BOOL,   "boolean simplification: Muxb(sel, false, true) = Not(sel)" },
+	{ FS_OPT_MUX_OR_BOOL,    "boolean simplification: Muxb(sel, true, x) = Or(sel, x)" },
+	{ FS_OPT_MUX_ORNOT_BOOL, "boolean simplification: Muxb(sel, x, true) = Or(Not(sel), x)" },
+	{ FS_OPT_MUX_AND_BOOL,   "boolean simplification: Muxb(sel, x, false) = And(sel, x)" },
+	{ FS_OPT_MUX_ANDNOT_BOOL,"boolean simplification: Muxb(sel, false, x) = And(Not(sel), x)" },
 	{ FS_OPT_MUX_C,          "algebraic simplification: Mux(C, f, t) = C ? t : f" },
 	{ FS_OPT_MUX_EQ,         "algebraic simplification: Mux(v, x, x) = x" },
 	{ FS_OPT_MUX_TRANSFORM,  "algebraic simplification: Mux(a, b, c) = b OR Mux(a,b, c) = c" },
@@ -138,6 +145,7 @@ static const struct {
 	{ 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_SYMMETRIC,  "RTS optimization: call to symmetric function f(-x) replaced by f(x)" },
 	{ 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" },
@@ -298,7 +306,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 */
 
 /**
@@ -468,7 +476,8 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
 			" recursive                 : %s\n"
 			" chain call                : %s\n"
 			" calls                     : %u\n"
-			" indirect calls            : %u\n",
+			" indirect calls            : %u\n"
+			" external calls            : %u\n",
 			entry->is_deleted ? "DELETED " : "",
 			cnt_to_uint(&entry->cnt[gcnt_acc_walked]), cnt_to_uint(&entry->cnt[gcnt_acc_walked_blocks]),
 			cnt_to_uint(&entry->cnt[gcnt_acc_was_inlined]),
@@ -479,7 +488,8 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
 			entry->is_recursive ? "YES" : "NO",
 			entry->is_chain_call ? "YES" : "NO",
 			cnt_to_uint(&entry->cnt[gcnt_all_calls]),
-			cnt_to_uint(&entry->cnt[gcnt_indirect_calls])
+			cnt_to_uint(&entry->cnt[gcnt_indirect_calls]),
+			cnt_to_uint(&entry->cnt[gcnt_external_calls])
 		);
 
 		for (i = 0; i < IF_RESULT_LAST; ++i) {
@@ -530,14 +540,15 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
 		/* dump block info */
 		fprintf(dmp->f, "\n%12s %12s %12s %12s %12s %12s %12s\n", "Block Nr", "Nodes", "intern E", "incoming E", "outgoing E", "Phi", "quot");
 		foreach_pset(entry->block_hash, b_entry) {
-			fprintf(dmp->f, "BLK   %6ld %12u %12u %12u %12u %12u %4.8f\n",
+			fprintf(dmp->f, "BLK   %6ld %12u %12u %12u %12u %12u %4.8f %s\n",
 				b_entry->block_nr,
 				cnt_to_uint(&b_entry->cnt[bcnt_nodes]),
 				cnt_to_uint(&b_entry->cnt[bcnt_edges]),
 				cnt_to_uint(&b_entry->cnt[bcnt_in_edges]),
 				cnt_to_uint(&b_entry->cnt[bcnt_out_edges]),
 				cnt_to_uint(&b_entry->cnt[bcnt_phi_data]),
-				cnt_to_dbl(&b_entry->cnt[bcnt_edges]) / cnt_to_dbl(&b_entry->cnt[bcnt_nodes])
+				cnt_to_dbl(&b_entry->cnt[bcnt_edges]) / cnt_to_dbl(&b_entry->cnt[bcnt_nodes]),
+				b_entry->is_start ? "START" : (b_entry->is_end ? "END" : "")
 			);
 		}  /* foreach_pset */
 
@@ -588,7 +599,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");
@@ -628,6 +639,8 @@ static void simple_dump_param_tbl(dumper_t *dmp, const distrib_tbl_t *tbl, graph
 	fprintf(dmp->f, "-------------------------------\n");
 
 	fprintf(dmp->f, "Number of Calls           %12u\n", cnt_to_uint(&global->cnt[gcnt_all_calls]));
+	fprintf(dmp->f, "indirect calls            %12u\n", cnt_to_uint(&global->cnt[gcnt_indirect_calls]));
+	fprintf(dmp->f, "external calls            %12u\n", cnt_to_uint(&global->cnt[gcnt_external_calls]));
 	fprintf(dmp->f, "with const params         %12u\n", cnt_to_uint(&global->cnt[gcnt_call_with_cnst_arg]));
 	fprintf(dmp->f, "with all const params     %12u\n", cnt_to_uint(&global->cnt[gcnt_call_with_all_cnst_arg]));
 	fprintf(dmp->f, "with local var adr params %12u\n", cnt_to_uint(&global->cnt[gcnt_call_with_local_adr]));