]>
Commit | Line | Data |
---|---|---|
4de56d3e MT |
1 | 2011-01-28 Jakub Jelinek <jakub@redhat.com> |
2 | ||
3 | Revert: | |
4 | 2011-01-25 Sebastian Pop <sebastian.pop@amd.com> | |
5 | ||
6 | * configure: Regenerated. | |
7 | * configure.ac: Check for version 0.11 (or later revision) of PPL. | |
8 | gcc/ | |
9 | * doc/install.texi: Update the expected version number of PPL to 0.11. | |
10 | * graphite-ppl.c (ppl_powerset_is_empty): Remove now dead code under | |
11 | #if PPL_VERSION_MINOR < 11. | |
12 | ||
13 | --- gcc/doc/install.texi (revision 169207) | |
14 | +++ gcc/doc/install.texi (revision 169206) | |
15 | @@ -332,7 +332,7 @@ and @option{--with-mpc-include}. Altern | |
3c926509 MT |
16 | distribution is found in a subdirectory of your GCC sources named |
17 | @file{mpc}, it will be built together with GCC@. | |
18 | ||
19 | -@item Parma Polyhedra Library (PPL) version 0.11 | |
20 | +@item Parma Polyhedra Library (PPL) version 0.10 | |
21 | ||
22 | Necessary to build GCC with the Graphite loop optimizations. | |
23 | It can be downloaded from @uref{http://www.cs.unipr.it/ppl/Download/}. | |
4de56d3e MT |
24 | --- gcc/graphite-ppl.c (revision 169207) |
25 | +++ gcc/graphite-ppl.c (revision 169206) | |
26 | @@ -521,6 +521,15 @@ debug_gmp_value (mpz_t val) | |
3c926509 MT |
27 | bool |
28 | ppl_powerset_is_empty (ppl_Pointset_Powerset_C_Polyhedron_t ps) | |
29 | { | |
30 | +#if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11 | |
31 | + /* On PPL 0.10, | |
32 | + ppl_Pointset_Powerset_C_Polyhedron_contains_integer_point (ps) | |
33 | + takes too long on some cases and so we call _is_empty instead. */ | |
34 | + return ppl_Pointset_Powerset_C_Polyhedron_is_empty (ps); | |
35 | + | |
36 | +#else | |
37 | + /* On PPL 0.11 or later, we can check for integer feasibility using | |
38 | + the PIP solver. */ | |
39 | ppl_PIP_Problem_t pip; | |
40 | ppl_dimension_type d; | |
41 | ppl_const_Constraint_System_t pcs; | |
4de56d3e | 42 | @@ -561,6 +570,7 @@ ppl_powerset_is_empty (ppl_Pointset_Powe |
3c926509 MT |
43 | ppl_delete_Pointset_Powerset_C_Polyhedron_iterator (end); |
44 | ||
45 | return !has_integer_solutions; | |
46 | +#endif | |
47 | } | |
48 | ||
49 | #endif | |
4de56d3e MT |
50 | --- configure.ac (revision 169207) |
51 | +++ configure.ac (revision 169206) | |
52 | @@ -1688,9 +1688,9 @@ if test "x$with_ppl" != xno; then | |
53 | if test "$enable_ppl_version_check" != no; then | |
54 | saved_CFLAGS="$CFLAGS" | |
55 | CFLAGS="$CFLAGS $pplinc $gmpinc" | |
56 | - AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL]) | |
57 | + AC_MSG_CHECKING([for version 0.10 (revision 0 or later) of PPL]) | |
58 | AC_TRY_COMPILE([#include "ppl_c.h"],[ | |
59 | - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 | |
60 | + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 | |
61 | choke me | |
62 | #endif | |
63 | ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ]) | |
64 | --- configure (revision 169207) | |
65 | +++ configure (revision 169206) | |
66 | @@ -5775,8 +5775,8 @@ fi | |
67 | if test "$enable_ppl_version_check" != no; then | |
68 | saved_CFLAGS="$CFLAGS" | |
69 | CFLAGS="$CFLAGS $pplinc $gmpinc" | |
70 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5 | |
71 | -$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; } | |
72 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (revision 0 or later) of PPL" >&5 | |
73 | +$as_echo_n "checking for version 0.10 (revision 0 or later) of PPL... " >&6; } | |
74 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | |
75 | /* end confdefs.h. */ | |
76 | #include "ppl_c.h" | |
77 | @@ -5784,7 +5784,7 @@ int | |
78 | main () | |
79 | { | |
80 | ||
81 | - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 | |
82 | + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 | |
83 | choke me | |
84 | #endif | |
85 | ||
86 | --- gcc/testsuite/gcc.dg/graphite/interchange-11.c.jj 2011-01-28 09:38:11.000000000 +0100 | |
87 | +++ gcc/testsuite/gcc.dg/graphite/interchange-11.c 2011-01-28 11:06:56.461429848 +0100 | |
88 | @@ -46,5 +46,5 @@ main (void) | |
3c926509 MT |
89 | return 0; |
90 | } | |
91 | ||
92 | -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */ | |
93 | +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */ | |
94 | /* { dg-final { cleanup-tree-dump "graphite" } } */ | |
4de56d3e MT |
95 | --- gcc/testsuite/gcc.dg/graphite/interchange-13.c.jj 2011-01-28 09:38:12.000000000 +0100 |
96 | +++ gcc/testsuite/gcc.dg/graphite/interchange-13.c 2011-01-28 11:07:08.182429223 +0100 | |
97 | @@ -50,5 +50,5 @@ main (void) | |
3c926509 MT |
98 | } |
99 | ||
100 | ||
101 | -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */ | |
102 | +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */ | |
103 | /* { dg-final { cleanup-tree-dump "graphite" } } */ | |
4de56d3e MT |
104 | --- gcc/testsuite/gcc.dg/graphite/interchange-1.c.jj 2011-01-28 09:38:13.000000000 +0100 |
105 | +++ gcc/testsuite/gcc.dg/graphite/interchange-1.c 2011-01-28 11:06:42.160429193 +0100 | |
106 | @@ -49,5 +49,5 @@ main (void) | |
3c926509 MT |
107 | return 0; |
108 | } | |
109 | ||
110 | -/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } */ | |
111 | +/* { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } */ | |
112 | /* { dg-final { cleanup-tree-dump "graphite" } } */ | |
4de56d3e MT |
113 | --- gcc/testsuite/gfortran.dg/graphite/interchange-3.f90.jj 2011-01-28 09:38:05.000000000 +0100 |
114 | +++ gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 2011-01-28 11:07:46.313420441 +0100 | |
115 | @@ -24,5 +24,5 @@ Program FOO | |
3c926509 MT |
116 | |
117 | end Program FOO | |
118 | ||
119 | -! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" } } | |
120 | +! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } | |
121 | ! { dg-final { cleanup-tree-dump "graphite" } } |