X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=ir%2Fbe%2Fbepbqpcoloring.c;h=5a6a637d905222917921640fcf033c96abe76f0a;hb=7ad86c1baab2fdceae2aa610bb584b30538cc5c6;hp=114a6d5fe2d91b68bddfc637f1ed3b813d881cbc;hpb=9486037955a5bb2221dfd2bd6cc0b120ee68cf2c;p=libfirm

diff --git a/ir/be/bepbqpcoloring.c b/ir/be/bepbqpcoloring.c
index 114a6d5fe..5a6a637d9 100644
--- a/ir/be/bepbqpcoloring.c
+++ b/ir/be/bepbqpcoloring.c
@@ -101,11 +101,6 @@ typedef struct be_pbqp_alloc_env_t {
 #define insert_edge(pbqp, src_node, trg_node, template_matrix) (add_edge_costs(pbqp, get_irn_idx(src_node), get_irn_idx(trg_node), pbqp_matrix_copy(pbqp, template_matrix)))
 #define get_free_regs(restr_nodes, cls, irn)                   (arch_register_class_n_regs(cls) - restr_nodes[get_irn_idx(irn)])
 
-static inline int is_2addr_code(const arch_register_req_t *req)
-{
-	return (req->type & arch_register_req_type_should_be_same) != 0;
-}
-
 static const lc_opt_table_entry_t options[] = {
 	LC_OPT_ENT_BOOL("exec_freq", "use exec_freq",  &use_exec_freq),
 	LC_OPT_ENT_BOOL("late_decision", "use late decision for register allocation",  &use_late_decision),
@@ -286,25 +281,22 @@ static void create_affinity_edges(ir_node *irn, void *env)
 			return;
 
 		insert_afe_edge(pbqp_alloc_env, irn, arg, -1);
-	}
-	else { /* 2-address code */
-		if (is_2addr_code(req)) {
-			const unsigned other = req->other_same;
-			int            i;
-
-			for (i = 0; 1U << i <= other; ++i) {
-				if (other & (1U << i)) {
-					ir_node *other = get_irn_n(skip_Proj(irn), i);
-					if (!arch_irn_consider_in_reg_alloc(cls, other))
-						continue;
-
-					/* no edges to itself */
-					if (irn == other) {
-						continue;
-					}
+	} else if (arch_register_req_is(req, should_be_same)) {
+		const unsigned other = req->other_same;
+		int            i;
+
+		for (i = 0; 1U << i <= other; ++i) {
+			if (other & (1U << i)) {
+				ir_node *other = get_irn_n(skip_Proj(irn), i);
+				if (!arch_irn_consider_in_reg_alloc(cls, other))
+					continue;
 
-					insert_afe_edge(pbqp_alloc_env, irn, other, i);
+				/* no edges to itself */
+				if (irn == other) {
+					continue;
 				}
+
+				insert_afe_edge(pbqp_alloc_env, irn, other, i);
 			}
 		}
 	}
@@ -340,57 +332,27 @@ static void create_pbqp_coloring_instance(ir_node *block, void *data)
 
 	/* create pbqp nodes, interference edges and reverse perfect elimination order */
 	sched_foreach_reverse(block, irn) {
-		if (get_irn_mode(irn) == mode_T) {
-			foreach_out_edge(irn, edge) {
-				ir_node *proj = get_edge_src_irn(edge);
-				if (!arch_irn_consider_in_reg_alloc(cls, proj))
-					continue;
-
-				/* create pbqp source node if it dosn't exist */
-				if (get_node(pbqp_inst, get_irn_idx(proj)) == NULL) {
-					create_pbqp_node(pbqp_alloc_env, proj);
-				}
-
-				/* create nodes and interference edges */
-				foreach_ir_nodeset(&live_nodes, live, iter) {
-					/* create pbqp source node if it dosn't exist */
-					if (get_node(pbqp_inst, get_irn_idx(live)) == NULL) {
-						create_pbqp_node(pbqp_alloc_env, live);
-					}
+		be_foreach_value(irn, value,
+			if (!arch_irn_consider_in_reg_alloc(cls, value))
+				continue;
 
-					/* no edges to itself */
-					if (proj == live) {
-						continue;
-					}
+			/* create pbqp source node if it dosn't exist */
+			if (!get_node(pbqp_inst, get_irn_idx(value)))
+				create_pbqp_node(pbqp_alloc_env, value);
 
-					insert_ife_edge(pbqp_alloc_env, proj, live);
-				}
-			}
-		}
-		else {
-			if (arch_irn_consider_in_reg_alloc(cls, irn)) {
+			/* create nodes and interference edges */
+			foreach_ir_nodeset(&live_nodes, live, iter) {
 				/* create pbqp source node if it dosn't exist */
-				if (get_node(pbqp_inst, get_irn_idx(irn)) == NULL) {
-					create_pbqp_node(pbqp_alloc_env, irn);
-				}
-
-				/* create nodes and interference edges */
-				foreach_ir_nodeset(&live_nodes, live, iter) {
-					/* create pbqp source node if it dosn't exist */
-					if (get_node(pbqp_inst, get_irn_idx(live)) == NULL) {
-						create_pbqp_node(pbqp_alloc_env, live);
-					}
+				if (!get_node(pbqp_inst, get_irn_idx(live)))
+					create_pbqp_node(pbqp_alloc_env, live);
 
-					/* no edges to itself */
-					if (irn == live) {
-						continue;
-					}
+				/* no edges to itself */
+				if (value == live)
+					continue;
 
-					/* insert interference edge */
-					insert_ife_edge(pbqp_alloc_env, irn, live);
-				}
+				insert_ife_edge(pbqp_alloc_env, value, live);
 			}
-		}
+		);
 
 		/* get living nodes for next step */
 		if (!is_Phi(irn)) {
@@ -636,7 +598,7 @@ static void be_pbqp_coloring(be_chordal_env_t *env)
 	/* dump graph after inserting perms */
 	if (env->opts->dump_flags & BE_CH_DUMP_CONSTR) {
 		char buf[256];
-		snprintf(buf, sizeof(buf), "-%s-constr", cls->name);
+		snprintf(buf, sizeof(buf), "%s-constr", cls->name);
 		dump_ir_graph(irg, buf);
 	}