X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=07afa5d303a743351fa080abb1d2b46ff2bf2039;hb=6f068af98daa4725d60e5d23a8f98ec2841cfa44;hp=9d6337234fc93568a028d21447d862204ef9d327;hpb=2d7248e30844e2be9dbdcb09dfa6cbe9ba3c5f1b;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 9d6337234..07afa5d30 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -81,7 +81,8 @@
 static be_options_t be_options = {
 	DUMP_NONE,                         /* dump flags */
 	BE_TIME_OFF,                       /* no timing */
-	0,                                 /* no opt profile */
+	false,                             /* profile_generate */
+	false,                             /* profile_use */
 	0,                                 /* try to omit frame pointer */
 	0,                                 /* create PIC code */
 	BE_VERIFY_WARN,                    /* verification level: warn */
@@ -130,11 +131,10 @@ static const lc_opt_table_entry_t be_main_options[] = {
 	LC_OPT_ENT_BOOL     ("pic",        "create PIC code",                                     &be_options.pic),
 	LC_OPT_ENT_ENUM_PTR ("verify",     "verify the backend irg",                              &verify_var),
 	LC_OPT_ENT_BOOL     ("time",       "get backend timing statistics",                       &be_options.timing),
-	LC_OPT_ENT_BOOL     ("profile",    "instrument the code for execution count profiling",   &be_options.opt_profile),
-#ifdef FIRM_STATISTICS
+	LC_OPT_ENT_BOOL     ("profilegenerate", "instrument the code for execution count profiling",   &be_options.opt_profile_generate),
+	LC_OPT_ENT_BOOL     ("profileuse",      "use existing profile data",                           &be_options.opt_profile_use),
 	LC_OPT_ENT_BOOL     ("statev",     "dump statistic events",                               &be_options.statev),
 	LC_OPT_ENT_STR      ("filtev",     "filter for stat events (regex if support is active",  &be_options.filtev, sizeof(be_options.filtev)),
-#endif
 
 #ifdef WITH_ILP
 	LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
@@ -550,23 +550,24 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		Get the filename for the profiling data.
 		Beware: '\0' is already included in sizeof(suffix)
 	*/
-	sprintf(prof_filename, "%.*s%s\n", (int)(sizeof(prof_filename) - sizeof(suffix)), cup_name, suffix);
-
-	/*
-		Next: Either instruments all irgs with profiling code
-		or try to read in profile data for current translation unit.
-	*/
-	if (be_options.opt_profile) {
-		ir_graph *prof_init_irg = ir_profile_instrument(prof_filename, profile_default);
+	sprintf(prof_filename, "%.*s%s",
+	        (int)(sizeof(prof_filename) - sizeof(suffix)), cup_name, suffix);
+
+	if (be_options.opt_profile_use) {
+		bool res = ir_profile_read(prof_filename);
+		if (!res) {
+			fprintf(stderr, "Warning: Couldn't read profile data '%s'\n",
+			        prof_filename);
+		}
+	}
+	if (be_options.opt_profile_generate) {
+		ir_graph *prof_init_irg
+			= ir_profile_instrument(prof_filename);
 		initialize_birg(&birgs[num_birgs], prof_init_irg, &env);
 		num_birgs++;
-	} else {
-		ir_profile_read(prof_filename);
 	}
 
-#ifdef FIRM_STATISTICS
 	stat_active = stat_is_active();
-#endif /* FIRM_STATISTICS */
 
 	/* For all graphs */
 	for (i = 0; i < num_birgs; ++i) {
@@ -717,9 +718,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		/* Do register allocation */
 		be_allocate_registers(irg);
 
-#ifdef FIRM_STATISTICS
 		stat_ev_dbl("bemain_costs_before_ra", be_estimate_irg_costs(irg, birg->exec_freq));
-#endif
 
 		dump(DUMP_RA, irg, "ra");
 
@@ -838,7 +837,6 @@ void be_main(FILE *file_handle, const char *cup_name)
 		ir_timer_reset_and_start(t);
 	}
 
-#ifdef FIRM_STATISTICS
 	if (be_options.statev) {
 		const char *dot = strrchr(cup_name, '.');
 		const char *pos = dot ? dot : cup_name + strlen(cup_name);
@@ -850,7 +848,6 @@ void be_main(FILE *file_handle, const char *cup_name)
 		stat_ev_begin(buf, be_options.filtev);
 		stat_ev_ctx_push_str("bemain_compilation_unit", cup_name);
 	}
-#endif
 
 	be_main_loop(file_handle, cup_name);
 
@@ -865,12 +862,10 @@ void be_main(FILE *file_handle, const char *cup_name)
 		}
 	}
 
-#ifdef FIRM_STATISTICS
 	if (be_options.statev) {
 		stat_ev_ctx_pop("bemain_compilation_unit");
 		stat_ev_end();
 	}
-#endif
 }
 
 static int do_lower_for_target(ir_prog *irp, void *context)