isl_ast_expr_mod: perform missing multiplication

The function was documented as multiplying the constructed modulo expression
by the first argument, but failed to do so.
The problem went unnoticed because the first argument is usually equal to 1.

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

diff --git a/isl_ast_build_expr.c b/isl_ast_build_expr.c
index adab2a2..4f945f8 100644 (file)
--- a/isl_ast_build_expr.c
+++ b/isl_ast_build_expr.c
@@ -204,7 +204,14 @@ static __isl_give isl_ast_expr *isl_ast_expr_mod(isl_int v,
        expr = isl_ast_expr_from_aff(isl_aff_copy(aff), build);
 
        c = isl_ast_expr_alloc_int(ctx, d);
-       return isl_ast_expr_alloc_binary(isl_ast_op_pdiv_r, expr, c);
+       expr = isl_ast_expr_alloc_binary(isl_ast_op_pdiv_r, expr, c);
+
+       if (!isl_int_is_one(v)) {
+               c = isl_ast_expr_alloc_int(ctx, v);
+               expr = isl_ast_expr_mul(c, expr);
+       }
+
+       return expr;
 }
 
 /* Create an isl_ast_expr evaluating "v" times the specified dimension of "ls".

diff --git a/test_inputs/codegen/mod.c b/test_inputs/codegen/mod.c
new file mode 100644 (file)
index 0000000..dcd8319
--- /dev/null
+++ b/test_inputs/codegen/mod.c
@@ -0,0 +1,2 @@
+if (2 * (n % 100) == 3 * (m % 200))
+  A();

diff --git a/test_inputs/codegen/mod.in b/test_inputs/codegen/mod.in
new file mode 100644 (file)
index 0000000..7a04c5a
--- /dev/null
+++ b/test_inputs/codegen/mod.in
@@ -0,0 +1,4 @@
+# check that modulo constraint is generated correctly
+[n, m] -> { A[] -> [] : 2 * (n % 100) = 3 * (m % 200) }
+[n, m] -> { : m, n >= 0 }
+{}