From: Sven Verdoolaege <skimo@kotnet.org>
Date: Wed, 28 Aug 2013 09:23:41 +0000 (+0200)
Subject: isl_schedule.c: extract out edge_multiplicity
X-Git-Tag: isl-0.13~111
X-Git-Url: https://repo.or.cz/w/isl.git/commitdiff_plain/364a95ebe60fb3a14fbb55f8c24df5b4c4da593d

isl_schedule.c: extract out edge_multiplicity

Determining the multiplicity of edges will become more complicated
when we add support for conditional validity constraints.  It is
therefore best to extract this functionality into a separate function.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---

diff --git a/isl_schedule.c b/isl_schedule.c
index f640c355..dab4ebbf 100644
--- a/isl_schedule.c
+++ b/isl_schedule.c
@@ -1339,8 +1339,8 @@ static int node_update_cmap(struct isl_sched_node *node)
 	return 0;
 }
 
-/* Count the number of equality and inequality constraints
- * that will be added for the given map.
+/* How many times should we count the constraints in "edge"?
+ *
  * If carry is set, then we are counting the number of (validity)
  * constraints that will be added in setup_carry_lp and we count
  * each edge exactly once.  Otherwise, we count as follows
@@ -1348,14 +1348,28 @@ static int node_update_cmap(struct isl_sched_node *node)
  * validity+proximity	-> 2 (>= 0 and upper bound)
  * proximity		-> 2 (lower and upper bound)
  */
+static int edge_multiplicity(struct isl_sched_edge *edge, int carry)
+{
+	if (carry && !edge->validity)
+		return 0;
+	if (carry)
+		return 1;
+	if (edge->proximity)
+		return 2;
+	return 1;
+}
+
+/* Count the number of equality and inequality constraints
+ * that will be added for the given map.
+ */
 static int count_map_constraints(struct isl_sched_graph *graph,
 	struct isl_sched_edge *edge, __isl_take isl_map *map,
 	int *n_eq, int *n_ineq, int carry)
 {
 	isl_basic_set *coef;
-	int f = carry ? 1 : edge->proximity ? 2 : 1;
+	int f = edge_multiplicity(edge, carry);
 
-	if (carry && !edge->validity) {
+	if (f == 0) {
 		isl_map_free(map);
 		return 0;
 	}