X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=b783ac139932c2633ade6f17ba7f20d24a996920;hb=f436f72951577e35b60e0ea1f2e6a536e4f479bb;hp=5c6ffe1916a0eca3b44f46257d7d961e7e032a2f;hpb=fc2d3435186c4624d0afe61bebf51b9af2c1573d;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 5c6ffe191..b783ac139 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -55,7 +55,9 @@
 #include "bessadestr.h"
 #include "beabi.h"
 #include "belower.h"
+#include "beschedmris.h"
 #include "bestat.h"
+#include "beverify.h"
 
 #define DUMP_INITIAL    (1 << 0)
 #define DUMP_ABI        (1 << 1)
@@ -74,13 +76,16 @@ static be_options_t be_options = {
 };
 
 /* dump flags */
-static unsigned dump_flags = 2 * DUMP_FINAL - 1;
+static unsigned dump_flags = 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 int be_disable_mris = 0;
+
 #ifdef WITH_LIBCORE
 
 static lc_opt_entry_t *be_grp_root = NULL;
@@ -107,11 +112,12 @@ static const lc_opt_enum_const_ptr_items_t ra_items[] = {
 
 /* instruction set architectures. */
 static const lc_opt_enum_const_ptr_items_t isa_items[] = {
-	{ "firm",    &firm_isa },
 	{ "ia32",    &ia32_isa_if },
+#if 0
 	{ "arm",     &arm_isa_if },
 	{ "ppc32",   &ppc32_isa_if },
 	{ "mips",    &mips_isa_if },
+#endif
 	{ NULL,      NULL }
 };
 
@@ -128,10 +134,11 @@ static lc_opt_enum_const_ptr_var_t isa_var = {
 };
 
 static const lc_opt_table_entry_t be_main_options[] = {
-	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_omit_fp),
+	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_omit_fp),
+	LC_OPT_ENT_NEGBOOL  ("nomris",   "disable mris schedule preparation", &be_disable_mris),
 
 #ifdef WITH_ILP
 	LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
@@ -174,12 +181,24 @@ void be_opt_register(void)
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
 #ifdef WITH_LIBCORE
+	if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
+		lc_opt_print_help(be_grp_root, stdout);
+		return -1;
+	}
 	return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL);
 #endif /* WITH_LIBCORE */
 }
 
+/** The be parameters returned by default, all off. */
+const static backend_params be_params = {
+	NULL,
+	NULL,
+	0,
+	NULL,
+};
 
-void be_init(void)
+/* Initialize the Firm backend. Must be run BEFORE init_firm()! */
+const backend_params *be_init(void)
 {
 	be_opt_register();
 
@@ -189,6 +208,10 @@ void be_init(void)
 	be_copy_opt_init();
 	copystat_init();
 	phi_class_init();
+
+	if (isa_if->get_params)
+		return isa_if->get_params();
+	return &be_params;
 }
 
 static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
@@ -276,6 +299,9 @@ static void be_main_loop(FILE *file_handle)
 
 	isa = arch_env_get_isa(env.arch_env);
 
+	// /* for debugging, anchors helps */
+	// dump_all_anchors(1);
+
 	/* For all graphs */
 	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		ir_graph *irg = get_irp_irg(i);
@@ -288,6 +314,9 @@ static void be_main_loop(FILE *file_handle)
 		DBG((env.dbg, LEVEL_2, "====> IRG: %F\n", irg));
 		dump(DUMP_INITIAL, irg, "-begin", dump_ir_block_graph);
 
+		be_stat_init_irg(env.arch_env, irg);
+		be_do_stat_nodes(irg, "01 Begin");
+
 		/* set the current graph (this is important for several firm functions) */
 		current_ir_graph = birg.irg;
 
@@ -307,16 +336,20 @@ static void be_main_loop(FILE *file_handle)
 		birg.abi = be_abi_introduce(&birg);
 		dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph);
 
+		be_do_stat_nodes(irg, "02 Abi");
+
 		/* generate code */
 		arch_code_generator_prepare_graph(birg.cg);
 
+		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.
 		 */
 		edges_deactivate(irg);
-		dead_node_elimination(irg);
+		//dead_node_elimination(irg);
 		edges_activate(irg);
 
 		/* Compute loop nesting information (for weighting copies) */
@@ -324,20 +357,28 @@ static void be_main_loop(FILE *file_handle)
 
 		dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
-		/* add Keeps for should_be_different constrained nodes */
-		assure_constraints(&birg);
-		dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph);
-
 		/* Schedule the graphs. */
 		arch_code_generator_before_sched(birg.cg);
-		list_sched(env.arch_env, irg);
+		list_sched(&birg, be_disable_mris);
+		dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
+
+		DEBUG_ONLY(be_verify_schedule(birg.irg);)
+
+		be_do_stat_nodes(irg, "04 Schedule");
+
+		/* add Keeps for should_be_different constrained nodes  */
+		/* beware: needs schedule due to usage of be_ssa_constr */
+		assure_constraints(&birg);
+		dump(DUMP_SCHED, irg, "-assured", dump_ir_block_graph_sched);
+
+		be_do_stat_nodes(irg, "05 Constraints");
 
 		/* connect all stack modifying nodes together (see beabi.c) */
 		be_abi_fix_stack_nodes(birg.abi);
-		dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
+		dump(DUMP_SCHED, irg, "-fix_stack", dump_ir_block_graph_sched);
 
 		/* Verify the schedule */
-		sched_verify_irg(irg);
+		assert(sched_verify_irg(irg));
 
 		/* do some statistics */
 		be_do_stat_reg_pressure(&birg);
@@ -347,16 +388,21 @@ static void be_main_loop(FILE *file_handle)
 		ra->allocate(&birg);
 		dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
 
+		be_do_stat_nodes(irg, "06 Register Allocation");
+
 		arch_code_generator_after_ra(birg.cg);
 		be_abi_fix_stack_bias(birg.abi);
 
+		DEBUG_ONLY(be_verify_schedule(birg.irg);)
+
 		arch_code_generator_done(birg.cg);
-		dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
+		dump(DUMP_FINAL, irg, "-end", dump_ir_extblock_graph_sched);
 		be_abi_free(birg.abi);
 
+		be_do_stat_nodes(irg, "07 Final");
+
 //		free_ir_graph(irg);
 	}
-
 	be_done_env(&env);
 }