fix serious error in isl_mat_parameter_compression

[platform/upstream/isl.git] / isl_mat.c

diff --git a/isl_mat.c b/isl_mat.c
index 10b6544..4663d42 100644 (file)
--- a/isl_mat.c
+++ b/isl_mat.c
@@ -1,3 +1,4 @@
+#include "isl_dim.h"
 #include "isl_seq.h"
 #include "isl_mat.h"
 #include "isl_map_private.h"
@@ -241,7 +242,7 @@ static void exchange(struct isl_ctx *ctx, struct isl_mat *M, struct isl_mat **U,
 static void subtract(struct isl_mat *M, struct isl_mat **U,
        struct isl_mat **Q, unsigned row, unsigned i, unsigned j, isl_int m)
 {
-       int r, c;
+       int r;
        for (r = row; r < M->n_row; ++r)
                isl_int_submul(M->row[r][j], m, M->row[r][i]);
        if (U) {
@@ -357,6 +358,35 @@ error:
        return NULL;
 }
 
+struct isl_mat *isl_mat_right_kernel(struct isl_ctx *ctx, struct isl_mat *mat)
+{
+       int i, rank;
+       struct isl_mat *U = NULL;
+       struct isl_mat *K;
+
+       mat = isl_mat_left_hermite(ctx, mat, 0, &U, NULL);
+       if (!mat || !U)
+               goto error;
+
+       for (i = 0, rank = 0; rank < mat->n_col; ++rank) {
+               while (i < mat->n_row && isl_int_is_zero(mat->row[i][rank]))
+                       ++i;
+               if (i >= mat->n_row)
+                       break;
+       }
+       K = isl_mat_alloc(ctx, U->n_row, U->n_col - rank);
+       if (!K)
+               goto error;
+       isl_mat_sub_copy(ctx, K->row, U->row, U->n_row, 0, rank, U->n_col-rank);
+       isl_mat_free(ctx, mat);
+       isl_mat_free(ctx, U);
+       return K;
+error:
+       isl_mat_free(ctx, mat);
+       isl_mat_free(ctx, U);
+       return NULL;
+}
+
 struct isl_mat *isl_mat_lin_to_aff(struct isl_ctx *ctx, struct isl_mat *mat)
 {
        int i;
@@ -529,7 +559,7 @@ void isl_mat_col_scale(struct isl_mat *mat, unsigned col, isl_int m)
                isl_int_mul(mat->row[i][col], mat->row[i][col], m);
 }
 
-isl_mat_col_combine(struct isl_mat *mat, unsigned dst,
+void isl_mat_col_combine(struct isl_mat *mat, unsigned dst,
        isl_int m1, unsigned src1, isl_int m2, unsigned src2)
 {
        int i;
@@ -623,6 +653,23 @@ error:
        return NULL;
 }
 
+struct isl_mat *isl_mat_transpose(struct isl_ctx *ctx, struct isl_mat *mat)
+{
+       int i, j;
+
+       mat = isl_mat_cow(ctx, mat);
+       if (!mat)
+               return NULL;
+       isl_assert(ctx, mat->n_col == mat->n_row, goto error);
+       for (i = 0; i < mat->n_row; ++i)
+               for (j = i + 1; j < mat->n_col; ++j)
+                       isl_int_swap(mat->row[i][j], mat->row[j][i]);
+       return mat;
+error:
+       isl_mat_free(ctx, mat);
+       return NULL;
+}
+
 struct isl_mat *isl_mat_swap_rows(struct isl_ctx *ctx,
        struct isl_mat *mat, unsigned i, unsigned j)
 {
@@ -674,6 +721,16 @@ error:
        return NULL;
 }
 
+/* Replace the variables x in bset by x' given by x = M x', with
+ * M the matrix mat.
+ *
+ * If there are fewer variables x' then there are x, then we perform
+ * the transformation in place, which that, in principle,
+ * this frees up some extra variables as the number
+ * of columns remains constant, but we would have to extend
+ * the div array too as the number of rows in this array is assumed
+ * to be equal to extra.
+ */
 struct isl_basic_set *isl_basic_set_preimage(struct isl_ctx *ctx,
        struct isl_basic_set *bset, struct isl_mat *mat)
 {
@@ -687,16 +744,18 @@ struct isl_basic_set *isl_basic_set_preimage(struct isl_ctx *ctx,
        if (!bset)
                goto error;
 
-       isl_assert(ctx, bset->nparam == 0, goto error);
+       isl_assert(ctx, bset->dim->nparam == 0, goto error);
        isl_assert(ctx, bset->n_div == 0, goto error);
-       isl_assert(ctx, 1+bset->dim == mat->n_row, goto error);
+       isl_assert(ctx, 1+bset->dim->n_out == mat->n_row, goto error);
 
        if (mat->n_col > mat->n_row)
                bset = isl_basic_set_extend(bset, 0, mat->n_col-1, 0,
                                                0, 0);
-       else {
-               bset->dim -= mat->n_row - mat->n_col;
-               bset->extra += mat->n_row - mat->n_col;
+       else if (mat->n_col < mat->n_row) {
+               bset->dim = isl_dim_cow(bset->dim);
+               if (!bset->dim)
+                       goto error;
+               bset->dim->n_out -= mat->n_row - mat->n_col;
        }
 
        t = isl_mat_sub_alloc(ctx, bset->eq, 0, bset->n_eq, 0, mat->n_row);
@@ -746,8 +805,13 @@ struct isl_set *isl_set_preimage(struct isl_ctx *ctx,
                if (!set->p[i])
                        goto error;
        }
-       set->dim += mat->n_col;
-       set->dim -= mat->n_row;
+       if (mat->n_col != mat->n_row) {
+               set->dim = isl_dim_cow(set->dim);
+               if (!set->dim)
+                       goto error;
+               set->dim->n_out += mat->n_col;
+               set->dim->n_out -= mat->n_row;
+       }
        isl_mat_free(ctx, mat);
        return set;
 error:
@@ -777,7 +841,7 @@ void isl_mat_dump(struct isl_ctx *ctx, struct isl_mat *mat,
                for (j = 0; j < mat->n_col; ++j) {
                        if (j)
                            fprintf(out, ",");
-                       isl_int_print(out, mat->row[i][j]);
+                       isl_int_print(out, mat->row[i][j], 0);
                }
                if (i == mat->n_row-1)
                        fprintf(out, "]]\n");
@@ -791,6 +855,7 @@ struct isl_mat *isl_mat_drop_cols(struct isl_ctx *ctx, struct isl_mat *mat,
 {
        int r;
 
+       mat = isl_mat_cow(ctx, mat);
        if (!mat)
                return NULL;
 
@@ -808,6 +873,7 @@ struct isl_mat *isl_mat_drop_rows(struct isl_ctx *ctx, struct isl_mat *mat,
 {
        int r;
 
+       mat = isl_mat_cow(ctx, mat);
        if (!mat)
                return NULL;
 
@@ -817,3 +883,20 @@ struct isl_mat *isl_mat_drop_rows(struct isl_ctx *ctx, struct isl_mat *mat,
        mat->n_row -= n;
        return mat;
 }
+
+void isl_mat_col_submul(struct isl_mat *mat,
+                       int dst_col, isl_int f, int src_col)
+{
+       int i;
+
+       for (i = 0; i < mat->n_row; ++i)
+               isl_int_submul(mat->row[i][dst_col], f, mat->row[i][src_col]);
+}
+
+void isl_mat_col_mul(struct isl_mat *mat, int dst_col, isl_int f, int src_col)
+{
+       int i;
+
+       for (i = 0; i < mat->n_row; ++i)
+               isl_int_mul(mat->row[i][dst_col], f, mat->row[i][src_col]);
+}