summaryloggraphiclog1graphiclog2commitcommitdifftreerefseditfork
rawpatchinlineside by side (parent: fde79a2)
rawpatchinlineside by side (parent: fde79a2)
| author | Sven Verdoolaege <sven@cerebras.net> | |
| Mon, 25 Jul 2022 09:58:38 +0000 (25 11:58 +0200) | ||
| committer | Sven Verdoolaege <sven@cerebras.net> | |
| Fri, 11 Nov 2022 09:27:41 +0000 (11 10:27 +0100) |
This makes this implementation of the isl_union_*_sub function opt-in
rather than opt-out.
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
rather than opt-out.
Signed-off-by: Sven Verdoolaege <sven@cerebras.net>
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
isl_union_map_lex_templ.c \
isl_union_neg.c \
isl_union_pw_templ.c \
+ isl_union_sub_templ.c \
libisl-gdb.py \
doc/CodingStyle \
doc/SubmittingPatches \
diff --git a/isl_aff.c b/isl_aff.c
--- a/isl_aff.c
+++ b/isl_aff.c
#include <isl_union_single.c>
#include <isl_union_neg.c>
+#include <isl_union_sub_templ.c>
#undef BASE
#define BASE aff
#include <isl_union_multi.c>
#include "isl_union_locals_templ.c"
#include <isl_union_neg.c>
+#include <isl_union_sub_templ.c>
#undef BASE
#define BASE multi_aff
diff --git a/isl_fold.c b/isl_fold.c
--- a/isl_fold.c
+++ b/isl_fold.c
#undef BASE
#define BASE pw_qpolynomial_fold
-#define NO_SUB
-
#include <isl_union_single.c>
#include <isl_union_eval.c>
diff --git a/isl_polynomial.c b/isl_polynomial.c
--- a/isl_polynomial.c
+++ b/isl_polynomial.c
#include <isl_union_single.c>
#include <isl_union_eval.c>
#include <isl_union_neg.c>
+#include <isl_union_sub_templ.c>
int isl_pw_qpolynomial_is_one(__isl_keep isl_pw_qpolynomial *pwqp)
{
diff --git a/isl_union_sub_templ.c b/isl_union_sub_templ.c
--- /dev/null
+++ b/isl_union_sub_templ.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010 INRIA Saclay
+ *
+ * Use of this software is governed by the MIT license
+ *
+ * Written by Sven Verdoolaege,
+ * INRIA Saclay - Ile-de-France, Parc Club Orsay Universite,
+ * ZAC des vignes, 4 rue Jacques Monod, 91893 Orsay, France
+ */
+
+#include "isl_union_macro.h"
+
+/* Subtract "u2" from "u1" and return the result.
+ *
+ * If the base expressions have a default zero value, then
+ * reuse isl_union_*_add to ensure the result
+ * is computed on the union of the domains of "u1" and "u2".
+ * Otherwise, compute the result directly on their shared domain.
+ */
+__isl_give UNION *FN(UNION,sub)(__isl_take UNION *u1, __isl_take UNION *u2)
+{
+#if DEFAULT_IS_ZERO
+ return FN(UNION,add)(u1, FN(UNION,neg)(u2));
+#else
+ return FN(UNION,match_bin_op)(u1, u2, &FN(PART,sub));
+#endif
+}
diff --git a/isl_union_templ.c b/isl_union_templ.c
--- a/isl_union_templ.c
+++ b/isl_union_templ.c
#endif
}
-#ifndef NO_SUB
-/* Subtract "u2" from "u1" and return the result.
- *
- * If the base expressions have a default zero value, then
- * reuse isl_union_*_add to ensure the result
- * is computed on the union of the domains of "u1" and "u2".
- * Otherwise, compute the result directly on their shared domain.
- */
-__isl_give UNION *FN(UNION,sub)(__isl_take UNION *u1, __isl_take UNION *u2)
-{
-#if DEFAULT_IS_ZERO
- return FN(UNION,add)(u1, FN(UNION,neg)(u2));
-#else
- return FN(UNION,match_bin_op)(u1, u2, &FN(PART,sub));
-#endif
-}
-#endif
-
S(UNION,any_set_data) {
isl_set *set;
__isl_give PW *(*fn)(__isl_take PW*, __isl_take isl_set*);