Hello community,
here is the log from the commit of package cloog for openSUSE:Factory
checked in at Fri Jul 31 19:00:43 CEST 2009.
--------
--- cloog/cloog.changes 2009-04-18 14:35:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/cloog/cloog.changes 2009-07-31 13:15:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 31 11:29:55 CEST 2009 - rguenther@suse.de
+
+- Update to cloog-with-ppl version 0.15.4.
+ * Fixes build of current gcc trunk.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cloog-ppl-0.15.3.tar.bz2
New:
----
cloog-ppl-0.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloog.spec ++++++
--- /var/tmp/diff_new_pack.sRRdFG/_old 2009-07-31 18:54:10.000000000 +0200
+++ /var/tmp/diff_new_pack.sRRdFG/_new 2009-07-31 18:54:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cloog (Version 0.15.3+ppl)
+# spec file for package cloog (Version 0.15.4+ppl)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,13 +18,13 @@
Name: cloog
-Version: 0.15.3+ppl
+Version: 0.15.4+ppl
Release: 1
Summary: The Chunky Loop Generator
Group: Development/Languages/C and C++
License: GPL v2 or later
Url: http://www.cloog.org/
-Source: cloog-ppl-0.15.3.tar.bz2
+Source: cloog-ppl-0.15.4.tar.bz2
BuildRequires: ppl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -56,7 +56,7 @@
%prep
-%setup -q -n cloog-ppl
+%setup -q -n cloog-ppl-0.15.4
%build
%configure --with-ppl
++++++ cloog-ppl-0.15.3.tar.bz2 -> cloog-ppl-0.15.4.tar.bz2 ++++++
++++ 14893 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/configure.in new/cloog-ppl-0.15.4/configure.in
--- old/cloog-ppl/configure.in 2009-04-09 10:19:59.000000000 +0200
+++ new/cloog-ppl-0.15.4/configure.in 2009-07-06 17:08:42.000000000 +0200
@@ -324,6 +324,7 @@
fi
if test "x$with_ppl" != "xyes" ; then
+ ppl_prefix=$with_ppl
AC_MSG_RESULT(installed in $ppl_prefix)
CPPFLAGS="-I$ppl_prefix/include $CPPFLAGS"
LDFLAGS="-L$ppl_prefix/lib $LDFLAGS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/include/cloog/clast.h new/cloog-ppl-0.15.4/include/cloog/clast.h
--- old/cloog-ppl/include/cloog/clast.h 2008-06-10 18:27:10.000000000 +0200
+++ new/cloog-ppl-0.15.4/include/cloog/clast.h 2009-06-09 19:22:11.000000000 +0200
@@ -5,8 +5,10 @@
{
#endif
+enum clast_expr_type { expr_term, expr_bin, expr_red };
+
struct clast_expr {
- enum { expr_term, expr_bin, expr_red } type;
+ enum clast_expr_type type;
};
struct clast_term {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/include/cloog/cloog-config.h.in new/cloog-ppl-0.15.4/include/cloog/cloog-config.h.in
--- old/cloog-ppl/include/cloog/cloog-config.h.in 2009-04-03 09:52:23.000000000 +0200
+++ new/cloog-ppl-0.15.4/include/cloog/cloog-config.h.in 2009-06-09 19:22:39.000000000 +0200
@@ -3,7 +3,7 @@
/* Use the PPL backend */
#undef CLOOG_PPL_BACKEND
-/* whether we have sys/resource.h */
+/* presence of sys/resource.h */
#undef HAS_SYS_RESOURCE_H
/* Define to 1 if you have the header file. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/include/cloog/domain.h new/cloog-ppl-0.15.4/include/cloog/domain.h
--- old/cloog-ppl/include/cloog/domain.h 2009-02-10 17:36:55.000000000 +0100
+++ new/cloog-ppl-0.15.4/include/cloog/domain.h 2009-06-09 19:22:39.000000000 +0200
@@ -133,6 +133,7 @@
void cloog_domain_scalar(CloogDomain *, int, Value *) ;
CloogDomain * cloog_domain_cut_first(CloogDomain *) ;
CloogDomain * cloog_domain_erase_dimension(CloogDomain *, int) ;
+CloogDomain * cloog_domain_scatter(CloogDomain *, CloogDomain *);
#if defined(__cplusplus)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/include/cloog/ppl_backend.h new/cloog-ppl-0.15.4/include/cloog/ppl_backend.h
--- old/cloog-ppl/include/cloog/ppl_backend.h 2009-02-10 17:36:55.000000000 +0100
+++ new/cloog-ppl-0.15.4/include/cloog/ppl_backend.h 2009-06-09 19:22:39.000000000 +0200
@@ -170,7 +170,7 @@
free (vector);
}
- typedef struct polyhedron
+ typedef struct polyhedron_s
{
unsigned Dimension;
unsigned NbConstraints;
@@ -187,10 +187,10 @@
return p->NbConstraints;
}
- typedef struct polyhedra_union
+ typedef struct polyhedra_union_s
{
polyhedron _polyhedron;
- struct polyhedra_union *_next;
+ struct polyhedra_union_s *_next;
} *polyhedra_union;
extern polyhedra_union cloog_new_upol (polyhedron);
@@ -234,7 +234,7 @@
typedef struct cloogdomain
{
- struct polyhedra_union *_union;
+ struct polyhedra_union_s *_union;
int _references;
} CloogDomain;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/source/loop.c new/cloog-ppl-0.15.4/source/loop.c
--- old/cloog-ppl/source/loop.c 2008-12-04 09:12:41.000000000 +0100
+++ new/cloog-ppl-0.15.4/source/loop.c 2009-06-09 19:22:39.000000000 +0200
@@ -1657,45 +1657,14 @@
return(simplified) ;
}
-
/**
* cloog_loop_scatter function:
* This function add the scattering (scheduling) informations in a loop.
- * - November 4th 2001: first version.
*/
void cloog_loop_scatter(CloogLoop * loop, CloogDomain * scatt)
-{ int scatt_dim ;
- CloogDomain * domain, * ext, * newdom, * newpart, * temp ;
-
- domain = cloog_loop_domain (loop) ;
- newdom = NULL ;
- scatt_dim = cloog_domain_dim(scatt) - cloog_domain_dim(domain) ;
-
- /* For each polyhedron of domain (it can be an union of polyhedra). */
- while (domain != NULL)
- { /* Extend the domain by adding the scattering dimensions as the new
- * first domain dimensions.
- */
- ext = cloog_domain_extend(domain,scatt_dim,cloog_domain_dim(domain)) ;
- /* Then add the scattering constraints. */
- newpart = cloog_domain_addconstraints(scatt,ext) ;
- cloog_domain_free(ext) ;
-
- if (newdom != NULL)
- { temp = newdom ;
- newdom = cloog_domain_union(newdom,newpart) ;
- cloog_domain_free(temp) ;
- cloog_domain_free(newpart) ;
- }
- else
- newdom = newpart ;
-
- /* We don't want to free the rest of the list. */
- temp = domain ;
- domain = cloog_domain_cut_first(temp) ;
- cloog_domain_free(temp) ;
- }
-
- cloog_loop_set_domain (loop, newdom);
+{
+ CloogDomain *scattered_domain;
+ scattered_domain = cloog_domain_scatter(cloog_loop_domain (loop), scatt);
+ cloog_loop_set_domain (loop, scattered_domain);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/source/polylib/domain.c new/cloog-ppl-0.15.4/source/polylib/domain.c
--- old/cloog-ppl/source/polylib/domain.c 2008-06-10 19:11:10.000000000 +0200
+++ new/cloog-ppl-0.15.4/source/polylib/domain.c 2009-06-09 19:22:39.000000000 +0200
@@ -1808,3 +1808,43 @@
polyhedron = polyhedron->next ;
}
}
+
+/**
+ * cloog_domain_scatter function:
+ * This function add the scattering (scheduling) informations in a domain.
+ */
+CloogDomain *cloog_domain_scatter(CloogDomain *domain, CloogScattering *scatt)
+{ int scatt_dim ;
+ CloogDomain *ext, *newdom, *newpart, *temp;
+
+ newdom = NULL ;
+ scatt_dim = cloog_domain_dim(scatt) - cloog_domain_dim(domain) ;
+
+ /* For each polyhedron of domain (it can be an union of polyhedra). */
+ while (domain != NULL)
+ { /* Extend the domain by adding the scattering dimensions as the new
+ * first domain dimensions.
+ */
+ ext = cloog_domain_extend(domain,scatt_dim,cloog_domain_dim(domain)) ;
+ /* Then add the scattering constraints. */
+ newpart = cloog_domain_addconstraints(scatt,ext) ;
+ cloog_domain_free(ext) ;
+
+ if (newdom != NULL)
+ { temp = newdom ;
+ newdom = cloog_domain_union(newdom,newpart) ;
+ cloog_domain_free(temp) ;
+ cloog_domain_free(newpart) ;
+ }
+ else
+ newdom = newpart ;
+
+ /* We don't want to free the rest of the list. */
+ temp = domain ;
+ domain = cloog_domain_cut_first(temp) ;
+ cloog_domain_free(temp) ;
+ }
+
+ return newdom;
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/cloog-ppl/source/ppl/domain.c new/cloog-ppl-0.15.4/source/ppl/domain.c
--- old/cloog-ppl/source/ppl/domain.c 2009-02-10 17:36:55.000000000 +0100
+++ new/cloog-ppl-0.15.4/source/ppl/domain.c 2009-06-09 19:22:39.000000000 +0200
@@ -420,6 +420,8 @@
ppl_assign_Coefficient_from_mpz_t (coef, val);
ppl_Linear_Expression_add_to_inhomogeneous (expr, coef);
ppl_delete_Coefficient (coef);
+ value_clear (val);
+ value_clear (val1);
if (ineq != 0 && ineq != 1)
ineq = !cloog_matrix_row_is_eq_p (matrix, i);
@@ -1233,74 +1235,6 @@
return res;
}
-
-/**
- * cloog_domain_addconstraints function :
- * This function adds source's polyhedron constraints to target polyhedron: for
- * each element of the polyhedron inside 'target' (i.e. element of the union
- * of polyhedra) it adds the constraints of the corresponding element in
- * 'source'.
- * - August 10th 2002: first version.
- * Nota bene for future : it is possible that source and target don't have the
- * same number of elements (try iftest2 without non-shared constraint
- * elimination in cloog_loop_separate !). This function is yet another part
- * of the DomainSimplify patching problem...
- */
-CloogDomain *
-cloog_domain_addconstraints (CloogDomain *domain_source, CloogDomain *domain_target)
-{
- CloogDomain *res;
- ppl_Polyhedron_t ppl;
- polyhedra_union source, target, last;
- int dim = cloog_domain_dim (domain_target);
- CloogMatrix *m1, *m2;
-
- source = cloog_domain_upol (domain_source);
- target = cloog_domain_upol (domain_target);
-
- ppl_new_C_Polyhedron_from_space_dimension (&ppl, dim, 0);
-
- m1 = cloog_upol_domain2matrix (target);
- m2 = cloog_upol_domain2matrix (source);
- cloog_translate_constraint_matrix_1 (ppl, m1);
- cloog_translate_constraint_matrix_1 (ppl, m2);
- cloog_matrix_free (m1);
- cloog_matrix_free (m2);
-
- res = cloog_translate_ppl_polyhedron (ppl);
- ppl_delete_Polyhedron (ppl);
- last = cloog_domain_upol (res);
-
- source = cloog_upol_next (source);
- target = cloog_upol_next (target);
-
- while (target)
- {
- ppl_new_C_Polyhedron_from_space_dimension (&ppl, dim, 0);
-
- m1 = cloog_upol_domain2matrix (target);
- cloog_translate_constraint_matrix_1 (ppl, m1);
- cloog_matrix_free (m1);
-
- if (source)
- {
- m2 = cloog_upol_domain2matrix (source);
- cloog_translate_constraint_matrix_1 (ppl, m2);
- cloog_matrix_free (m2);
- source = cloog_upol_next (source);
- }
-
- cloog_upol_set_next
- (last, cloog_domain_upol (cloog_translate_ppl_polyhedron (ppl)));
- ppl_delete_Polyhedron (ppl);
-
- last = cloog_upol_next (last);
- target = cloog_upol_next (target);
- }
-
- return res;
-}
-
/* Compares P1 to P2: returns 0 when the polyhedra don't overlap,
returns 1 when p1 >= p2, and returns -1 when p1 < p2. The ">"
relation is the "contains" relation. */
@@ -3591,7 +3525,7 @@
polyhedra_union cloog_new_upol (polyhedron p)
{
polyhedra_union ppl =
- (polyhedra_union) malloc (sizeof (struct polyhedra_union));
+ (polyhedra_union) malloc (sizeof (struct polyhedra_union_s));
ppl->_polyhedron = p;
ppl->_next = NULL;
return ppl;
@@ -3614,7 +3548,7 @@
polyhedron cloog_new_pol (int dim, int nrows)
{
int i;
- polyhedron res = (polyhedron) malloc (sizeof (struct polyhedron));
+ polyhedron res = (polyhedron) malloc (sizeof (struct polyhedron_s));
int ncolumns = dim + 2;
int n = nrows * ncolumns;
Value *p = (Value *) malloc (n * sizeof (Value));
@@ -3631,3 +3565,22 @@
return res;
}
+
+
+/**
+ * cloog_domain_scatter function:
+ * This function add the scattering (scheduling) informations in a domain.
+ */
+CloogDomain *cloog_domain_scatter(CloogDomain *domain, CloogDomain *scatt)
+{ int scatt_dim ;
+ CloogDomain *ext, *newdom;
+
+ scatt_dim = cloog_domain_dim(scatt) - cloog_domain_dim (domain);
+ ext = cloog_domain_extend (domain, scatt_dim, cloog_domain_dim(domain));
+ newdom = cloog_domain_intersection (ext, scatt);
+
+ cloog_domain_free(ext) ;
+ cloog_domain_free(domain);
+
+ return newdom;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org