Make print_scop output the scoplib format.

[pf3gnuchains/gcc-fork.git] / gcc / graphite-ppl.c

diff --git a/gcc/graphite-ppl.c b/gcc/graphite-ppl.c
index 38faebd..fce69f7 100644 (file)
--- a/gcc/graphite-ppl.c
+++ b/gcc/graphite-ppl.c
@@ -591,11 +591,15 @@ void
 ppl_print_powerset_matrix (FILE *file,
                           ppl_Pointset_Powerset_C_Polyhedron_t ps)
 {
 ppl_print_powerset_matrix (FILE *file,
                           ppl_Pointset_Powerset_C_Polyhedron_t ps)
 {

+  size_t nb_disjuncts;

   ppl_Pointset_Powerset_C_Polyhedron_iterator_t it, end;
 
   ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&it);
   ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&end);
 
   ppl_Pointset_Powerset_C_Polyhedron_iterator_t it, end;
 
   ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&it);
   ppl_new_Pointset_Powerset_C_Polyhedron_iterator (&end);
 

+  ppl_Pointset_Powerset_C_Polyhedron_size (ps, &nb_disjuncts);
+  fprintf (file, "%d\n", (int) nb_disjuncts);
+

   for (ppl_Pointset_Powerset_C_Polyhedron_iterator_begin (ps, it),
        ppl_Pointset_Powerset_C_Polyhedron_iterator_end (ps, end);
        !ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test (it, end);
   for (ppl_Pointset_Powerset_C_Polyhedron_iterator_begin (ps, it),
        ppl_Pointset_Powerset_C_Polyhedron_iterator_end (ps, end);
        !ppl_Pointset_Powerset_C_Polyhedron_iterator_equal_test (it, end);


@@ -673,18 +677,18 @@ ppl_max_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t ps,
    polyhedron POL.  */
 
 void
    polyhedron POL.  */
 
 void

-ppl_min_for_le_polyhedron (ppl_Polyhedron_t pol,
-                          ppl_Linear_Expression_t le, Value res)
+ppl_min_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t ps,
+                        ppl_Linear_Expression_t le, Value res)

 {
   ppl_Coefficient_t num, denom;
   Value dv, nv;
 {
   ppl_Coefficient_t num, denom;
   Value dv, nv;

-  int maximum, err;
+  int minimum, err;

 
   value_init (nv);
   value_init (dv);
   ppl_new_Coefficient (&num);
   ppl_new_Coefficient (&denom);
 
   value_init (nv);
   value_init (dv);
   ppl_new_Coefficient (&num);
   ppl_new_Coefficient (&denom);

-  err = ppl_Polyhedron_minimize (pol, le, num, denom, &maximum);
+  err = ppl_Pointset_Powerset_C_Polyhedron_minimize (ps, le, num, denom, &minimum);

 
   if (err > 0)
     {
 
   if (err > 0)
     {


@@ -701,7 +705,7 @@ ppl_min_for_le_polyhedron (ppl_Polyhedron_t pol,
 }
 
 /* Builds a constraint in dimension DIM relating dimensions POS1 to
 }
 
 /* Builds a constraint in dimension DIM relating dimensions POS1 to

-   POS2 as "POS1 - POS2 CSTR_TYPE C" */
+   POS2 as "POS1 - POS2 + C CSTR_TYPE 0" */

 
 ppl_Constraint_t
 ppl_build_relation (int dim, int pos1, int pos2, int c,
 
 ppl_Constraint_t
 ppl_build_relation (int dim, int pos1, int pos2, int c,