X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=005223936792fd513bfb0e7879f12443981501ab;hb=5cc462a3b818894990ff363e93a0cd4ab38fa503;hp=7535e5859628a8a3157b7b8120807c64c9b8b69b;hpb=2913f913c5977559bf8405b383b0cc25a83e7589;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 7535e5859..005223936 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -30,20 +30,15 @@
 #include "irloop_t.h"
 #include "irtools.h"
 #include "irvrfy.h"
+#include "irprintf.h"
 #include "return.h"
 #include "firmstat.h"
 #include "cfopt.h"
 #include "execfreq.h"
 
 #include "bearch.h"
-#include "firm/bearch_firm.h"
-#include "ia32/bearch_ia32.h"
-#include "arm/bearch_arm.h"
-#include "ppc32/bearch_ppc32.h"
-#include "mips/bearch_mips.h"
-
 #include "be_t.h"
-#include "benumb_t.h"
+#include "bemodule.h"
 #include "beutil.h"
 #include "benode_t.h"
 #include "beirgmod.h"
@@ -65,7 +60,6 @@
 #include "bestat.h"
 #include "beverify.h"
 #include "beprofile.h"
-#include "beblocksched.h"
 #include "be_dbgout.h"
 
 #ifdef WITH_ILP
@@ -88,16 +82,11 @@ static be_options_t be_options = {
 /* config file. */
 static char config_file[256] = { 0 };
 
-/* register allocator to use. */
-static const be_ra_t *ra = &be_ra_chordal_allocator;
-
 /* back end instruction set architecture to use */
-static const arch_isa_if_t *isa_if = &ia32_isa_if;
+static const arch_isa_if_t *isa_if = NULL;
 
 #ifdef WITH_LIBCORE
 
-static lc_opt_entry_t *be_grp_root = NULL;
-
 /* possible dumping options */
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "none",       DUMP_NONE },
@@ -112,24 +101,6 @@ static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ NULL,         0 }
 };
 
