summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: 39afcee)
rawpatchinlineside by side (parent: 39afcee)
| author | Sven Verdoolaege <sven@cerebras.net> | |
| Fri, 30 Jun 2023 13:18:09 +0000 (30 15:18 +0200) | ||
| committer | Sven Verdoolaege <sven@cerebras.net> | |
| Sun, 18 Feb 2024 14:57:45 +0000 (18 15:57 +0100) |
This removes some very minor code duplication.
Also use the extracted function in places where there is currently
no check for a NULL pointer. Even though eliminate_divs_eq and
eliminate_divs_ineq are currently always called with a non-NULL pointer,
there is no need to make this assumption.
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
Also use the extracted function in places where there is currently
no check for a NULL pointer. Even though eliminate_divs_eq and
eliminate_divs_ineq are currently always called with a non-NULL pointer,
there is no need to make this assumption.
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
| isl_map_simplify.c | patchblobblamehistory |
diff --git a/isl_map_simplify.c b/isl_map_simplify.c
--- a/isl_map_simplify.c
+++ b/isl_map_simplify.c
return bmap;
}
+/* Some progress has been made.
+ * Set *progress if "progress" is not NULL.
+ */
+static void mark_progress(int *progress)
+{
+ if (progress)
+ *progress = 1;
+}
+
/* Eliminate the variable at position "pos" from the constraints of "bmap"
* using the equality constraint "eq".
* If "keep_divs" is set, then try and preserve
continue;
if (isl_int_is_zero(bmap->eq[k][1+pos]))
continue;
- if (progress)
- *progress = 1;
+ mark_progress(progress);
isl_seq_elim(bmap->eq[k], eq, 1+pos, 1+total, NULL);
isl_seq_normalize(ctx, bmap->eq[k], 1 + total);
}
for (k = 0; k < bmap->n_ineq; ++k) {
if (isl_int_is_zero(bmap->ineq[k][1+pos]))
continue;
- if (progress)
- *progress = 1;
+ mark_progress(progress);
isl_seq_elim(bmap->ineq[k], eq, 1+pos, 1+total, NULL);
isl_seq_gcd(bmap->ineq[k], 1 + total, &ctx->normalize_gcd);
bmap = scale_down_inequality(bmap, k, ctx->normalize_gcd,
continue;
if (isl_int_is_zero(bmap->div[k][1+1+pos]))
continue;
- if (progress)
- *progress = 1;
+ mark_progress(progress);
/* We need to be careful about circular definitions,
* so for now we just remove the definition of div k
* if the equality contains any divs.
if (!ok)
continue;
modified = 1;
- *progress = 1;
+ mark_progress(progress);
bmap = eliminate_div(bmap, bmap->eq[i], d, 1, 1);
if (isl_basic_map_drop_equality(bmap, i) < 0)
return isl_basic_map_free(bmap);
break;
if (i < bmap->n_ineq)
continue;
- *progress = 1;
+ mark_progress(progress);
bmap = isl_basic_map_eliminate_vars(bmap, (off-1)+d, 1);
if (!bmap || ISL_F_ISSET(bmap, ISL_BASIC_MAP_EMPTY))
break;
@@ -639,8 +645,7 @@ static __isl_give isl_basic_map *set_div_from_eq(__isl_take isl_basic_map *bmap,
isl_seq_neg(bmap->div[div] + 1, bmap->eq[eq], 1 + total);
isl_int_set_si(bmap->div[div][1 + o_div + div], 0);
isl_int_set(bmap->div[div][0], bmap->eq[eq][o_div + div]);
- if (progress)
- *progress = 1;
+ mark_progress(progress);
return bmap;
}
bmap->div[index[h]-1], 2+total))
break;
if (index[h]) {
- *progress = 1;
+ mark_progress(progress);
l = index[h] - 1;
elim_for[l] = k + 1;
}
@@ -1170,8 +1175,7 @@ static __isl_give isl_basic_map *normalize_divs(__isl_take isl_basic_map *bmap,
isl_mat_free(C2);
isl_mat_free(T);
- if (progress)
- *progress = 1;
+ mark_progress(progress);
done:
ISL_F_SET(bmap, ISL_BASIC_MAP_NORMALIZED_DIVS);
bmap = set_div_from_lower_bound(bmap, i, k);
else
bmap = set_div_from_lower_bound(bmap, i, l);
- if (progress)
- *progress = 1;
+ mark_progress(progress);
break;
}
return bmap;
* will no longer be valid.
* Plus, we probably we want to regauss first.
*/
- if (progress)
- *progress = 1;
+ mark_progress(progress);
isl_basic_map_drop_inequality(bmap, l);
isl_basic_map_inequality_to_equality(bmap, k);
} else
duplicate = 0;
bmap = isl_basic_map_remove_duplicate_constraints(bmap,
&duplicate, 0);
- if (progress && duplicate)
- *progress = 1;
+ if (duplicate)
+ mark_progress(progress);
} while (duplicate);
return bmap;
!isl_int_is_negone(bmap->ineq[j][1 + v_div + div]))
continue;
- if (progress)
- *progress = 1;
+ mark_progress(progress);
s = isl_int_sgn(bmap->ineq[j][1 + v_div + div]);
isl_int_set_si(bmap->ineq[j][1 + v_div + div], 0);