X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=783cf075f9d135bbc714ca323cb90e5337782cdf;hb=a53a89cf59283fb4913bb66ba3860a14c9166dc5;hp=b539d859118c9656da121130afe0622fe94f0ed5;hpb=6f068af98daa4725d60e5d23a8f98ec2841cfa44;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index b539d8591..783cf075f 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -50,6 +50,7 @@
 #include "irbitset.h"
 #include "irnode.h"
 #include "ircons.h"
+#include "irtools.h"
 #include "debug.h"
 #include "execfreq.h"
 #include "iredges_t.h"
@@ -105,11 +106,7 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
 	{ NULL, 0 }
 };
 
-static const lc_opt_enum_int_items_t lower_perm_stat_items[] = {
-	{ NULL, 0 }
-};
-
-static const lc_opt_enum_int_items_t dump_items[] = {
+static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "none",       BE_CH_DUMP_NONE       },
 	{ "spill",      BE_CH_DUMP_SPILL      },
 	{ "live",       BE_CH_DUMP_LIVE       },
@@ -136,7 +133,7 @@ static lc_opt_enum_int_var_t lower_perm_var = {
 	&options.lower_perm_opt, lower_perm_items
 };
 
-static lc_opt_enum_int_var_t dump_var = {
+static lc_opt_enum_mask_var_t dump_var = {
 	&options.dump_flags, dump_items
 };
 
@@ -145,9 +142,9 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = {
 };
 
 static const lc_opt_table_entry_t be_chordal_options[] = {
-	LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
+	LC_OPT_ENT_ENUM_INT ("perm",          "perm lowering options", &lower_perm_var),
 	LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
-	LC_OPT_ENT_ENUM_PTR ("verify",        "verify options", &be_ch_vrfy_var),
+	LC_OPT_ENT_ENUM_INT ("verify",        "verify options", &be_ch_vrfy_var),
 	LC_OPT_LAST
 };
 
@@ -183,7 +180,9 @@ static void dump(unsigned mask, ir_graph *irg,
 }
 
 /**
- * Checks for every reload if its user can perform the load on itself.
+ * Post-Walker: Checks for the given reload if has only one user that can perform the
+ * reload as part of its address mode.
+ * Fold the reload into the user it that is possible.
  */
 static void memory_operand_walker(ir_node *irn, void *env)
 {
@@ -214,7 +213,7 @@ static void memory_operand_walker(ir_node *irn, void *env)
 		}
 	}
 
-	/* kill the Reload */
+	/* kill the Reload if it was folded */
 	if (get_irn_n_edges(irn) == 0) {
 		ir_graph *irg = get_irn_irg(irn);
 		ir_mode  *frame_mode = get_irn_mode(get_irn_n(irn, n_be_Reload_frame));
@@ -252,7 +251,9 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
 	be_assure_liveness(irg);
 	be_liveness_assure_chk(be_get_irg_liveness(irg));
 
-	stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq));
+	if (stat_ev_enabled) {
+		pse->pre_spill_cost = be_estimate_irg_costs(irg, exec_freq);
+	}
 
 	/* put all ignore registers into the ignore register set. */
 	be_put_allocatable_regs(irg, pse->cls, chordal_env->allocatable_regs);
@@ -315,7 +316,7 @@ static void post_spill(post_spill_env_t *pse, int iteration)
 		chordal_env->ifg = be_create_ifg(chordal_env);
 		be_timer_pop(T_RA_IFG);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_ifg_stat_t   stat;
 			be_node_stats_t node_stats;
 
@@ -393,7 +394,7 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 	be_timer_pop(T_RA_PROLOG);
 
-	stat_ev_if {
+	if (stat_ev_enabled) {
 		be_collect_node_stats(&last_node_stats, irg);
 	}
 
@@ -410,11 +411,11 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 		stat_ev_ctx_push_str("bechordal_cls", cls->name);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_do_stat_reg_pressure(irg, cls);
 		}
 
-		memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
+		pse.cenv = chordal_env;
 		pse.irg = irg;
 		pre_spill(&pse, cls);
 
@@ -426,7 +427,7 @@ static void be_ra_chordal_main(ir_graph *irg)
 
 		post_spill(&pse, 0);
 
-		stat_ev_if {
+		if (stat_ev_enabled) {
 			be_node_stats_t node_stats;
 
 			be_collect_node_stats(&node_stats, irg);
@@ -448,8 +449,7 @@ static void be_ra_chordal_main(ir_graph *irg)
 	be_timer_pop(T_VERIFY);
 
 	be_timer_push(T_RA_EPILOG);
-	lower_nodes_after_ra(irg,
-	                     options.lower_perm_opt&BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	lower_nodes_after_ra(irg, options.lower_perm_opt == BE_CH_LOWER_PERM_COPY);
 	dump(BE_CH_DUMP_LOWER, irg, NULL, "belower-after-ra");
 
 	obstack_free(&obst, NULL);