-/* register allocators */
-static const lc_opt_enum_const_ptr_items_t ra_items[] = {
-	{ "chordal",  &be_ra_chordal_allocator },
-	{ "external", &be_ra_external_allocator },
-	{ NULL,      NULL }
-};
-
-/* instruction set architectures. */
-static const lc_opt_enum_const_ptr_items_t isa_items[] = {
-	{ "ia32",    &ia32_isa_if },
-#if 0
-	{ "arm",     &arm_isa_if },
-	{ "ppc32",   &ppc32_isa_if },
-	{ "mips",    &mips_isa_if },
-#endif
-	{ NULL,      NULL }
-};
-
 /* verify options. */
 static const lc_opt_enum_int_items_t vrfy_items[] = {
 	{ "off",    BE_VRFY_OFF    },
@@ -151,14 +122,6 @@ static lc_opt_enum_mask_var_t dump_var = {
 	&be_options.dump_flags, dump_items
 };
 
-static lc_opt_enum_const_ptr_var_t ra_var = {
-	(const void **) &ra, ra_items
-};
-
-static lc_opt_enum_const_ptr_var_t isa_var = {
-	(const void **) &isa_if, isa_items
-};
-
 static lc_opt_enum_int_var_t vrfy_var = {
 	&be_options.vrfy_option, vrfy_items
 };
@@ -170,8 +133,6 @@ static lc_opt_enum_int_var_t sched_var = {
 static const lc_opt_table_entry_t be_main_options[] = {
 	LC_OPT_ENT_STR      ("config",   "read another config file containing backend options", config_file, sizeof(config_file)),
 	LC_OPT_ENT_ENUM_MASK("dump",     "dump irg on several occasions",                       &dump_var),
-	LC_OPT_ENT_ENUM_PTR ("ra",       "register allocator",                                  &ra_var),
-	LC_OPT_ENT_ENUM_PTR ("isa",      "the instruction set architecture",                    &isa_var),
 	LC_OPT_ENT_NEGBOOL  ("noomitfp", "do not omit frame pointer",                           &be_options.omit_fp),
 	LC_OPT_ENT_BOOL     ("stabs",    "enable stabs debug support",                          &be_options.stabs_debug_support),
 	LC_OPT_ENT_ENUM_PTR ("vrfy",     "verify the backend irg",                              &vrfy_var),
@@ -189,48 +150,46 @@ static const lc_opt_table_entry_t be_main_options[] = {
 
 #endif /* WITH_LIBCORE */
 
+static be_module_list_entry_t *isa_ifs = NULL;
+
+void be_register_isa_if(const char *name, const arch_isa_if_t *isa)
+{
+	if(isa_if == NULL)
+		isa_if = isa;
+
+	be_add_module_to_list(&isa_ifs, name, (void*) isa);
+}
+
 void be_opt_register(void)
 {
 #ifdef WITH_LIBCORE
-	int i;
-	lc_opt_entry_t *be_grp_ra;
+	lc_opt_entry_t *be_grp;
 	static int run_once = 0;
 
-	if (! run_once) {
-		run_once     = 1;
-		be_grp_root  = lc_opt_get_grp(firm_opt_get_root(), "be");
-		be_grp_ra    = lc_opt_get_grp(be_grp_root, "ra");
-
-		lc_opt_add_table(be_grp_root, be_main_options);
-
-		/* register allocator options */
-		for(i = 0; ra_items[i].name != NULL; ++i) {
-			const be_ra_t *ra = ra_items[i].value;
-			ra->register_options(be_grp_ra);
-		}
+	if (run_once) {
+		return;
+	}
+	run_once     = 1;
 
-		/* register isa options */
-		for(i = 0; isa_items[i].name != NULL; ++i) {
-			const arch_isa_if_t *isa = isa_items[i].value;
-			isa->register_options(be_grp_root);
-		}
+	be_init_modules();
 
-		/* scheduler register options */
-		list_sched_register_options(be_grp_root);
+	be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+	lc_opt_add_table(be_grp, be_main_options);
 
-		be_block_schedule_register_options(be_grp_root);
-	}
+	be_add_module_list_opt(be_grp, "isa", "the instruction set architecture",
+	                       &isa_ifs, (void**) &isa_if);
 #endif /* WITH_LIBCORE */
 }
 
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
 #ifdef WITH_LIBCORE
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
 	if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
-		lc_opt_print_help(be_grp_root, stdout);
+		lc_opt_print_help(be_grp, stdout);
 		return -1;
 	}
-	return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL);
+	return lc_opt_from_single_arg(be_grp, NULL, arg, NULL);
 #else
 	return 0;
 #endif /* WITH_LIBCORE */
@@ -258,12 +217,7 @@ static void be_sched_vrfy(ir_graph *irg, int vrfy_opt) {
 const backend_params *be_init(void)
 {
 	be_opt_register();
-
-	be_sched_init();
-	be_numbering_init();
-	be_copy_opt_init();
-	copystat_init();
-	phi_class_init();
+	be_init_modules();
 
 	if (isa_if->get_params)
 		return isa_if->get_params();
@@ -357,18 +311,13 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
 	/* Remove critical edges */
 	remove_critical_cf_edges(irg);
 
-	/* Compute the dominance information. */
-	free_dom(irg);
-	compute_doms(irg);
-
 	/* Ensure, that the ir_edges are computed. */
 	edges_assure(irg);
 
-	/* check, if the dominance property is fulfilled. */
-	be_check_dominance(irg);
-
 	/* reset the phi handler. */
 	be_phi_handler_reset(env->phi_handler);
+
+	set_irg_phase_state(irg, phase_backend);
 }
 
 #ifdef WITH_LIBCORE
@@ -424,6 +373,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 	static const char suffix[] = ".prof";
 	be_irg_t *birgs;
 	unsigned num_birgs;
+	ir_graph **irg_list, **backend_irg_list;
 
 	be_ra_timer_t *ra_timer;
 
@@ -458,16 +408,20 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 	be_dbg_so(env.db_handle, cup_name);
 	be_dbg_types(env.db_handle);
 
+	/* backend may provide an ordered list of irgs where code should be generated for */
+	irg_list         = NEW_ARR_F(ir_graph *, 0);
+	backend_irg_list = arch_isa_get_backend_irg_list(isa, &irg_list);
+
 	/* we might need 1 birg more for instrumentation constructor */
-	num_birgs = get_irp_n_irgs();
+	num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs();
 	birgs     = alloca(sizeof(birgs[0]) * (num_birgs + 1));
 
 	/* First: initialize all birgs */
-	for(i = 0; i < get_irp_n_irgs(); ++i) {
-		ir_graph *irg = get_irp_irg(i);
-
+	for(i = 0; i < num_birgs; ++i) {
+		ir_graph *irg = backend_irg_list ? backend_irg_list[i] : get_irp_irg(i);
 		initialize_birg(&birgs[i], irg, &env);
 	}
+	DEL_ARR_F(irg_list);
 
 	/*
 		Get the filename for the profiling data.
@@ -486,22 +440,29 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		initialize_birg(&birgs[num_birgs], prof_init_irg, &env);
 		num_birgs++;
 		set_method_img_section(get_irg_entity(prof_init_irg), section_constructors);
-	}
-	else {
+	} else {
 		be_profile_read(prof_filename);
 	}
 
 	/* For all graphs */
 	for (i = 0; i < num_birgs; ++i) {
-		be_irg_t *birg = & birgs[i];
+		be_irg_t *birg = &birgs[i];
 		ir_graph *irg  = birg->irg;
 		optimization_state_t state;
 		const arch_code_generator_if_t *cg_if;
+		char irg_name[128];
 
 		/* set the current graph (this is important for several firm functions) */
 		current_ir_graph = irg;
 
-		be_init_stat_file(be_options.stat_file_name, irg);
+#ifdef FIRM_STATISTICS
+		if(be_stat_ev_is_active()) {
+			ir_snprintf(irg_name, sizeof(irg_name), "%F", irg);
+			be_stat_tags[STAT_TAG_CLS] = "<all>";
+			be_stat_tags[STAT_TAG_IRG] = irg_name;
+			be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
+		}
+#endif
 
 		/* stop and reset timers */
 		BE_TIMER_ONLY(
@@ -517,14 +478,16 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		);
 		BE_TIMER_PUSH(t_other);   /* t_other */
 
-		/**
-		 * Create execution frequencies from profile data or estimate some
-		 */
-		if (be_profile_has_data()) {
-			birg->execfreqs = be_create_execfreqs_from_profile(irg);
-		} else {
-			birg->execfreqs = compute_execfreq(irg, 10);
+		/* Verify the initial graph */
+		BE_TIMER_PUSH(t_verify);
+		if (be_options.vrfy_option == BE_VRFY_WARN) {
+			irg_verify(irg, VRFY_ENFORCE_SSA);
+			be_check_dominance(irg);
+		} else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+			assert(irg_verify(irg, VRFY_ENFORCE_SSA) && "irg verification failed");
+			assert(be_check_dominance(irg) && "Dominance verification failed");
 		}
+		BE_TIMER_POP(t_verify);
 
 		BE_TIMER_ONLY(num_nodes_b = get_num_reachable_nodes(irg));
 
@@ -548,6 +511,14 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph);
 		be_do_stat_nodes(irg, "02 Abi");
 
+		if (be_options.vrfy_option == BE_VRFY_WARN) {
+			be_check_dominance(irg);
+			be_verify_out_edges(irg);
+		} else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+			assert(be_verify_out_edges(irg));
+			assert(be_check_dominance(irg) && "Dominance verification failed");
+		}
+
 		/* generate code */
 		BE_TIMER_PUSH(t_codegen);
 		arch_code_generator_prepare_graph(birg->cg);
@@ -555,20 +526,31 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
 		be_do_stat_nodes(irg, "03 Prepare");
 
-		/*
-			Since the code generator made a lot of new nodes and skipped
-			a lot of old ones, we should do dead node elimination here.
-			Note that this requires disabling the edges here.
-		*/
+		/* Transformation may produce nodes only reachable via out edges, kill them. */
+#if 1
 		edges_deactivate(irg);
-		//dead_node_elimination(irg);
 		edges_activate(irg);
-
-		/* Compute loop nesting information (for weighting copies) */
-		construct_cf_backedges(irg);
+#endif
 		dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 		BE_TIMER_ONLY(num_nodes_r = get_num_reachable_nodes(irg));
 
+		if (be_options.vrfy_option == BE_VRFY_WARN) {
+			be_check_dominance(irg);
+			be_verify_out_edges(irg);
+		} else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+			assert(be_verify_out_edges(irg));
+			assert(be_check_dominance(irg) && "Dominance verification failed");
+		}
+
+		/**
+		 * Create execution frequencies from profile data or estimate some
+		 */
+		if (be_profile_has_data()) {
+			birg->exec_freq = be_create_execfreqs_from_profile(irg);
+		} else {
+			birg->exec_freq = compute_execfreq(irg, 10);
+		}
+
 		/* let backend prepare scheduling */
 		BE_TIMER_PUSH(t_codegen);
 		arch_code_generator_before_sched(birg->cg);
@@ -585,8 +567,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #ifdef WITH_ILP
 			case BE_SCHED_ILP:
 				be_ilp_sched(birg);
-				fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
-				list_sched(birg, &be_options);
+				//fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
+				//list_sched(birg, &be_options);
 				break;
 #endif /* WITH_ILP */
 		};
@@ -636,11 +618,25 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		arch_code_generator_before_ra(birg->cg);
 		BE_TIMER_POP(t_codegen);
 
+#ifdef FIRM_STATISTICS
+		if(be_stat_ev_is_active()) {
+			be_stat_ev_l("costs_before_ra",
+					(long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq));
+		}
+#endif
+
 		/* Do register allocation */
 		BE_TIMER_PUSH(t_regalloc);
-		ra_timer = ra->allocate(birg);
+		be_allocate_registers(birg);
 		BE_TIMER_POP(t_regalloc);
 
+#ifdef FIRM_STATISTICS
+		if(be_stat_ev_is_active()) {
+			be_stat_ev_l("costs_after_ra",
+					(long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq));
+		}
+#endif
+
 		dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
 		be_do_stat_nodes(irg, "06 Register Allocation");
 
@@ -656,6 +652,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		be_abi_fix_stack_bias(birg->abi);
 		BE_TIMER_POP(t_abi);
 
+		dump(DUMP_SCHED, irg, "-fix_stack_after_ra", dump_ir_block_graph_sched);
+
 		BE_TIMER_PUSH(t_finish);
 		arch_code_generator_finish(birg->cg);
 		BE_TIMER_POP(t_finish);
@@ -686,7 +684,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 		arch_code_generator_done(birg->cg);
 		BE_TIMER_POP(t_emit);
 
-		dump(DUMP_FINAL, irg, "-end", dump_ir_extblock_graph_sched);
+		dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
 
 		BE_TIMER_PUSH(t_abi);
 		be_abi_free(birg->abi);
@@ -741,13 +739,17 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #undef LC_EMIT_RA
 #undef LC_EMIT
 
-		free_execfreq(birg->execfreqs);
+		be_free_birg(birg);
 
         /* switched off due to statistics (statistic module needs all irgs) */
+#ifdef FIRM_STATISTICS
 		if (! stat_is_active())
+#endif
 			free_ir_graph(irg);
 
-		be_close_stat_file();
+		if(be_stat_ev_is_active()) {
+			be_stat_ev_pop();
+		}
 	}
 	be_profile_free();
 	be_done_env(&env);
@@ -782,20 +784,33 @@ void be_main(FILE *file_handle, const char *cup_name)
 
 		lc_timer_reset_and_start(t);
 	}
+
+#ifdef FIRM_STATISTICS
+	be_init_stat_file(be_options.stat_file_name, cup_name);
+#endif
 #endif /* WITH_LIBCORE */
 
 	/* never build code for pseudo irgs */
 	set_visit_pseudo_irgs(0);
 
  	be_node_init();
+
 	be_main_loop(file_handle, cup_name);
 
 #ifdef WITH_LIBCORE
 	if (be_options.timing == BE_TIME_ON) {
 		lc_timer_stop(t);
 		lc_timer_leave_high_priority();
-		printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t));
+		if(be_stat_ev_is_active()) {
+			be_stat_ev_l("backend_time", lc_timer_elapsed_msec(t));
+		} else {
+			printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t));
+		}
 	}
+
+#ifdef FIRM_STATISTICS
+	be_close_stat_file();
+#endif
 #endif /* WITH_LIBCORE */
 }