X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=30a0cc4a81d134feccb8c9ffb976f10f7826b64f;hb=11ec7d301df76c9df0344e3b1b8dcaf724f6a1f0;hp=a07a214b3b530a7716b0e9cc2d6d748a99e14ee0;hpb=3b62c5e12dc947bb54c219127605eede3247c6df;p=libfirm

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index a07a214b3..30a0cc4a8 100644
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -55,6 +55,8 @@
 #include "bessadestr.h"
 #include "beabi.h"
 #include "belower.h"
+#include "beschedmris.h"
+#include "bestat.h"
 
 #define DUMP_INITIAL    (1 << 0)
 #define DUMP_ABI        (1 << 1)
@@ -84,6 +86,8 @@ static const arch_isa_if_t *isa_if = &ia32_isa_if;
 
 static lc_opt_entry_t *be_grp_root = NULL;
 
+static int be_disable_mris = 0;
+
 /* possible dumping options */
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "none",       0 },
@@ -127,10 +131,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)),
@@ -173,12 +178,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();
 
@@ -188,6 +205,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)
@@ -275,6 +296,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);
@@ -315,7 +339,7 @@ static void be_main_loop(FILE *file_handle)
 		 * 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) */
@@ -323,20 +347,25 @@ 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);
+
+		/* add Keeps for should_be_different constrained nodes  */
+		/* beware: needs schedule due to usage of be_ssa_constr */
+		assure_constraints(&birg);
+		dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph_sched);
 
 		/* 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);
 
 		/* Do register allocation */
 		arch_code_generator_before_ra(birg.cg);
@@ -347,12 +376,11 @@ static void be_main_loop(FILE *file_handle)
 		be_abi_fix_stack_bias(birg.abi);
 
 		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);
 
 //		free_ir_graph(irg);
 	}
-
 	be_done_env(&env);
 }