From: Matthias Braun <matze@braunis.de>
Date: Tue, 18 Sep 2007 15:07:26 +0000 (+0000)
Subject: use register class flags to determine which classes don't need RA
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=94185337243dc73b117e96cf499a1c0f9247a0f5;p=libfirm

use register class flags to determine which classes don't need RA

[r15865]
---

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 237826700..3246d434c 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -992,11 +992,6 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 
 	int colors_n          = arch_register_class_n_regs(cls);
 	ir_graph *irg         = chordal_env->irg;
-	int allocatable_regs  = colors_n - be_put_ignore_regs(birg, cls, NULL);
-
-	/* some special classes contain only ignore regs, no work to be done */
-	if(allocatable_regs == 0)
-		return;
 
 	be_assure_dom_front(birg);
 	lv = be_assure_liveness(birg);
diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 47667e8bb..4f52dc045 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -391,15 +391,16 @@ static void be_init_timer(be_options_t *main_opts)
 /**
  * Perform things which need to be done per register class before spilling.
  */
-static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse) {
+static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
+{
 	be_chordal_env_t    *chordal_env = &pse->cenv;
 	be_irg_t            *birg        = pse->birg;
 	ir_graph            *irg         = be_get_birg_irg(birg);
 	const be_main_env_t *main_env    = birg->main_env;
 	node_stat_t          node_stat;
 
-	pse->cls                   = arch_isa_get_reg_class(isa, cls_idx);
-	chordal_env->cls           = pse->cls;
+	pse->cls                   = cls;
+	chordal_env->cls           = cls;
 	chordal_env->border_heads  = pmap_create();
 	chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs);
 
@@ -575,21 +576,30 @@ static void be_ra_chordal_main(be_irg_t *birg)
 		/* Perform the following for each register class. */
 		for (j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
 			post_spill_env_t pse;
+			const arch_register_class_t *cls
+				= arch_isa_get_reg_class(isa, j);
+
+			if(arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
+				continue;
+
 
 			memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
 			pse.birg = birg;
-			pre_spill(isa, j, &pse);
+			pre_spill(&pse, cls);
 
+#if 0
 			/* this is a hack, TODO remove me later */
 			if(j == 2) {
 				be_do_stat_reg_pressure(birg);
 			}
+#endif
 
 			BE_TIMER_PUSH(ra_timer.t_spill);
-			be_do_spill(birg, pse.cls);
+			be_do_spill(birg, cls);
 			BE_TIMER_POP(ra_timer.t_spill);
 
-			dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", dump_ir_block_graph_sched);
+			dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill",
+			     dump_ir_block_graph_sched);
 
 			post_spill(&pse, 0);
 		}
@@ -604,7 +614,7 @@ static void be_ra_chordal_main(be_irg_t *birg)
 		for (j = 0; j < m; ++j) {
 			memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env));
 			pse[j].birg = birg;
-			pre_spill(isa, j, &pse[j]);
+			pre_spill(&pse[j], pse[j].cls);
 		}
 
 		BE_TIMER_PUSH(ra_timer.t_spill);
diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 763b1b387..db7f4a8ec 100644
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -708,11 +708,7 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls,
 	ir_graph *irg = be_get_birg_irg(birg);
 	int n_regs;
 
-	/* some special classes contain only ignore regs, nothing to do then */
 	n_regs = cls->n_regs - be_put_ignore_regs(birg, cls, NULL);
-	if(n_regs == 0)
-		return;
-
 	be_liveness_assure_sets(be_assure_liveness(birg));
 
 	/* construct control flow loop tree */