[PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.

public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed

* [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
@ 2011-07-21 23:46 Tobias Grosser
  2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
                   ` (4 more replies)
  0 siblings, 5 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-21 23:46 UTC (permalink / raw)
  To: gcc-patches, sebpop; +Cc: Tobias Grosser

Hi,

I propose to switch to the official cloog.org cloog version with isl backend and
at the same time to remove support for both CLooG-PPL legacy as well as
CLooG-Parma.

We want to switch to cloog-isl as it is the only officially maintained version
of cloog. Furthermore, it provides features that will help to fix some bugs in
the graphite code generation[1].
The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
new CloogInput library interface. This interface is not available the old CLooG.
I plan to move graphite to this interface. As I do not see enough benefits from
being able to use CLooG PPL, I decided to not introduce any compatibility
scheme, but just remove any code that is only needed for CLooG-PPL.
I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
actively maintained and not well tested. I believe our time is better spent on
improving graphite or cloog isl, as in putting time into this cloog version.

So here we are: Moving graphite back to the official cloog.org version!

Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
amd64.

Cheers
Tobi

P.S.: Why do we move to the super latest one. Because we expect that most users
would need an update, and, as we will soon use some of the newer features, there
is no need to force another update later.

Tobias Grosser (3):
  Make CLooG isl the only supported CLooG version.
  Require cloog 0.16.3
  Remove code that supported legacy CLooG.

 ChangeLog                      |   17 +++
 config/cloog.m4                |  109 ++--------------
 configure                      |  176 ++------------------------
 configure.ac                   |    2 +-
 gcc/ChangeLog                  |   18 +++
 gcc/Makefile.in                |    4 +-
 gcc/graphite-clast-to-gimple.c |   93 ++++++--------
 gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
 gcc/graphite-cloog-util.c      |   15 +--
 gcc/graphite-cloog-util.h      |    1 -
 gcc/graphite.c                 |    2 -
 11 files changed, 106 insertions(+), 606 deletions(-)
 delete mode 100644 gcc/graphite-cloog-compat.h

-- 
1.7.4.1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 2/3] Require cloog 0.16.3
  2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
@ 2011-07-21 23:47   ` Tobias Grosser
  2011-07-21 23:51     ` [PATCH 3/3] Remove code that supported legacy CLooG Tobias Grosser
  2011-08-02 15:48     ` [PATCH 2/3] Require cloog 0.16.3 Sebastian Pop
  2011-08-02 15:47   ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Sebastian Pop
  1 sibling, 2 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-21 23:47 UTC (permalink / raw)
  To: gcc-patches, sebpop; +Cc: Tobias Grosser

2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* configure: Regenerated.
	* configure.ac: Require cloog isl 0.16.3
---
 ChangeLog    |    5 +++++
 configure    |    6 +++---
 configure.ac |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a08a780..3d83bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2011-07-21  Tobias Grosser  <tobias@grosser.es>
 
 	* configure: Regenerated.
+	* configure.ac: Require cloog isl 0.16.3
+
+2011-07-21  Tobias Grosser  <tobias@grosser.es>
+
+	* configure: Regenerated.
 	* config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
 	both cloog.org and legacy versions. The only supported version will
 	be CLooG with the isl backend.
diff --git a/configure b/configure
index 6608b86..57f099b 100755
--- a/configure
+++ b/configure
@@ -5834,8 +5834,8 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.3 of CLooG" >&5
+$as_echo_n "checking for version 0.16.3 of CLooG... " >&6; }
 if test "${gcc_cv_cloog+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5847,7 +5847,7 @@ main ()
 {
 #if CLOOG_VERSION_MAJOR != 0 \
     || CLOOG_VERSION_MINOR != 16 \
-    || CLOOG_VERSION_REVISION < 1
+    || CLOOG_VERSION_REVISION < 3
     choke me
    #endif
   ;
diff --git a/configure.ac b/configure.ac
index e64e577..00325a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1588,7 +1588,7 @@ if test "x$with_cloog" != "xno"; then
   dnl
   dnl If we use CLooG-Legacy, the provided version information is
   dnl ignored.
-  CLOOG_CHECK_VERSION(0,16,1)
+  CLOOG_CHECK_VERSION(0,16,3)
 
   dnl Only execute fail-action, if CLooG has been requested.
   CLOOG_IF_FAILED([
-- 
1.7.4.1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 1/3] Make CLooG isl the only supported CLooG version.
  2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
@ 2011-07-21 23:51 ` Tobias Grosser
  2011-07-21 23:47   ` [PATCH 2/3] Require cloog 0.16.3 Tobias Grosser
  2011-08-02 15:47   ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Sebastian Pop
  2011-07-22  0:37 ` [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Sebastian Pop
                   ` (3 subsequent siblings)
  4 siblings, 2 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-21 23:51 UTC (permalink / raw)
  To: gcc-patches, sebpop; +Cc: Tobias Grosser

2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* configure: Regenerated.
	* config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
	both cloog.org and legacy versions. The only supported version will
	be CLooG with the isl backend.
---
 ChangeLog       |    7 ++
 config/cloog.m4 |  107 +++-------------------------------
 configure       |  170 +++----------------------------------------------------
 3 files changed, 26 insertions(+), 258 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a27fb7..a08a780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-21  Tobias Grosser  <tobias@grosser.es>
+
+	* configure: Regenerated.
+	* config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
+	both cloog.org and legacy versions. The only supported version will
+	be CLooG with the isl backend.
+
 2011-07-21  Joseph Myers  <joseph@codesourcery.com>
 
 	* MAINTAINERS (Global Reviewers): Add self.
diff --git a/config/cloog.m4 b/config/cloog.m4
index e95b98d..8662acd 100644
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -37,17 +37,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
       [--with-cloog-lib=PATH],
       [Specify the directory for the installed CLooG library])])
 
-  AC_ARG_ENABLE(cloog-backend,
-    [AS_HELP_STRING(
-      [--enable-cloog-backend[[=BACKEND]]],
-      [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
-    [ if   test "x${enableval}" = "xisl"; then
-	cloog_backend=isl
-      elif test "x${enableval}" = "xppl"; then
-	cloog_backend=ppl
-      else
-	cloog_backend=ppl-legacy
-      fi], cloog_backend=ppl-legacy)
   AC_ARG_ENABLE(cloog-version-check,
     [AS_HELP_STRING(
       [--disable-cloog-version-check],
@@ -107,23 +96,6 @@ m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM(
   [#include "cloog/cloog.h" ],
   [cloog_version ()])])
 
-# _CLOOG_ORG_PROG_PPL ()
-# ------------------
-# Helper for detecting CLooG.org's PPL backend.
-m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM(
-  [#include "cloog/cloog.h"
-   #include "cloog/ppl/cloog.h"],
-  [cloog_version ()])])
-
-# _CLOOG_PPL_LEGACY_PROG ()
-# -------------------------
-# Helper for detecting CLooG-Legacy (CLooG-PPL).
-m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM(
-  [#include "cloog/cloog.h"],
-  [#ifndef CLOOG_PPL_BACKEND
-    choke me
-   #endif ])])
-
 # CLOOG_FIND_FLAGS ()
 # ------------------
 # Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org.
@@ -144,49 +116,17 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
   LDFLAGS="${LDFLAGS} ${clooglibs}"
 
-  case $cloog_backend in
-    "ppl-legacy")
-    CFLAGS="${CFLAGS} ${pplinc}"
-    LDFLAGS="${LDFLAGS} ${ppllibs}"
-    AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type],
-      [LIBS="-lcloog ${_cloog_saved_LIBS}"
-      AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"],
-		     [gcc_cv_cloog_type=no])])
-    ;;
-    "isl")
-    AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
-      [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
-      AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
-		     [gcc_cv_cloog_type=no])])
-    ;;
-    "ppl")
-    CFLAGS="${CFLAGS} ${pplinc}"
-    LDFLAGS="${LDFLAGS} ${ppllibs}"
-    AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type],
-      [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
-      AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"],
-		     [gcc_cv_cloog_type=no])])
-    ;;
-    *)
-      gcc_cv_cloog_type=""
-  esac
+  AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
+    [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
+    AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
+		   [gcc_cv_cloog_type=no])])
 
   case $gcc_cv_cloog_type in
-    "PPL Legacy")
-      clooginc="${clooginc}"
-      clooglibs="${clooglibs} -lcloog"
-      cloog_org=no
-      ;;
     "ISL")
       clooginc="${clooginc} ${_cloogorginc}"
       clooglibs="${clooglibs} -lcloog-isl -lisl"
       cloog_org=yes
       ;;
-    "PPL")
-      clooginc="${clooginc} ${_cloogorginc}"
-      clooglibs="${clooglibs} -lcloog-ppl"
-      cloog_org=yes
-      ;;
     *)
       clooglibs=
       clooginc=
@@ -212,25 +152,10 @@ m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM(
     choke me
    #endif])])
 
-# _CLOOG_CHECK_RT_PROG ()
-# -----------------------
-# Helper for verifying that CLooG's compile time version
-# matches the run time version.
-m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM(
-  [#include "cloog/cloog.h"],
-  [if ((cloog_version_major () != CLOOG_VERSION_MAJOR)
-    && (cloog_version_minor () != CLOOG_VERSION_MINOR)
-    && (cloog_version_revision () != CLOOG_VERSION_REVISION))
-    {
-      return 1;
-    }])])
-
 # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION)
 # ----------------------------------------------------------------
 # Test the found CLooG to be exact of version MAJOR.MINOR and at least
 # REVISION.
-# If we're using the old CLooG-PPL (Legacy), the old version check will
-# be executed (Ignores the provided version information).
 AC_DEFUN([CLOOG_CHECK_VERSION],
 [
   AC_REQUIRE([CLOOG_FIND_FLAGS])
@@ -242,21 +167,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
 
-    if test "${cloog_org}" = yes ; then
-      AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
-        [gcc_cv_cloog_ct_0_14_0],
-        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
-          [gcc_cv_cloog_ct_0_14_0=yes],
-          [gcc_cv_cloog_ct_0_14_0=no])])
-    elif test "${cloog_org}" = no ; then
-      AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG],
-        [gcc_cv_cloog_ct_0_15_5],
-        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)],
-          [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)],
-           [gcc_cv_cloog_ct_0_15_5=yes],
-            [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])],
-          [gcc_cv_cloog_ct_0_15_5=no])])
-    fi
+    AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
+      [gcc_cv_cloog],
+      [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
+	[gcc_cv_cloog=yes],
+	[gcc_cv_cloog=no])])
 
     CFLAGS=$_cloog_saved_CFLAGS
     LDFLAGS=$_cloog_saved_LDFLAGS
@@ -272,9 +187,7 @@ AC_DEFUN([CLOOG_IF_FAILED],
 [
   CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
   
-  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
-    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
-    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
+  if test "${gcc_cv_cloog}" = no ; then
     clooglibs=
     clooginc=
   fi
diff --git a/configure b/configure
index facf3e4..6608b86 100755
--- a/configure
+++ b/configure
@@ -775,7 +775,6 @@ enable_ppl_version_check
 with_cloog
 with_cloog_include
 with_cloog_lib
-enable_cloog_backend
 enable_cloog_version_check
 enable_lto
 enable_stage1_languages
@@ -1472,9 +1471,6 @@ Optional Features:
                           build stages 2 and 3 with C++, not C
   --disable-ppl-version-check
                           disable check for PPL version
-  --enable-cloog-backend[=BACKEND]
-                          set the CLooG BACKEND used to either isl, ppl or
-                          ppl-legacy (default)
   --disable-cloog-version-check
                           disable check for CLooG version
   --enable-lto            enable link time optimization support
@@ -5709,19 +5705,6 @@ if test "${with_cloog_lib+set}" = set; then :
 fi
 
 
-  # Check whether --enable-cloog-backend was given.
-if test "${enable_cloog_backend+set}" = set; then :
-  enableval=$enable_cloog_backend;  if   test "x${enableval}" = "xisl"; then
-	cloog_backend=isl
-      elif test "x${enableval}" = "xppl"; then
-	cloog_backend=ppl
-      else
-	cloog_backend=ppl-legacy
-      fi
-else
-  cloog_backend=ppl-legacy
-fi
-
   # Check whether --enable-cloog-version-check was given.
 if test "${enable_cloog_version_check+set}" = set; then :
   enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval
@@ -5794,48 +5777,13 @@ if test "x$with_cloog" != "xno"; then
   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
   LDFLAGS="${LDFLAGS} ${clooglibs}"
 
-  case $cloog_backend in
-    "ppl-legacy")
-    CFLAGS="${CFLAGS} ${pplinc}"
-    LDFLAGS="${LDFLAGS} ${ppllibs}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5
-$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; }
-if test "${gcc_cv_cloog_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  LIBS="-lcloog ${_cloog_saved_LIBS}"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "cloog/cloog.h"
-int
-main ()
-{
-#ifndef CLOOG_PPL_BACKEND
-    choke me
-   #endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gcc_cv_cloog_type="PPL Legacy"
-else
-  gcc_cv_cloog_type=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
-$as_echo "$gcc_cv_cloog_type" >&6; }
-    ;;
-    "isl")
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5
 $as_echo_n "checking for installed CLooG ISL... " >&6; }
 if test "${gcc_cv_cloog_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include "cloog/cloog.h"
 int
@@ -5856,59 +5804,13 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
 $as_echo "$gcc_cv_cloog_type" >&6; }
-    ;;
-    "ppl")
-    CFLAGS="${CFLAGS} ${pplinc}"
-    LDFLAGS="${LDFLAGS} ${ppllibs}"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5
-$as_echo_n "checking for installed CLooG PPL... " >&6; }
-if test "${gcc_cv_cloog_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "cloog/cloog.h"
-   #include "cloog/ppl/cloog.h"
-int
-main ()
-{
-cloog_version ()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gcc_cv_cloog_type="PPL"
-else
-  gcc_cv_cloog_type=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
-$as_echo "$gcc_cv_cloog_type" >&6; }
-    ;;
-    *)
-      gcc_cv_cloog_type=""
-  esac
 
   case $gcc_cv_cloog_type in
-    "PPL Legacy")
-      clooginc="${clooginc}"
-      clooglibs="${clooglibs} -lcloog"
-      cloog_org=no
-      ;;
     "ISL")
       clooginc="${clooginc} ${_cloogorginc}"
       clooglibs="${clooglibs} -lcloog-isl -lisl"
       cloog_org=yes
       ;;
-    "PPL")
-      clooginc="${clooginc} ${_cloogorginc}"
-      clooglibs="${clooglibs} -lcloog-ppl"
-      cloog_org=yes
-      ;;
     *)
       clooglibs=
       clooginc=
@@ -5932,10 +5834,9 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
 
-    if test "${cloog_org}" = yes ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
 $as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+if test "${gcc_cv_cloog+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5954,65 +5855,14 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  gcc_cv_cloog_ct_0_14_0=yes
-else
-  gcc_cv_cloog_ct_0_14_0=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5
-$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; }
-    elif test "${cloog_org}" = no ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG" >&5
-$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... " >&6; }
-if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "cloog/cloog.h"
-int
-main ()
-{
-#if CLOOG_VERSION_MAJOR != 0 \
-    || CLOOG_VERSION_MINOR != 15 \
-    || CLOOG_VERSION_REVISION < 5
-    choke me
-   #endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "cloog/cloog.h"
-int
-main ()
-{
-#if CLOOG_VERSION_MAJOR != 0 \
-    || CLOOG_VERSION_MINOR != 15 \
-    || CLOOG_VERSION_REVISION < 9
-    choke me
-   #endif
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gcc_cv_cloog_ct_0_15_5=yes
-else
-  gcc_cv_cloog_ct_0_15_5="buggy but acceptable"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  gcc_cv_cloog=yes
 else
-  gcc_cv_cloog_ct_0_15_5=no
+  gcc_cv_cloog=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5" >&5
-$as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
-    fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
+$as_echo "$gcc_cv_cloog" >&6; }
 
     CFLAGS=$_cloog_saved_CFLAGS
     LDFLAGS=$_cloog_saved_LDFLAGS
@@ -6036,9 +5886,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
 
 
 
-  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
-    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
-    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
+  if test "${gcc_cv_cloog}" = no ; then
     clooglibs=
     clooginc=
   fi
-- 
1.7.4.1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 3/3] Remove code that supported legacy CLooG.
  2011-07-21 23:47   ` [PATCH 2/3] Require cloog 0.16.3 Tobias Grosser
@ 2011-07-21 23:51     ` Tobias Grosser
  2011-07-22  0:38       ` Sebastian Pop
  2011-08-02 15:48       ` Sebastian Pop
  2011-08-02 15:48     ` [PATCH 2/3] Require cloog 0.16.3 Sebastian Pop
  1 sibling, 2 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-21 23:51 UTC (permalink / raw)
  To: gcc-patches, sebpop; +Cc: Tobias Grosser

2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* configure: Regenerated.
	* config/cloog.m4: Do not define CLOOG_ORG

and in gcc/

2011-07-21  Tobias Grosser  <tobias@grosser.es>

	* Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
	Remove graphite-cloog-util.h.
	* graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
	build_iv_mapping, translate_clast_user, translate_clast,
	free_scattering, initialize_cloog_names, build_cloog_prog,
	create_params_index): Do not use old compatibility functions.
	(clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
	* graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
	compatibility functions.
	(new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
	cloog.
	* graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
	* graphite.c (graphite.c): Do not call outdated cloog_initialize() and
	cloog_finalize().
	* graphite-cloog-compat.h: Remove.
---
 ChangeLog                      |    5 +
 config/cloog.m4                |    2 +-
 configure                      |    2 +-
 gcc/ChangeLog                  |   18 +++
 gcc/Makefile.in                |    4 +-
 gcc/graphite-clast-to-gimple.c |   93 ++++++--------
 gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
 gcc/graphite-cloog-util.c      |   15 +--
 gcc/graphite-cloog-util.h      |    1 -
 gcc/graphite.c                 |    2 -
 10 files changed, 72 insertions(+), 345 deletions(-)
 delete mode 100644 gcc/graphite-cloog-compat.h

diff --git a/ChangeLog b/ChangeLog
index 3d83bd2..9499da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2011-07-21  Tobias Grosser  <tobias@grosser.es>
 
 	* configure: Regenerated.
+	* config/cloog.m4: Do not define CLOOG_ORGt 
+
+2011-07-21  Tobias Grosser  <tobias@grosser.es>
+
+	* configure: Regenerated.
 	* configure.ac: Require cloog isl 0.16.3
 
 2011-07-21  Tobias Grosser  <tobias@grosser.es>
diff --git a/config/cloog.m4 b/config/cloog.m4
index 8662acd..9c42445 100644
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -109,7 +109,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
   _cloog_saved_LDFLAGS=$LDFLAGS
   _cloog_saved_LIBS=$LIBS
 
-  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
+  _cloogorginc="-DCLOOG_INT_GMP"
  
   dnl clooglibs & clooginc may have been initialized by CLOOG_INIT_FLAGS.
   CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
diff --git a/configure b/configure
index 57f099b..8de7bc69 100755
--- a/configure
+++ b/configure
@@ -5771,7 +5771,7 @@ if test "x$with_cloog" != "xno"; then
   _cloog_saved_LDFLAGS=$LDFLAGS
   _cloog_saved_LIBS=$LIBS
 
-  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
+  _cloogorginc="-DCLOOG_INT_GMP"
 
     CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b9d95fa..b6009b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,21 @@
+2011-07-21  Tobias Grosser  <tobias@grosser.es>
+
+	* Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
+	Remove graphite-cloog-util.h.
+	* graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
+	build_iv_mapping, translate_clast_user, translate_clast,
+	free_scattering, initialize_cloog_names, build_cloog_prog,
+	create_params_index): Do not use old compatibility functions.
+	(clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
+	* graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
+	compatibility functions.
+	(new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
+	cloog.
+	* graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
+	* graphite.c (graphite.c): Do not call outdated cloog_initialize() and
+	cloog_finalize().
+	* graphite-cloog-compat.h: Remove.
+
 2011-07-21  Georg-Johann Lay  <avr@gjlay.de>
 	
 	* config/avr/avr.c (final_prescan_insn): Fix printing of rtx_costs.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d924fb6..c5a2f7f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2690,9 +2690,9 @@ graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \
    $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
    $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \
    graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \
-   graphite-dependences.h graphite-cloog-compat.h
+   graphite-dependences.h
 graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
-   coretypes.h graphite-cloog-util.h graphite-cloog-compat.h
+   coretypes.h graphite-cloog-util.h
 graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
    sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \
diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index 6b17631..da9b84f 100644
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -38,7 +38,8 @@ along with GCC; see the file COPYING3.  If not see
 #include "graphite-poly.h"
 #include "graphite-clast-to-gimple.h"
 #include "graphite-dependences.h"
-#include "graphite-cloog-compat.h"
+
+typedef const struct clast_expr *clast_name_p;
 
 /* This flag is set when an error occurred during the translation of
    CLAST to Gimple.  */
@@ -86,12 +87,8 @@ clast_name_to_index (clast_name_p name, htab_t index_table)
   struct clast_name_index tmp;
   PTR *slot;
 
-#ifdef CLOOG_ORG
   gcc_assert (name->type == clast_expr_name);
   tmp.name = ((const struct clast_name *) name)->name;
-#else
-  tmp.name = name;
-#endif
 
   slot = htab_find_slot (index_table, &tmp, NO_INSERT);
 
@@ -683,7 +680,7 @@ gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for, int level,
   struct clast_stmt *stmt = (struct clast_stmt *) stmt_for;
   struct clast_user_stmt *body = clast_get_body_of_loop (stmt);
   CloogStatement *cs = body->statement;
-  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
+  poly_bb_p pbb = (poly_bb_p) cs->usr;
 
   return max_signed_precision_type (lb_type, max_precision_type
 				    (ub_type, compute_type_for_level
@@ -740,7 +737,7 @@ build_iv_mapping (VEC (tree, heap) *iv_map, sese region,
   struct clast_stmt *t;
   int depth = 0;
   CloogStatement *cs = user_stmt->statement;
-  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
+  poly_bb_p pbb = (poly_bb_p) cs->usr;
   gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
 
   for (t = user_stmt->substitutions; t; t = t->next, depth++)
@@ -856,7 +853,7 @@ translate_clast_user (sese region, struct clast_user_stmt *stmt, edge next_e,
 {
   int i, nb_loops;
   basic_block new_bb;
-  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (stmt->statement);
+  poly_bb_p pbb = (poly_bb_p) stmt->statement->usr;
   gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
   VEC (tree, heap) *iv_map;
 
@@ -1076,8 +1073,8 @@ free_scattering (CloogScatteringList *scattering)
 {
   while (scattering)
     {
-      CloogScattering *dom = cloog_scattering (scattering);
-      CloogScatteringList *next = cloog_next_scattering (scattering);
+      CloogScattering *dom = scattering->scatt;
+      CloogScatteringList *next = scattering->next;
 
       cloog_scattering_free (dom);
       free (scattering);
@@ -1095,13 +1092,13 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
   sese region = SCOP_REGION (scop);
   int i;
   int nb_iterators = scop_max_loop_depth (scop);
-  int nb_scattering = cloog_program_nb_scattdims (prog);
+  int nb_scattering = prog->nb_scattdims;
   int nb_parameters = VEC_length (tree, SESE_PARAMS (region));
   char **iterators = XNEWVEC (char *, nb_iterators * 2);
   char **scattering = XNEWVEC (char *, nb_scattering);
   char **parameters= XNEWVEC (char *, nb_parameters);
 
-  cloog_program_set_names (prog, cloog_names_malloc ());
+  prog->names = cloog_names_malloc ();
 
   for (i = 0; i < nb_parameters; i++)
     {
@@ -1118,8 +1115,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
       snprintf (parameters[i], len, "%s_%d", name, SSA_NAME_VERSION (param));
     }
 
-  cloog_names_set_nb_parameters (cloog_program_names (prog), nb_parameters);
-  cloog_names_set_parameters (cloog_program_names (prog), parameters);
+  prog->names->nb_parameters = nb_parameters;
+  prog->names->parameters = parameters;
 
   for (i = 0; i < nb_iterators; i++)
     {
@@ -1128,10 +1125,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
       snprintf (iterators[i], len, "git_%d", i);
     }
 
-  cloog_names_set_nb_iterators (cloog_program_names (prog),
-				nb_iterators);
-  cloog_names_set_iterators (cloog_program_names (prog),
-			     iterators);
+  prog->names->nb_iterators = nb_iterators;
+  prog->names->iterators = iterators;
 
   for (i = 0; i < nb_scattering; i++)
     {
@@ -1140,10 +1135,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
       snprintf (scattering[i], len, "scat_%d", i);
     }
 
-  cloog_names_set_nb_scattering (cloog_program_names (prog),
-				 nb_scattering);
-  cloog_names_set_scattering (cloog_program_names (prog),
-			      scattering);
+  prog->names->nb_scattering = nb_scattering;
+  prog->names->scattering = scattering;
 }
 
 /* Initialize a CLooG input file.  */
@@ -1186,12 +1179,13 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
   int nbs = 2 * max_nb_loops + 1;
   int *scaldims;
 
-  cloog_program_set_context
-    (prog, new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
-      scop_nb_params (scop), cloog_state));
+  prog->context =
+    new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
+						 scop_nb_params (scop),
+						 cloog_state);
   nbs = unify_scattering_dimensions (scop);
   scaldims = (int *) xmalloc (nbs * (sizeof (int)));
-  cloog_program_set_nb_scattdims (prog, nbs);
+  prog->nb_scattdims = nbs;
   initialize_cloog_names (scop, prog);
 
   FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
@@ -1211,14 +1205,14 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
                                                          scop_nb_params (scop),
                                                          cloog_state);
       block = cloog_block_alloc (stmt, 0, NULL, pbb_dim_iter_domain (pbb));
-      cloog_statement_set_usr (stmt, pbb);
+      stmt->usr = pbb;
 
       /* Build loop list.  */
       {
         CloogLoop *new_loop_list = cloog_loop_malloc (cloog_state);
-        cloog_loop_set_next (new_loop_list, loop_list);
-        cloog_loop_set_domain (new_loop_list, dom);
-        cloog_loop_set_block (new_loop_list, block);
+        new_loop_list->next = loop_list;
+        new_loop_list->domain = dom;
+        new_loop_list->block = block;
         loop_list = new_loop_list;
       }
 
@@ -1226,8 +1220,8 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
       {
         CloogBlockList *new_block_list = cloog_block_list_malloc ();
 
-        cloog_block_list_set_next (new_block_list, block_list);
-        cloog_block_list_set_block (new_block_list, block);
+        new_block_list->next = block_list;
+        new_block_list->block = block;
         block_list = new_block_list;
       }
 
@@ -1244,19 +1238,19 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
           (scat, scop_nb_params (scop), pbb_nb_scattering_transform (pbb),
            cloog_state);
 
-        cloog_set_next_scattering (new_scattering, scattering);
-        cloog_set_scattering (new_scattering, dom);
+        new_scattering->next = scattering;
+        new_scattering->scatt = dom;
         scattering = new_scattering;
       }
     }
 
-  cloog_program_set_loop (prog, loop_list);
-  cloog_program_set_blocklist (prog, block_list);
+  prog->loop = loop_list;
+  prog->blocklist = block_list;
 
   for (i = 0; i < nbs; i++)
     scaldims[i] = 0 ;
 
-  cloog_program_set_scaldims (prog, scaldims);
+  prog->scaldims = scaldims;
 
   /* Extract scalar dimensions to simplify the code generation problem.  */
   cloog_program_extract_scalars (prog, scattering, options);
@@ -1277,22 +1271,21 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
   free_scattering (scattering);
 
   /* Iterators corresponding to scalar dimensions have to be extracted.  */
-  cloog_names_scalarize (cloog_program_names (prog), nbs,
-			 cloog_program_scaldims (prog));
+  cloog_names_scalarize (prog->names, nbs, prog->scaldims);
 
   /* Free blocklist.  */
   {
-    CloogBlockList *next = cloog_program_blocklist (prog);
+    CloogBlockList *next = prog->blocklist;
 
     while (next)
       {
         CloogBlockList *toDelete = next;
-        next = cloog_block_list_next (next);
-        cloog_block_list_set_next (toDelete, NULL);
-        cloog_block_list_set_block (toDelete, NULL);
+        next = next->next;
+        toDelete->next =  NULL;
+        toDelete->block = NULL;
         cloog_block_list_free (toDelete);
       }
-    cloog_program_set_blocklist (prog, NULL);
+    prog->blocklist = NULL;
   }
 }
 
@@ -1314,14 +1307,8 @@ set_cloog_options (void)
      GLooG.  */
   options->esp = 1;
 
-#ifdef CLOOG_ORG
   /* Silence CLooG to avoid failing tests due to debug output to stderr.  */
   options->quiet = 1;
-#else
-  /* Enable C pretty-printing mode: normalizes the substitution
-     equations for statements.  */
-  options->cpp = 1;
-#endif
 
   /* Allow cloog to build strides with a stride width different to one.
      This example has stride = 4:
@@ -1419,9 +1406,9 @@ debug_generated_program (scop_p scop)
 
 static void
 create_params_index (htab_t index_table, CloogProgram *prog) {
-  CloogNames* names = cloog_program_names (prog);
-  int nb_parameters = cloog_names_nb_parameters (names);
-  char **parameters = cloog_names_parameters (names);
+  CloogNames* names = prog->names;
+  int nb_parameters = names->nb_parameters;
+  char **parameters = names->parameters;
   int i;
 
   for (i = 0; i < nb_parameters; i++)
diff --git a/gcc/graphite-cloog-compat.h b/gcc/graphite-cloog-compat.h
deleted file mode 100644
index 011377d..0000000
--- a/gcc/graphite-cloog-compat.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Compatibility layer for using upstream CLooG versions with
-   CLooG legacy code.
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
-   Contributed by Andreas Simbuerger <simbuerg@fim.uni-passau.de>.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef GRAPHITE_CLOOG_COMPAT_H
-#define GRAPHITE_CLOOG_COMPAT_H
-
-/* Restore compatibility to CLooG Legacy.  */
-#ifdef CLOOG_ORG
-typedef const struct clast_expr *clast_name_p;
-#else
-typedef const char *clast_name_p;
-#endif
-
-#ifdef CLOOG_ORG
-#define cloog_initialize()
-#define cloog_finalize()
-#endif
-
-#ifndef CLOOG_ORG
-
-/* CloogOptions compatibility.  */
-#define build_cloog_prog(SCOP, PROG, OPT)\
-  build_cloog_prog (SCOP, PROG)
-#define cloog_program_extract_scalars(PROG, SCATT, OPT)\
-  cloog_program_extract_scalars (PROG, SCATT)
-#define cloog_program_scatter(PROG, SCATT, OPT)\
-  cloog_program_scatter (PROG, SCATT)
-
-/* CLAST compatibility.  */
-#define clast_expr_term expr_term
-#define clast_expr_red expr_red
-#define clast_expr_bin expr_bin
-#define clast_pprint pprint
-
-/* CloogState compatibility.  */
-#define CloogState void
-#define cloog_state_malloc() NULL
-#define cloog_state_free(STATE)
-#define cloog_loop_malloc(STATE) cloog_loop_malloc ()
-#define cloog_options_malloc(STATE) cloog_options_malloc ()
-#define cloog_statement_alloc(STATE, INDEX) cloog_statement_alloc (INDEX)
-#define new_Cloog_Domain_from_ppl_Pointset_Powerset(PSPS, NB, STATE)\
-  new_Cloog_Domain_from_ppl_Pointset_Powerset (PSPS)
-#define new_Cloog_Domain_from_ppl_Polyhedron(POLY, NB, STATE)\
-  new_Cloog_Domain_from_ppl_Polyhedron (POLY)
-#define cloog_domain_from_cloog_matrix(STATE, MAT, NB)\
-  cloog_domain_matrix2domain (MAT)
-
-/* CloogScatteringList compatibility.  */
-#define CloogScatteringList CloogDomainList
-#define CloogScattering CloogDomain
-#define cloog_set_next_scattering cloog_set_next_domain
-#define cloog_set_scattering cloog_set_domain
-#define cloog_scattering cloog_domain
-#define cloog_next_scattering cloog_next_domain
-#define cloog_scattering_free cloog_domain_free
-#define cloog_program_dump_cloog(DUMPFILE, PROGRAM, SCATTERINGLIST)\
-  cloog_program_dump_cloog (DUMPFILE, PROGRAM)
-
-#endif
-
-/* Adapt CLooG accessors from CLooG legacy to
-   newer CLooG versions.  */
-
-#ifdef CLOOG_ORG
-
-static inline void *
-cloog_statement_usr (CloogStatement *cs)
-{
-  return cs->usr;
-}
-
-static inline CloogScattering *
-cloog_scattering (CloogScatteringList *sl)
-{
-  return sl->scatt;
-}
-
-static inline void
-cloog_set_scattering (CloogScatteringList *sl, CloogScattering *scatt)
-{
-  sl->scatt = scatt;
-}
-
-static inline CloogScatteringList *
-cloog_next_scattering (CloogScatteringList *sl)
-{
-  return sl->next;
-}
-
-static inline void
-cloog_set_next_scattering (CloogScatteringList *sl, CloogScatteringList *next)
-{
-  sl->next = next;
-}
-
-static inline int
-cloog_program_nb_scattdims (CloogProgram *prog)
-{
-  return prog->nb_scattdims;
-}
-
-static inline void
-cloog_program_set_nb_scattdims (CloogProgram *prog, int nb_scattdims)
-{
-  prog->nb_scattdims = nb_scattdims;
-}
-
-static inline CloogNames *
-cloog_program_names (CloogProgram *prog)
-{
-  return prog->names;
-}
-
-static inline void
-cloog_program_set_names (CloogProgram *prog, CloogNames *names)
-{
-  prog->names = names;
-}
-
-static inline void
-cloog_program_set_context (CloogProgram *prog, CloogDomain *domain)
-{
-  prog->context = domain;
-}
-
-static inline void
-cloog_program_set_loop (CloogProgram *prog, CloogLoop *loop)
-{
-  prog->loop = loop;
-}
-
-static inline CloogBlockList *
-cloog_program_blocklist (CloogProgram *prog)
-{
-  return prog->blocklist;
-}
-
-static inline void
-cloog_program_set_blocklist (CloogProgram *prog, CloogBlockList *bl)
-{
-  prog->blocklist = bl;
-}
-
-static inline int *
-cloog_program_scaldims (CloogProgram *prog)
-{
-  return prog->scaldims;
-}
-
-static inline void
-cloog_program_set_scaldims (CloogProgram *prog, int *s)
-{
-  prog->scaldims = s;
-}
-
-static inline int
-cloog_names_nb_parameters (CloogNames *names)
-{
-  return names->nb_parameters;
-}
-
-static inline void
-cloog_names_set_nb_parameters (CloogNames *names, int nb_parameters)
-{
-  names->nb_parameters = nb_parameters;
-}
-
-static inline char **
-cloog_names_parameters (CloogNames *names)
-{
-  return names->parameters;
-}
-
-static inline void
-cloog_names_set_parameters (CloogNames *names, char **parameters)
-{
-  names->parameters = parameters;
-}
-
-static inline void
-cloog_names_set_nb_iterators (CloogNames *names, int nb_iterators)
-{
-  names->nb_iterators = nb_iterators;
-}
-
-static inline void
-cloog_names_set_iterators (CloogNames *names, char **iterators)
-{
-  names->iterators = iterators;
-}
-
-static inline void
-cloog_names_set_nb_scattering (CloogNames *names, int nb_scattering)
-{
-  names->nb_scattering = nb_scattering;
-}
-
-static inline void
-cloog_names_set_scattering (CloogNames *names, char **scattering)
-{
-  names->scattering = scattering;
-}
-
-static inline void
-cloog_statement_set_usr (CloogStatement *cs, void *u)
-{
-  cs->usr = u;
-}
-
-static inline void
-cloog_loop_set_next (CloogLoop *loop, CloogLoop *next)
-{
-  loop->next = next;
-}
-
-static inline void
-cloog_loop_set_domain (CloogLoop *loop, CloogDomain *domain)
-{
-  loop->domain = domain;
-}
-
-static inline void
-cloog_loop_set_block (CloogLoop *loop, CloogBlock *block)
-{
-  loop->block = block;
-}
-
-static inline CloogBlockList *
-cloog_block_list_next (CloogBlockList *bl)
-{
-  return bl->next;
-}
-
-static inline void
-cloog_block_list_set_next (CloogBlockList *bl, CloogBlockList *next)
-{
-  bl->next = next;
-}
-
-static inline void
-cloog_block_list_set_block (CloogBlockList *bl, CloogBlock *block)
-{
-  bl->block = block;
-}
-
-static inline int cloog_matrix_ncolumns (CloogMatrix * m)
-{
-  return m->NbColumns;
-}
-
-static inline int cloog_matrix_nrows (CloogMatrix * m)
-{
-   return m->NbRows;
-}
-#endif /* CLOOG_ORG  */
-#endif /* GRAPHITE_CLOOG_COMPAT_H  */
diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
index c3d0cc1..9bc24a0 100644
--- a/gcc/graphite-cloog-util.c
+++ b/gcc/graphite-cloog-util.c
@@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "ppl_c.h"
 #include "cloog/cloog.h"
 #include "graphite-cloog-util.h"
-#include "graphite-cloog-compat.h"
 
 /* Counts the number of constraints in PCS.  */
 
@@ -253,7 +252,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
                                           int nb_scatt ATTRIBUTE_UNUSED,
                                           CloogState *state ATTRIBUTE_UNUSED)
 {
-#ifdef CLOOG_ORG
   CloogMatrix *mat = new_Cloog_Matrix_from_ppl_Polyhedron (ph);
   CloogScattering *res = cloog_scattering_from_cloog_matrix (state, mat,
                                                              nb_scatt,
@@ -261,9 +259,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
 
   cloog_matrix_free (mat);
   return res;
-#else
-  return new_Cloog_Domain_from_ppl_Polyhedron (ph, nb_params, state);
-#endif
 }
 
 /* Creates a CloogDomain from a pointset powerset PS.  */
@@ -314,14 +309,14 @@ openscop_print_cloog_matrix (FILE *file, CloogMatrix *mat,
 			     int output, int input, int locals,
 			     int params)
 {
-  int i, j;
+  unsigned i, j;
 
-  fprintf (file, "%d %d %d %d %d %d \n", cloog_matrix_nrows (mat),
-	   cloog_matrix_ncolumns (mat), output, input, locals, params);
+  fprintf (file, "%d %d %d %d %d %d \n", mat->NbRows,
+	   mat->NbColumns, output, input, locals, params);
 
-  for (i = 0; i < cloog_matrix_nrows (mat); i++)
+  for (i = 0; i < mat->NbRows; i++)
     {
-      for (j = 0; j < cloog_matrix_ncolumns (mat); j++)
+      for (j = 0; j < mat->NbColumns; j++)
         if (j == 0)
 	  fprintf (file, "%ld ", mpz_get_si (mat->p[i][j]));
         else
diff --git a/gcc/graphite-cloog-util.h b/gcc/graphite-cloog-util.h
index 9686e7c..da26ee9 100644
--- a/gcc/graphite-cloog-util.h
+++ b/gcc/graphite-cloog-util.h
@@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #define GRAPHITE_CLOOG_UTIL_H
 
 #include "cloog/cloog.h"
-#include "graphite-cloog-compat.h"
 
 CloogMatrix *new_Cloog_Matrix_from_ppl_Polyhedron (ppl_const_Polyhedron_t);
 CloogDomain *new_Cloog_Domain_from_ppl_Polyhedron (ppl_const_Polyhedron_t,
diff --git a/gcc/graphite.c b/gcc/graphite.c
index b013447..e746c61 100644
--- a/gcc/graphite.c
+++ b/gcc/graphite.c
@@ -209,7 +209,6 @@ graphite_initialize (void)
   gcc_assert (ppl_initialized == 0);
 
   cloog_state = cloog_state_malloc ();
-  cloog_initialize ();
 
   if (dump_file && dump_flags)
     dump_function_to_file (current_function_decl, dump_file, dump_flags);
@@ -233,7 +232,6 @@ graphite_finalize (bool need_cfg_cleanup_p)
     }
 
   cloog_state_free (cloog_state);
-  cloog_finalize ();
   ppl_finalize ();
   free_original_copy_tables ();
 
-- 
1.7.4.1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
  2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
@ 2011-07-22  0:37 ` Sebastian Pop
  2011-07-26 19:04   ` Sebastian Pop
  2011-07-22  8:23 ` Richard Guenther
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-07-22  0:37 UTC (permalink / raw)
  To: Tobias Grosser; +Cc: gcc-patches

Hi Tobias,

On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
> Hi,
>
> I propose to switch to the official cloog.org cloog version with isl backend and
> at the same time to remove support for both CLooG-PPL legacy as well as
> CLooG-Parma.
>

Many thanks for implementing this cleanup.

> We want to switch to cloog-isl as it is the only officially maintained version
> of cloog. Furthermore, it provides features that will help to fix some bugs in
> the graphite code generation[1].
> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
> new CloogInput library interface. This interface is not available the old CLooG.
> I plan to move graphite to this interface. As I do not see enough benefits from
> being able to use CLooG PPL, I decided to not introduce any compatibility
> scheme, but just remove any code that is only needed for CLooG-PPL.
> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
> actively maintained and not well tested. I believe our time is better spent on
> improving graphite or cloog isl, as in putting time into this cloog version.
>
> So here we are: Moving graphite back to the official cloog.org version!
>
> Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
> amd64.
>
> Cheers
> Tobi
>
> P.S.: Why do we move to the super latest one. Because we expect that most users
> would need an update, and, as we will soon use some of the newer features, there
> is no need to force another update later.
>
>
> Tobias Grosser (3):
>  Make CLooG isl the only supported CLooG version.
>  Require cloog 0.16.3
>  Remove code that supported legacy CLooG.

For all your changes, you would need the ok from a configure maintainer.
The changes to the graphite framework are ok.

Thanks,
Sebastian

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 3/3] Remove code that supported legacy CLooG.
  2011-07-21 23:51     ` [PATCH 3/3] Remove code that supported legacy CLooG Tobias Grosser
@ 2011-07-22  0:38       ` Sebastian Pop
  2011-07-22  2:20         ` Tobias Grosser
  2011-08-02 15:48       ` Sebastian Pop
  1 sibling, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-07-22  0:38 UTC (permalink / raw)
  To: Tobias Grosser; +Cc: gcc-patches

On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
>  static void
>  create_params_index (htab_t index_table, CloogProgram *prog) {
> -  CloogNames* names = cloog_program_names (prog);
> -  int nb_parameters = cloog_names_nb_parameters (names);
> -  char **parameters = cloog_names_parameters (names);
> +  CloogNames* names = prog->names;

Please also fix the formatting here:
CloogNames *names = prog->names;

The rest of the patch looks good.  Before checking in, please wait for a
configure maintainer to approve the config changes.

Thanks,
Sebastian

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 3/3] Remove code that supported legacy CLooG.
  2011-07-22  0:38       ` Sebastian Pop
@ 2011-07-22  2:20         ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-22  2:20 UTC (permalink / raw)
  To: Sebastian Pop; +Cc: gcc-patches

On 07/22/2011 01:46 AM, Sebastian Pop wrote:
> On Thu, Jul 21, 2011 at 18:00, Tobias Grosser<tobias@grosser.es>  wrote:
>>   static void
>>   create_params_index (htab_t index_table, CloogProgram *prog) {
>> -  CloogNames* names = cloog_program_names (prog);
>> -  int nb_parameters = cloog_names_nb_parameters (names);
>> -  char **parameters = cloog_names_parameters (names);
>> +  CloogNames* names = prog->names;
>
> Please also fix the formatting here:
> CloogNames *names = prog->names;
>
> The rest of the patch looks good.  Before checking in, please wait for a
> configure maintainer to approve the config changes.

Thanks for the review. I will obviously wait for the OK of a configure 
maintainer.

Tobi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
  2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
  2011-07-22  0:37 ` [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Sebastian Pop
@ 2011-07-22  8:23 ` Richard Guenther
  2011-07-22  9:47   ` Tobias Grosser
  2011-07-22 12:38 ` Joseph S. Myers
  2011-07-27 16:43 ` Jack Howarth
  4 siblings, 1 reply; 22+ messages in thread
From: Richard Guenther @ 2011-07-22  8:23 UTC (permalink / raw)
  To: Tobias Grosser; +Cc: gcc-patches, sebpop

On Fri, Jul 22, 2011 at 1:00 AM, Tobias Grosser <tobias@grosser.es> wrote:
> Hi,
>
> I propose to switch to the official cloog.org cloog version with isl backend and
> at the same time to remove support for both CLooG-PPL legacy as well as
> CLooG-Parma.
>
> We want to switch to cloog-isl as it is the only officially maintained version
> of cloog. Furthermore, it provides features that will help to fix some bugs in
> the graphite code generation[1].
> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
> new CloogInput library interface. This interface is not available the old CLooG.
> I plan to move graphite to this interface. As I do not see enough benefits from
> being able to use CLooG PPL, I decided to not introduce any compatibility
> scheme, but just remove any code that is only needed for CLooG-PPL.
> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
> actively maintained and not well tested. I believe our time is better spent on
> improving graphite or cloog isl, as in putting time into this cloog version.
>
> So here we are: Moving graphite back to the official cloog.org version!

Does that mean GCC no longer needs PPL?  If it is like today (we are going
to link against both ISL and PPL) then I am opposed to this change.

Thanks,
Richard.

> Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
> amd64.
>
> Cheers
> Tobi
>
> P.S.: Why do we move to the super latest one. Because we expect that most users
> would need an update, and, as we will soon use some of the newer features, there
> is no need to force another update later.
>
>
> Tobias Grosser (3):
>  Make CLooG isl the only supported CLooG version.
>  Require cloog 0.16.3
>  Remove code that supported legacy CLooG.
>
>  ChangeLog                      |   17 +++
>  config/cloog.m4                |  109 ++--------------
>  configure                      |  176 ++------------------------
>  configure.ac                   |    2 +-
>  gcc/ChangeLog                  |   18 +++
>  gcc/Makefile.in                |    4 +-
>  gcc/graphite-clast-to-gimple.c |   93 ++++++--------
>  gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
>  gcc/graphite-cloog-util.c      |   15 +--
>  gcc/graphite-cloog-util.h      |    1 -
>  gcc/graphite.c                 |    2 -
>  11 files changed, 106 insertions(+), 606 deletions(-)
>  delete mode 100644 gcc/graphite-cloog-compat.h
>
> --
> 1.7.4.1
>
>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-22  8:23 ` Richard Guenther
@ 2011-07-22  9:47   ` Tobias Grosser
  2011-07-22 13:03     ` Richard Guenther
  0 siblings, 1 reply; 22+ messages in thread
From: Tobias Grosser @ 2011-07-22  9:47 UTC (permalink / raw)
  To: Richard Guenther; +Cc: gcc-patches, sebpop

On 07/22/2011 10:08 AM, Richard Guenther wrote:
> On Fri, Jul 22, 2011 at 1:00 AM, Tobias Grosser<tobias@grosser.es>  wrote:
>> Hi,
>>
>> I propose to switch to the official cloog.org cloog version with isl backend and
>> at the same time to remove support for both CLooG-PPL legacy as well as
>> CLooG-Parma.
>>
>> We want to switch to cloog-isl as it is the only officially maintained version
>> of cloog. Furthermore, it provides features that will help to fix some bugs in
>> the graphite code generation[1].
>> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
>> new CloogInput library interface. This interface is not available the old CLooG.
>> I plan to move graphite to this interface. As I do not see enough benefits from
>> being able to use CLooG PPL, I decided to not introduce any compatibility
>> scheme, but just remove any code that is only needed for CLooG-PPL.
>> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
>> actively maintained and not well tested. I believe our time is better spent on
>> improving graphite or cloog isl, as in putting time into this cloog version.
>>
>> So here we are: Moving graphite back to the official cloog.org version!
>
> Does that mean GCC no longer needs PPL?  If it is like today (we are going
> to link against both ISL and PPL) then I am opposed to this change.

No, this does not mean we do not need PPL anymore. Graphite itself still 
uses PPL. This change only affects the version of CLooG used.

This also means Graphite itself does for now not directly link to isl 
(at least it it is not a static build), as isl is only used in CLooG 
itself. It is also part of the official cloog-isl tar file, such that 
there is no need to download and install yet another library.

As you mentioned we may want to switch to use isl itself later, as it 
has some advantages over PPL, however this might be evaluated in a 
separate step.

Cheers
Tobi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
                   ` (2 preceding siblings ...)
  2011-07-22  8:23 ` Richard Guenther
@ 2011-07-22 12:38 ` Joseph S. Myers
  2011-07-26 18:55   ` Sebastian Pop
  2011-07-27 16:43 ` Jack Howarth
  4 siblings, 1 reply; 22+ messages in thread
From: Joseph S. Myers @ 2011-07-22 12:38 UTC (permalink / raw)
  To: Tobias Grosser; +Cc: gcc-patches, sebpop

On Fri, 22 Jul 2011, Tobias Grosser wrote:

> I propose to switch to the official cloog.org cloog version with isl backend and
> at the same time to remove support for both CLooG-PPL legacy as well as
> CLooG-Parma.

Where are the install.texi changes in this patch series?

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-22  9:47   ` Tobias Grosser
@ 2011-07-22 13:03     ` Richard Guenther
  0 siblings, 0 replies; 22+ messages in thread
From: Richard Guenther @ 2011-07-22 13:03 UTC (permalink / raw)
  To: Tobias Grosser; +Cc: gcc-patches, sebpop

On Fri, Jul 22, 2011 at 10:57 AM, Tobias Grosser <tobias@grosser.es> wrote:
> On 07/22/2011 10:08 AM, Richard Guenther wrote:
>>
>> On Fri, Jul 22, 2011 at 1:00 AM, Tobias Grosser<tobias@grosser.es>  wrote:
>>>
>>> Hi,
>>>
>>> I propose to switch to the official cloog.org cloog version with isl
>>> backend and
>>> at the same time to remove support for both CLooG-PPL legacy as well as
>>> CLooG-Parma.
>>>
>>> We want to switch to cloog-isl as it is the only officially maintained
>>> version
>>> of cloog. Furthermore, it provides features that will help to fix some
>>> bugs in
>>> the graphite code generation[1].
>>> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl
>>> provides the
>>> new CloogInput library interface. This interface is not available the old
>>> CLooG.
>>> I plan to move graphite to this interface. As I do not see enough
>>> benefits from
>>> being able to use CLooG PPL, I decided to not introduce any compatibility
>>> scheme, but just remove any code that is only needed for CLooG-PPL.
>>> I also removed CLooG-Parma (cloog.org with PPL backend), as it is
>>> currently not
>>> actively maintained and not well tested. I believe our time is better
>>> spent on
>>> improving graphite or cloog isl, as in putting time into this cloog
>>> version.
>>>
>>> So here we are: Moving graphite back to the official cloog.org version!
>>
>> Does that mean GCC no longer needs PPL?  If it is like today (we are going
>> to link against both ISL and PPL) then I am opposed to this change.
>
> No, this does not mean we do not need PPL anymore. Graphite itself still
> uses PPL. This change only affects the version of CLooG used.
>
> This also means Graphite itself does for now not directly link to isl (at
> least it it is not a static build), as isl is only used in CLooG itself. It
> is also part of the official cloog-isl tar file, such that there is no need
> to download and install yet another library.
>
> As you mentioned we may want to switch to use isl itself later, as it has
> some advantages over PPL, however this might be evaluated in a separate
> step.

Please, it would be highly desirable to get rid of that build dependency ...

Btw, for interested people, I figured out how to build cloog so it links
isl statically,
export cloog_configure_args="--enable-static --disable-shared --with-pic"
before configuring (yes, that will still build libcloog itself shared).

Richard.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-22 12:38 ` Joseph S. Myers
@ 2011-07-26 18:55   ` Sebastian Pop
  2011-07-28 17:21     ` Tobias Grosser
  0 siblings, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-07-26 18:55 UTC (permalink / raw)
  To: Joseph S. Myers; +Cc: Tobias Grosser, gcc-patches

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

On Fri, Jul 22, 2011 at 07:32, Joseph S. Myers <joseph@codesourcery.com> wrote:
> On Fri, 22 Jul 2011, Tobias Grosser wrote:
>
>> I propose to switch to the official cloog.org cloog version with isl backend and
>> at the same time to remove support for both CLooG-PPL legacy as well as
>> CLooG-Parma.
>
> Where are the install.texi changes in this patch series?

Please see the attached patch.

Thanks,
Sebastian

[-- Attachment #2: 0001-Document-CLooG-ISL-requirement-for-Graphite.patch --]
[-- Type: text/x-diff, Size: 2610 bytes --]

From 079ec12ce018ad6e7577d2c069b1c612b3b2b98e Mon Sep 17 00:00:00 2001
From: Sebastian Pop <sebpop@gmail.com>
Date: Tue, 26 Jul 2011 13:28:36 -0500
Subject: [PATCH] Document CLooG-ISL requirement for Graphite

2011-07-26  Sebastian Pop  <sebastian.pop@amd.com>

	* doc/invoke.texi: Document CLooG-ISL requirement for Graphite.
---
 gcc/ChangeLog        |    4 ++++
 gcc/doc/install.texi |   24 ++++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17358a8..78fcf59 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-26  Sebastian Pop  <sebastian.pop@amd.com>
+
+	* doc/invoke.texi: Document CLooG-ISL requirement for Graphite.
+
 2011-07-23  Sebastian Pop  <sebastian.pop@amd.com>
 
 	PR tree-optimization/49471
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 9b1b037..368221f 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -365,26 +365,18 @@ distribution is found in a subdirectory of your GCC sources named
 Necessary to build GCC with the Graphite loop optimizations.
 It can be downloaded from @uref{http://www.cs.unipr.it/ppl/Download/}.
 
-The @option{--with-ppl} configure option should be used if PPL is not
+The configure option @option{--with-ppl} should be used if PPL is not
 installed in your default library search path.
 
-@item CLooG-PPL version 0.15 or CLooG 0.16
+@item CLooG-ISL 0.16
 
-Necessary to build GCC with the Graphite loop optimizations.  There
-are two versions available.  CLooG-PPL 0.15 as well as CLooG 0.16.
-The former is the default right now.  It can be downloaded from
-@uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/} as
-@file{cloog-ppl-0.15.tar.gz}.
+Necessary to build GCC with the Graphite loop optimizations.  It is
+available from @uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/} as
+@file{cloog-0.16.3.tar.gz}.  Even if CLooG 0.16 does not use PPL, PPL
+is still required for Graphite.
 
-CLooG 0.16 support is still in testing stage, but will be the
-default in future GCC releases.  It is also available at
-@uref{ftp://gcc.gnu.org/pub/gcc/infrastructure/} as
-@file{cloog-0.16.1.tar.gz}.  To use it add the additional configure
-option @option{--enable-cloog-backend=isl}.  Even if CLooG 0.16
-does not use PPL, PPL is still required for Graphite.
-
-In both cases @option{--with-cloog} configure option should be used
-if CLooG is not installed in your default library search path.
+The configure option @option{--with-cloog} should be used if CLooG is
+not installed in your default library search path.
 
 @end table
 
-- 
1.7.4.1


^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-22  0:37 ` [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Sebastian Pop
@ 2011-07-26 19:04   ` Sebastian Pop
  0 siblings, 0 replies; 22+ messages in thread
From: Sebastian Pop @ 2011-07-26 19:04 UTC (permalink / raw)
  To: Tobias Grosser
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf.Wildenhues

On Thu, Jul 21, 2011 at 18:45, Sebastian Pop <sebpop@gmail.com> wrote:
> Hi Tobias,
>
> On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
>> Hi,
>>
>> I propose to switch to the official cloog.org cloog version with isl backend and
>> at the same time to remove support for both CLooG-PPL legacy as well as
>> CLooG-Parma.
>>
>
> Many thanks for implementing this cleanup.
>
>> We want to switch to cloog-isl as it is the only officially maintained version
>> of cloog. Furthermore, it provides features that will help to fix some bugs in
>> the graphite code generation[1].
>> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
>> new CloogInput library interface. This interface is not available the old CLooG.
>> I plan to move graphite to this interface. As I do not see enough benefits from
>> being able to use CLooG PPL, I decided to not introduce any compatibility
>> scheme, but just remove any code that is only needed for CLooG-PPL.
>> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
>> actively maintained and not well tested. I believe our time is better spent on
>> improving graphite or cloog isl, as in putting time into this cloog version.
>>
>> So here we are: Moving graphite back to the official cloog.org version!
>>
>> Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
>> amd64.
>>
>> Cheers
>> Tobi
>>
>> P.S.: Why do we move to the super latest one. Because we expect that most users
>> would need an update, and, as we will soon use some of the newer features, there
>> is no need to force another update later.
>>
>>
>> Tobias Grosser (3):
>>  Make CLooG isl the only supported CLooG version.
>>  Require cloog 0.16.3
>>  Remove code that supported legacy CLooG.
>
> For all your changes, you would need the ok from a configure maintainer.

Ping maintainers of the "build machinery (*.in)".

Thanks,
Sebastian

> The changes to the graphite framework are ok.
>
> Thanks,
> Sebastian
>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
                   ` (3 preceding siblings ...)
  2011-07-22 12:38 ` Joseph S. Myers
@ 2011-07-27 16:43 ` Jack Howarth
  2011-07-28 17:51   ` Tobias Grosser
  4 siblings, 1 reply; 22+ messages in thread
From: Jack Howarth @ 2011-07-27 16:43 UTC (permalink / raw)
  To: Tobias Grosser, @bromo.med.uc.edu; +Cc: gcc-patches, sebpop

On Fri, Jul 22, 2011 at 01:00:09AM +0200, Tobias Grosser wrote:
> Hi,
> 
> I propose to switch to the official cloog.org cloog version with isl backend and
> at the same time to remove support for both CLooG-PPL legacy as well as
> CLooG-Parma.
> 
> We want to switch to cloog-isl as it is the only officially maintained version
> of cloog. Furthermore, it provides features that will help to fix some bugs in
> the graphite code generation[1].
> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
> new CloogInput library interface. This interface is not available the old CLooG.
> I plan to move graphite to this interface. As I do not see enough benefits from
> being able to use CLooG PPL, I decided to not introduce any compatibility
> scheme, but just remove any code that is only needed for CLooG-PPL.
> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
> actively maintained and not well tested. I believe our time is better spent on
> improving graphite or cloog isl, as in putting time into this cloog version.
> 
> So here we are: Moving graphite back to the official cloog.org version!
> 
> Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
> amd64.
> 
> Cheers
> Tobi

Tobi,
   Are there any additional plans for gcc 4.7? In particular, wasn't the -fgraphite-identity
option supported to be enabled at -O3 by defaulting ftree-loop-linear on which is now an alias
of -floop-interchange since gcc 4.6?
                  Jack

> 
> P.S.: Why do we move to the super latest one. Because we expect that most users
> would need an update, and, as we will soon use some of the newer features, there
> is no need to force another update later.
> 
> 
> Tobias Grosser (3):
>   Make CLooG isl the only supported CLooG version.
>   Require cloog 0.16.3
>   Remove code that supported legacy CLooG.
> 
>  ChangeLog                      |   17 +++
>  config/cloog.m4                |  109 ++--------------
>  configure                      |  176 ++------------------------
>  configure.ac                   |    2 +-
>  gcc/ChangeLog                  |   18 +++
>  gcc/Makefile.in                |    4 +-
>  gcc/graphite-clast-to-gimple.c |   93 ++++++--------
>  gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
>  gcc/graphite-cloog-util.c      |   15 +--
>  gcc/graphite-cloog-util.h      |    1 -
>  gcc/graphite.c                 |    2 -
>  11 files changed, 106 insertions(+), 606 deletions(-)
>  delete mode 100644 gcc/graphite-cloog-compat.h
> 
> -- 
> 1.7.4.1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-26 18:55   ` Sebastian Pop
@ 2011-07-28 17:21     ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-28 17:21 UTC (permalink / raw)
  To: Sebastian Pop; +Cc: Joseph S. Myers, gcc-patches

On 07/26/2011 08:30 PM, Sebastian Pop wrote:
> On Fri, Jul 22, 2011 at 07:32, Joseph S. Myers<joseph@codesourcery.com>  wrote:
>> On Fri, 22 Jul 2011, Tobias Grosser wrote:
>>
>>> I propose to switch to the official cloog.org cloog version with isl backend and
>>> at the same time to remove support for both CLooG-PPL legacy as well as
>>> CLooG-Parma.
>>
>> Where are the install.texi changes in this patch series?
>
> Please see the attached patch.

Thanks Sebastian.

Can you take care of uploading cloog-0.16.3 to the gcc ftp site?

Cheers
Tobi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend.
  2011-07-27 16:43 ` Jack Howarth
@ 2011-07-28 17:51   ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-07-28 17:51 UTC (permalink / raw)
  To: Jack Howarth; +Cc: gcc-patches, sebpop

On 07/27/2011 06:20 PM, Jack Howarth wrote:
> On Fri, Jul 22, 2011 at 01:00:09AM +0200, Tobias Grosser wrote:
>> Hi,
>>
>> I propose to switch to the official cloog.org cloog version with isl backend and
>> at the same time to remove support for both CLooG-PPL legacy as well as
>> CLooG-Parma.
>>
>> We want to switch to cloog-isl as it is the only officially maintained version
>> of cloog. Furthermore, it provides features that will help to fix some bugs in
>> the graphite code generation[1].
>> The reason to abond CLooG-PPL (legacy version) is, that cloog-isl provides the
>> new CloogInput library interface. This interface is not available the old CLooG.
>> I plan to move graphite to this interface. As I do not see enough benefits from
>> being able to use CLooG PPL, I decided to not introduce any compatibility
>> scheme, but just remove any code that is only needed for CLooG-PPL.
>> I also removed CLooG-Parma (cloog.org with PPL backend), as it is currently not
>> actively maintained and not well tested. I believe our time is better spent on
>> improving graphite or cloog isl, as in putting time into this cloog version.
>>
>> So here we are: Moving graphite back to the official cloog.org version!
>>
>> Passes 'make check RUNTESTFLAGS=graphite.exp' as well as a bootstrap on Linux
>> amd64.
>>
>> Cheers
>> Tobi
>
> Tobi,
>     Are there any additional plans for gcc 4.7? In particular, wasn't the -fgraphite-identity
> option supported to be enabled at -O3 by defaulting ftree-loop-linear on which is now an alias
> of -floop-interchange since gcc 4.6?
>                    Jack

Hi Jack,

I personally do not have any fixed plans for something that needs to be 
in 4.7. Here is a list of open topics, that will be fixed if time allows 
(or someone funds my time):

- Remove dependency to PPL (as Richi mentioned)
- Integrate region based scop detection
- Use isl scheduling (Pluto like) to automatically tile the code
- Integrate Konrad's data flow patches (if he submits them)

Cheers
Tobi

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 1/3] Make CLooG isl the only supported CLooG version.
  2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
  2011-07-21 23:47   ` [PATCH 2/3] Require cloog 0.16.3 Tobias Grosser
@ 2011-08-02 15:47   ` Sebastian Pop
  2011-08-11  2:01     ` Tobias Grosser
  1 sibling, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-08-02 15:47 UTC (permalink / raw)
  To: Tobias Grosser
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

Ping.

Could one of the configure maintainers review these changes?

Thanks,
Sebastian

On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
> 2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * configure: Regenerated.
>        * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
>        both cloog.org and legacy versions. The only supported version will
>        be CLooG with the isl backend.
> ---
>  ChangeLog       |    7 ++
>  config/cloog.m4 |  107 +++-------------------------------
>  configure       |  170 +++----------------------------------------------------
>  3 files changed, 26 insertions(+), 258 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 6a27fb7..a08a780 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2011-07-21  Tobias Grosser  <tobias@grosser.es>
> +
> +       * configure: Regenerated.
> +       * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
> +       both cloog.org and legacy versions. The only supported version will
> +       be CLooG with the isl backend.
> +
>  2011-07-21  Joseph Myers  <joseph@codesourcery.com>
>
>        * MAINTAINERS (Global Reviewers): Add self.
> diff --git a/config/cloog.m4 b/config/cloog.m4
> index e95b98d..8662acd 100644
> --- a/config/cloog.m4
> +++ b/config/cloog.m4
> @@ -37,17 +37,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
>       [--with-cloog-lib=PATH],
>       [Specify the directory for the installed CLooG library])])
>
> -  AC_ARG_ENABLE(cloog-backend,
> -    [AS_HELP_STRING(
> -      [--enable-cloog-backend[[=BACKEND]]],
> -      [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
> -    [ if   test "x${enableval}" = "xisl"; then
> -       cloog_backend=isl
> -      elif test "x${enableval}" = "xppl"; then
> -       cloog_backend=ppl
> -      else
> -       cloog_backend=ppl-legacy
> -      fi], cloog_backend=ppl-legacy)
>   AC_ARG_ENABLE(cloog-version-check,
>     [AS_HELP_STRING(
>       [--disable-cloog-version-check],
> @@ -107,23 +96,6 @@ m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM(
>   [#include "cloog/cloog.h" ],
>   [cloog_version ()])])
>
> -# _CLOOG_ORG_PROG_PPL ()
> -# ------------------
> -# Helper for detecting CLooG.org's PPL backend.
> -m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM(
> -  [#include "cloog/cloog.h"
> -   #include "cloog/ppl/cloog.h"],
> -  [cloog_version ()])])
> -
> -# _CLOOG_PPL_LEGACY_PROG ()
> -# -------------------------
> -# Helper for detecting CLooG-Legacy (CLooG-PPL).
> -m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM(
> -  [#include "cloog/cloog.h"],
> -  [#ifndef CLOOG_PPL_BACKEND
> -    choke me
> -   #endif ])])
> -
>  # CLOOG_FIND_FLAGS ()
>  # ------------------
>  # Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org.
> @@ -144,49 +116,17 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
>   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
>   LDFLAGS="${LDFLAGS} ${clooglibs}"
>
> -  case $cloog_backend in
> -    "ppl-legacy")
> -    CFLAGS="${CFLAGS} ${pplinc}"
> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
> -    AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type],
> -      [LIBS="-lcloog ${_cloog_saved_LIBS}"
> -      AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"],
> -                    [gcc_cv_cloog_type=no])])
> -    ;;
> -    "isl")
> -    AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
> -      [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
> -      AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
> -                    [gcc_cv_cloog_type=no])])
> -    ;;
> -    "ppl")
> -    CFLAGS="${CFLAGS} ${pplinc}"
> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
> -    AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type],
> -      [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
> -      AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"],
> -                    [gcc_cv_cloog_type=no])])
> -    ;;
> -    *)
> -      gcc_cv_cloog_type=""
> -  esac
> +  AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
> +    [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
> +    AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
> +                  [gcc_cv_cloog_type=no])])
>
>   case $gcc_cv_cloog_type in
> -    "PPL Legacy")
> -      clooginc="${clooginc}"
> -      clooglibs="${clooglibs} -lcloog"
> -      cloog_org=no
> -      ;;
>     "ISL")
>       clooginc="${clooginc} ${_cloogorginc}"
>       clooglibs="${clooglibs} -lcloog-isl -lisl"
>       cloog_org=yes
>       ;;
> -    "PPL")
> -      clooginc="${clooginc} ${_cloogorginc}"
> -      clooglibs="${clooglibs} -lcloog-ppl"
> -      cloog_org=yes
> -      ;;
>     *)
>       clooglibs=
>       clooginc=
> @@ -212,25 +152,10 @@ m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM(
>     choke me
>    #endif])])
>
> -# _CLOOG_CHECK_RT_PROG ()
> -# -----------------------
> -# Helper for verifying that CLooG's compile time version
> -# matches the run time version.
> -m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM(
> -  [#include "cloog/cloog.h"],
> -  [if ((cloog_version_major () != CLOOG_VERSION_MAJOR)
> -    && (cloog_version_minor () != CLOOG_VERSION_MINOR)
> -    && (cloog_version_revision () != CLOOG_VERSION_REVISION))
> -    {
> -      return 1;
> -    }])])
> -
>  # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION)
>  # ----------------------------------------------------------------
>  # Test the found CLooG to be exact of version MAJOR.MINOR and at least
>  # REVISION.
> -# If we're using the old CLooG-PPL (Legacy), the old version check will
> -# be executed (Ignores the provided version information).
>  AC_DEFUN([CLOOG_CHECK_VERSION],
>  [
>   AC_REQUIRE([CLOOG_FIND_FLAGS])
> @@ -242,21 +167,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
>     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>
> -    if test "${cloog_org}" = yes ; then
> -      AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
> -        [gcc_cv_cloog_ct_0_14_0],
> -        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
> -          [gcc_cv_cloog_ct_0_14_0=yes],
> -          [gcc_cv_cloog_ct_0_14_0=no])])
> -    elif test "${cloog_org}" = no ; then
> -      AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG],
> -        [gcc_cv_cloog_ct_0_15_5],
> -        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)],
> -          [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)],
> -           [gcc_cv_cloog_ct_0_15_5=yes],
> -            [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])],
> -          [gcc_cv_cloog_ct_0_15_5=no])])
> -    fi
> +    AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
> +      [gcc_cv_cloog],
> +      [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
> +       [gcc_cv_cloog=yes],
> +       [gcc_cv_cloog=no])])
>
>     CFLAGS=$_cloog_saved_CFLAGS
>     LDFLAGS=$_cloog_saved_LDFLAGS
> @@ -272,9 +187,7 @@ AC_DEFUN([CLOOG_IF_FAILED],
>  [
>   CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
>
> -  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
> -    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
> -    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
> +  if test "${gcc_cv_cloog}" = no ; then
>     clooglibs=
>     clooginc=
>   fi
> diff --git a/configure b/configure
> index facf3e4..6608b86 100755
> --- a/configure
> +++ b/configure
> @@ -775,7 +775,6 @@ enable_ppl_version_check
>  with_cloog
>  with_cloog_include
>  with_cloog_lib
> -enable_cloog_backend
>  enable_cloog_version_check
>  enable_lto
>  enable_stage1_languages
> @@ -1472,9 +1471,6 @@ Optional Features:
>                           build stages 2 and 3 with C++, not C
>   --disable-ppl-version-check
>                           disable check for PPL version
> -  --enable-cloog-backend[=BACKEND]
> -                          set the CLooG BACKEND used to either isl, ppl or
> -                          ppl-legacy (default)
>   --disable-cloog-version-check
>                           disable check for CLooG version
>   --enable-lto            enable link time optimization support
> @@ -5709,19 +5705,6 @@ if test "${with_cloog_lib+set}" = set; then :
>  fi
>
>
> -  # Check whether --enable-cloog-backend was given.
> -if test "${enable_cloog_backend+set}" = set; then :
> -  enableval=$enable_cloog_backend;  if   test "x${enableval}" = "xisl"; then
> -       cloog_backend=isl
> -      elif test "x${enableval}" = "xppl"; then
> -       cloog_backend=ppl
> -      else
> -       cloog_backend=ppl-legacy
> -      fi
> -else
> -  cloog_backend=ppl-legacy
> -fi
> -
>   # Check whether --enable-cloog-version-check was given.
>  if test "${enable_cloog_version_check+set}" = set; then :
>   enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval
> @@ -5794,48 +5777,13 @@ if test "x$with_cloog" != "xno"; then
>   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
>   LDFLAGS="${LDFLAGS} ${clooglibs}"
>
> -  case $cloog_backend in
> -    "ppl-legacy")
> -    CFLAGS="${CFLAGS} ${pplinc}"
> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5
> -$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; }
> -if test "${gcc_cv_cloog_type+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  LIBS="-lcloog ${_cloog_saved_LIBS}"
> -      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include "cloog/cloog.h"
> -int
> -main ()
> -{
> -#ifndef CLOOG_PPL_BACKEND
> -    choke me
> -   #endif
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  gcc_cv_cloog_type="PPL Legacy"
> -else
> -  gcc_cv_cloog_type=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
> -$as_echo "$gcc_cv_cloog_type" >&6; }
> -    ;;
> -    "isl")
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5
> +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5
>  $as_echo_n "checking for installed CLooG ISL... " >&6; }
>  if test "${gcc_cv_cloog_type+set}" = set; then :
>   $as_echo_n "(cached) " >&6
>  else
>   LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
> -      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  #include "cloog/cloog.h"
>  int
> @@ -5856,59 +5804,13 @@ rm -f core conftest.err conftest.$ac_objext \
>  fi
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
>  $as_echo "$gcc_cv_cloog_type" >&6; }
> -    ;;
> -    "ppl")
> -    CFLAGS="${CFLAGS} ${pplinc}"
> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5
> -$as_echo_n "checking for installed CLooG PPL... " >&6; }
> -if test "${gcc_cv_cloog_type+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
> -      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include "cloog/cloog.h"
> -   #include "cloog/ppl/cloog.h"
> -int
> -main ()
> -{
> -cloog_version ()
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_link "$LINENO"; then :
> -  gcc_cv_cloog_type="PPL"
> -else
> -  gcc_cv_cloog_type=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext \
> -    conftest$ac_exeext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5
> -$as_echo "$gcc_cv_cloog_type" >&6; }
> -    ;;
> -    *)
> -      gcc_cv_cloog_type=""
> -  esac
>
>   case $gcc_cv_cloog_type in
> -    "PPL Legacy")
> -      clooginc="${clooginc}"
> -      clooglibs="${clooglibs} -lcloog"
> -      cloog_org=no
> -      ;;
>     "ISL")
>       clooginc="${clooginc} ${_cloogorginc}"
>       clooglibs="${clooglibs} -lcloog-isl -lisl"
>       cloog_org=yes
>       ;;
> -    "PPL")
> -      clooginc="${clooginc} ${_cloogorginc}"
> -      clooglibs="${clooglibs} -lcloog-ppl"
> -      cloog_org=yes
> -      ;;
>     *)
>       clooglibs=
>       clooginc=
> @@ -5932,10 +5834,9 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
>     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>
> -    if test "${cloog_org}" = yes ; then
> -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
>  $as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
> -if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
> +if test "${gcc_cv_cloog+set}" = set; then :
>   $as_echo_n "(cached) " >&6
>  else
>   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> @@ -5954,65 +5855,14 @@ main ()
>  }
>  _ACEOF
>  if ac_fn_c_try_compile "$LINENO"; then :
> -  gcc_cv_cloog_ct_0_14_0=yes
> -else
> -  gcc_cv_cloog_ct_0_14_0=no
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0" >&5
> -$as_echo "$gcc_cv_cloog_ct_0_14_0" >&6; }
> -    elif test "${cloog_org}" = no ; then
> -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG" >&5
> -$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... " >&6; }
> -if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then :
> -  $as_echo_n "(cached) " >&6
> -else
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include "cloog/cloog.h"
> -int
> -main ()
> -{
> -#if CLOOG_VERSION_MAJOR != 0 \
> -    || CLOOG_VERSION_MINOR != 15 \
> -    || CLOOG_VERSION_REVISION < 5
> -    choke me
> -   #endif
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> -/* end confdefs.h.  */
> -#include "cloog/cloog.h"
> -int
> -main ()
> -{
> -#if CLOOG_VERSION_MAJOR != 0 \
> -    || CLOOG_VERSION_MINOR != 15 \
> -    || CLOOG_VERSION_REVISION < 9
> -    choke me
> -   #endif
> -  ;
> -  return 0;
> -}
> -_ACEOF
> -if ac_fn_c_try_compile "$LINENO"; then :
> -  gcc_cv_cloog_ct_0_15_5=yes
> -else
> -  gcc_cv_cloog_ct_0_15_5="buggy but acceptable"
> -fi
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +  gcc_cv_cloog=yes
>  else
> -  gcc_cv_cloog_ct_0_15_5=no
> +  gcc_cv_cloog=no
>  fi
>  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>  fi
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5" >&5
> -$as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
> -    fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
> +$as_echo "$gcc_cv_cloog" >&6; }
>
>     CFLAGS=$_cloog_saved_CFLAGS
>     LDFLAGS=$_cloog_saved_LDFLAGS
> @@ -6036,9 +5886,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
>
>
>
> -  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
> -    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
> -    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
> +  if test "${gcc_cv_cloog}" = no ; then
>     clooglibs=
>     clooginc=
>   fi
> --
> 1.7.4.1
>
>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Require cloog 0.16.3
  2011-07-21 23:47   ` [PATCH 2/3] Require cloog 0.16.3 Tobias Grosser
  2011-07-21 23:51     ` [PATCH 3/3] Remove code that supported legacy CLooG Tobias Grosser
@ 2011-08-02 15:48     ` Sebastian Pop
  2011-08-11  2:38       ` Tobias Grosser
  1 sibling, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-08-02 15:48 UTC (permalink / raw)
  To: Tobias Grosser
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

Ping.

Could one of the configure maintainers review these changes?

Thanks,
Sebastian


On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
> 2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * configure: Regenerated.
>        * configure.ac: Require cloog isl 0.16.3
> ---
>  ChangeLog    |    5 +++++
>  configure    |    6 +++---
>  configure.ac |    2 +-
>  3 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index a08a780..3d83bd2 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,6 +1,11 @@
>  2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * configure: Regenerated.
> +       * configure.ac: Require cloog isl 0.16.3
> +
> +2011-07-21  Tobias Grosser  <tobias@grosser.es>
> +
> +       * configure: Regenerated.
>        * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
>        both cloog.org and legacy versions. The only supported version will
>        be CLooG with the isl backend.
> diff --git a/configure b/configure
> index 6608b86..57f099b 100755
> --- a/configure
> +++ b/configure
> @@ -5834,8 +5834,8 @@ $as_echo "$gcc_cv_cloog_type" >&6; }
>     CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>
> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
> -$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
> +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.3 of CLooG" >&5
> +$as_echo_n "checking for version 0.16.3 of CLooG... " >&6; }
>  if test "${gcc_cv_cloog+set}" = set; then :
>   $as_echo_n "(cached) " >&6
>  else
> @@ -5847,7 +5847,7 @@ main ()
>  {
>  #if CLOOG_VERSION_MAJOR != 0 \
>     || CLOOG_VERSION_MINOR != 16 \
> -    || CLOOG_VERSION_REVISION < 1
> +    || CLOOG_VERSION_REVISION < 3
>     choke me
>    #endif
>   ;
> diff --git a/configure.ac b/configure.ac
> index e64e577..00325a1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1588,7 +1588,7 @@ if test "x$with_cloog" != "xno"; then
>   dnl
>   dnl If we use CLooG-Legacy, the provided version information is
>   dnl ignored.
> -  CLOOG_CHECK_VERSION(0,16,1)
> +  CLOOG_CHECK_VERSION(0,16,3)
>
>   dnl Only execute fail-action, if CLooG has been requested.
>   CLOOG_IF_FAILED([
> --
> 1.7.4.1
>
>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 3/3] Remove code that supported legacy CLooG.
  2011-07-21 23:51     ` [PATCH 3/3] Remove code that supported legacy CLooG Tobias Grosser
  2011-07-22  0:38       ` Sebastian Pop
@ 2011-08-02 15:48       ` Sebastian Pop
  2011-08-11  3:24         ` Tobias Grosser
  1 sibling, 1 reply; 22+ messages in thread
From: Sebastian Pop @ 2011-08-02 15:48 UTC (permalink / raw)
  To: Tobias Grosser
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

Ping.

Could one of the configure maintainers review these changes?

Thanks,
Sebastian

On Thu, Jul 21, 2011 at 18:00, Tobias Grosser <tobias@grosser.es> wrote:
> 2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * configure: Regenerated.
>        * config/cloog.m4: Do not define CLOOG_ORG
>
> and in gcc/
>
> 2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
>        Remove graphite-cloog-util.h.
>        * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
>        build_iv_mapping, translate_clast_user, translate_clast,
>        free_scattering, initialize_cloog_names, build_cloog_prog,
>        create_params_index): Do not use old compatibility functions.
>        (clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
>        * graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
>        compatibility functions.
>        (new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
>        cloog.
>        * graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
>        * graphite.c (graphite.c): Do not call outdated cloog_initialize() and
>        cloog_finalize().
>        * graphite-cloog-compat.h: Remove.
> ---
>  ChangeLog                      |    5 +
>  config/cloog.m4                |    2 +-
>  configure                      |    2 +-
>  gcc/ChangeLog                  |   18 +++
>  gcc/Makefile.in                |    4 +-
>  gcc/graphite-clast-to-gimple.c |   93 ++++++--------
>  gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
>  gcc/graphite-cloog-util.c      |   15 +--
>  gcc/graphite-cloog-util.h      |    1 -
>  gcc/graphite.c                 |    2 -
>  10 files changed, 72 insertions(+), 345 deletions(-)
>  delete mode 100644 gcc/graphite-cloog-compat.h
>
> diff --git a/ChangeLog b/ChangeLog
> index 3d83bd2..9499da4 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,6 +1,11 @@
>  2011-07-21  Tobias Grosser  <tobias@grosser.es>
>
>        * configure: Regenerated.
> +       * config/cloog.m4: Do not define CLOOG_ORGt
> +
> +2011-07-21  Tobias Grosser  <tobias@grosser.es>
> +
> +       * configure: Regenerated.
>        * configure.ac: Require cloog isl 0.16.3
>
>  2011-07-21  Tobias Grosser  <tobias@grosser.es>
> diff --git a/config/cloog.m4 b/config/cloog.m4
> index 8662acd..9c42445 100644
> --- a/config/cloog.m4
> +++ b/config/cloog.m4
> @@ -109,7 +109,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
>   _cloog_saved_LDFLAGS=$LDFLAGS
>   _cloog_saved_LIBS=$LIBS
>
> -  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
> +  _cloogorginc="-DCLOOG_INT_GMP"
>
>   dnl clooglibs & clooginc may have been initialized by CLOOG_INIT_FLAGS.
>   CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
> diff --git a/configure b/configure
> index 57f099b..8de7bc69 100755
> --- a/configure
> +++ b/configure
> @@ -5771,7 +5771,7 @@ if test "x$with_cloog" != "xno"; then
>   _cloog_saved_LDFLAGS=$LDFLAGS
>   _cloog_saved_LIBS=$LIBS
>
> -  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
> +  _cloogorginc="-DCLOOG_INT_GMP"
>
>     CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
>   CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
> diff --git a/gcc/ChangeLog b/gcc/ChangeLog
> index b9d95fa..b6009b7 100644
> --- a/gcc/ChangeLog
> +++ b/gcc/ChangeLog
> @@ -1,3 +1,21 @@
> +2011-07-21  Tobias Grosser  <tobias@grosser.es>
> +
> +       * Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
> +       Remove graphite-cloog-util.h.
> +       * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
> +       build_iv_mapping, translate_clast_user, translate_clast,
> +       free_scattering, initialize_cloog_names, build_cloog_prog,
> +       create_params_index): Do not use old compatibility functions.
> +       (clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
> +       * graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
> +       compatibility functions.
> +       (new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
> +       cloog.
> +       * graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
> +       * graphite.c (graphite.c): Do not call outdated cloog_initialize() and
> +       cloog_finalize().
> +       * graphite-cloog-compat.h: Remove.
> +
>  2011-07-21  Georg-Johann Lay  <avr@gjlay.de>
>
>        * config/avr/avr.c (final_prescan_insn): Fix printing of rtx_costs.
> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> index d924fb6..c5a2f7f 100644
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -2690,9 +2690,9 @@ graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \
>    $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
>    $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \
>    graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \
> -   graphite-dependences.h graphite-cloog-compat.h
> +   graphite-dependences.h
>  graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
> -   coretypes.h graphite-cloog-util.h graphite-cloog-compat.h
> +   coretypes.h graphite-cloog-util.h
>  graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
>    coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
>    sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \
> diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
> index 6b17631..da9b84f 100644
> --- a/gcc/graphite-clast-to-gimple.c
> +++ b/gcc/graphite-clast-to-gimple.c
> @@ -38,7 +38,8 @@ along with GCC; see the file COPYING3.  If not see
>  #include "graphite-poly.h"
>  #include "graphite-clast-to-gimple.h"
>  #include "graphite-dependences.h"
> -#include "graphite-cloog-compat.h"
> +
> +typedef const struct clast_expr *clast_name_p;
>
>  /* This flag is set when an error occurred during the translation of
>    CLAST to Gimple.  */
> @@ -86,12 +87,8 @@ clast_name_to_index (clast_name_p name, htab_t index_table)
>   struct clast_name_index tmp;
>   PTR *slot;
>
> -#ifdef CLOOG_ORG
>   gcc_assert (name->type == clast_expr_name);
>   tmp.name = ((const struct clast_name *) name)->name;
> -#else
> -  tmp.name = name;
> -#endif
>
>   slot = htab_find_slot (index_table, &tmp, NO_INSERT);
>
> @@ -683,7 +680,7 @@ gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for, int level,
>   struct clast_stmt *stmt = (struct clast_stmt *) stmt_for;
>   struct clast_user_stmt *body = clast_get_body_of_loop (stmt);
>   CloogStatement *cs = body->statement;
> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
> +  poly_bb_p pbb = (poly_bb_p) cs->usr;
>
>   return max_signed_precision_type (lb_type, max_precision_type
>                                    (ub_type, compute_type_for_level
> @@ -740,7 +737,7 @@ build_iv_mapping (VEC (tree, heap) *iv_map, sese region,
>   struct clast_stmt *t;
>   int depth = 0;
>   CloogStatement *cs = user_stmt->statement;
> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
> +  poly_bb_p pbb = (poly_bb_p) cs->usr;
>   gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
>
>   for (t = user_stmt->substitutions; t; t = t->next, depth++)
> @@ -856,7 +853,7 @@ translate_clast_user (sese region, struct clast_user_stmt *stmt, edge next_e,
>  {
>   int i, nb_loops;
>   basic_block new_bb;
> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (stmt->statement);
> +  poly_bb_p pbb = (poly_bb_p) stmt->statement->usr;
>   gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
>   VEC (tree, heap) *iv_map;
>
> @@ -1076,8 +1073,8 @@ free_scattering (CloogScatteringList *scattering)
>  {
>   while (scattering)
>     {
> -      CloogScattering *dom = cloog_scattering (scattering);
> -      CloogScatteringList *next = cloog_next_scattering (scattering);
> +      CloogScattering *dom = scattering->scatt;
> +      CloogScatteringList *next = scattering->next;
>
>       cloog_scattering_free (dom);
>       free (scattering);
> @@ -1095,13 +1092,13 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>   sese region = SCOP_REGION (scop);
>   int i;
>   int nb_iterators = scop_max_loop_depth (scop);
> -  int nb_scattering = cloog_program_nb_scattdims (prog);
> +  int nb_scattering = prog->nb_scattdims;
>   int nb_parameters = VEC_length (tree, SESE_PARAMS (region));
>   char **iterators = XNEWVEC (char *, nb_iterators * 2);
>   char **scattering = XNEWVEC (char *, nb_scattering);
>   char **parameters= XNEWVEC (char *, nb_parameters);
>
> -  cloog_program_set_names (prog, cloog_names_malloc ());
> +  prog->names = cloog_names_malloc ();
>
>   for (i = 0; i < nb_parameters; i++)
>     {
> @@ -1118,8 +1115,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>       snprintf (parameters[i], len, "%s_%d", name, SSA_NAME_VERSION (param));
>     }
>
> -  cloog_names_set_nb_parameters (cloog_program_names (prog), nb_parameters);
> -  cloog_names_set_parameters (cloog_program_names (prog), parameters);
> +  prog->names->nb_parameters = nb_parameters;
> +  prog->names->parameters = parameters;
>
>   for (i = 0; i < nb_iterators; i++)
>     {
> @@ -1128,10 +1125,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>       snprintf (iterators[i], len, "git_%d", i);
>     }
>
> -  cloog_names_set_nb_iterators (cloog_program_names (prog),
> -                               nb_iterators);
> -  cloog_names_set_iterators (cloog_program_names (prog),
> -                            iterators);
> +  prog->names->nb_iterators = nb_iterators;
> +  prog->names->iterators = iterators;
>
>   for (i = 0; i < nb_scattering; i++)
>     {
> @@ -1140,10 +1135,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>       snprintf (scattering[i], len, "scat_%d", i);
>     }
>
> -  cloog_names_set_nb_scattering (cloog_program_names (prog),
> -                                nb_scattering);
> -  cloog_names_set_scattering (cloog_program_names (prog),
> -                             scattering);
> +  prog->names->nb_scattering = nb_scattering;
> +  prog->names->scattering = scattering;
>  }
>
>  /* Initialize a CLooG input file.  */
> @@ -1186,12 +1179,13 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>   int nbs = 2 * max_nb_loops + 1;
>   int *scaldims;
>
> -  cloog_program_set_context
> -    (prog, new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
> -      scop_nb_params (scop), cloog_state));
> +  prog->context =
> +    new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
> +                                                scop_nb_params (scop),
> +                                                cloog_state);
>   nbs = unify_scattering_dimensions (scop);
>   scaldims = (int *) xmalloc (nbs * (sizeof (int)));
> -  cloog_program_set_nb_scattdims (prog, nbs);
> +  prog->nb_scattdims = nbs;
>   initialize_cloog_names (scop, prog);
>
>   FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
> @@ -1211,14 +1205,14 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>                                                          scop_nb_params (scop),
>                                                          cloog_state);
>       block = cloog_block_alloc (stmt, 0, NULL, pbb_dim_iter_domain (pbb));
> -      cloog_statement_set_usr (stmt, pbb);
> +      stmt->usr = pbb;
>
>       /* Build loop list.  */
>       {
>         CloogLoop *new_loop_list = cloog_loop_malloc (cloog_state);
> -        cloog_loop_set_next (new_loop_list, loop_list);
> -        cloog_loop_set_domain (new_loop_list, dom);
> -        cloog_loop_set_block (new_loop_list, block);
> +        new_loop_list->next = loop_list;
> +        new_loop_list->domain = dom;
> +        new_loop_list->block = block;
>         loop_list = new_loop_list;
>       }
>
> @@ -1226,8 +1220,8 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>       {
>         CloogBlockList *new_block_list = cloog_block_list_malloc ();
>
> -        cloog_block_list_set_next (new_block_list, block_list);
> -        cloog_block_list_set_block (new_block_list, block);
> +        new_block_list->next = block_list;
> +        new_block_list->block = block;
>         block_list = new_block_list;
>       }
>
> @@ -1244,19 +1238,19 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>           (scat, scop_nb_params (scop), pbb_nb_scattering_transform (pbb),
>            cloog_state);
>
> -        cloog_set_next_scattering (new_scattering, scattering);
> -        cloog_set_scattering (new_scattering, dom);
> +        new_scattering->next = scattering;
> +        new_scattering->scatt = dom;
>         scattering = new_scattering;
>       }
>     }
>
> -  cloog_program_set_loop (prog, loop_list);
> -  cloog_program_set_blocklist (prog, block_list);
> +  prog->loop = loop_list;
> +  prog->blocklist = block_list;
>
>   for (i = 0; i < nbs; i++)
>     scaldims[i] = 0 ;
>
> -  cloog_program_set_scaldims (prog, scaldims);
> +  prog->scaldims = scaldims;
>
>   /* Extract scalar dimensions to simplify the code generation problem.  */
>   cloog_program_extract_scalars (prog, scattering, options);
> @@ -1277,22 +1271,21 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>   free_scattering (scattering);
>
>   /* Iterators corresponding to scalar dimensions have to be extracted.  */
> -  cloog_names_scalarize (cloog_program_names (prog), nbs,
> -                        cloog_program_scaldims (prog));
> +  cloog_names_scalarize (prog->names, nbs, prog->scaldims);
>
>   /* Free blocklist.  */
>   {
> -    CloogBlockList *next = cloog_program_blocklist (prog);
> +    CloogBlockList *next = prog->blocklist;
>
>     while (next)
>       {
>         CloogBlockList *toDelete = next;
> -        next = cloog_block_list_next (next);
> -        cloog_block_list_set_next (toDelete, NULL);
> -        cloog_block_list_set_block (toDelete, NULL);
> +        next = next->next;
> +        toDelete->next =  NULL;
> +        toDelete->block = NULL;
>         cloog_block_list_free (toDelete);
>       }
> -    cloog_program_set_blocklist (prog, NULL);
> +    prog->blocklist = NULL;
>   }
>  }
>
> @@ -1314,14 +1307,8 @@ set_cloog_options (void)
>      GLooG.  */
>   options->esp = 1;
>
> -#ifdef CLOOG_ORG
>   /* Silence CLooG to avoid failing tests due to debug output to stderr.  */
>   options->quiet = 1;
> -#else
> -  /* Enable C pretty-printing mode: normalizes the substitution
> -     equations for statements.  */
> -  options->cpp = 1;
> -#endif
>
>   /* Allow cloog to build strides with a stride width different to one.
>      This example has stride = 4:
> @@ -1419,9 +1406,9 @@ debug_generated_program (scop_p scop)
>
>  static void
>  create_params_index (htab_t index_table, CloogProgram *prog) {
> -  CloogNames* names = cloog_program_names (prog);
> -  int nb_parameters = cloog_names_nb_parameters (names);
> -  char **parameters = cloog_names_parameters (names);
> +  CloogNames* names = prog->names;
> +  int nb_parameters = names->nb_parameters;
> +  char **parameters = names->parameters;
>   int i;
>
>   for (i = 0; i < nb_parameters; i++)
> diff --git a/gcc/graphite-cloog-compat.h b/gcc/graphite-cloog-compat.h
> deleted file mode 100644
> index 011377d..0000000
> --- a/gcc/graphite-cloog-compat.h
> +++ /dev/null
> @@ -1,275 +0,0 @@
> -/* Compatibility layer for using upstream CLooG versions with
> -   CLooG legacy code.
> -   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
> -   Contributed by Andreas Simbuerger <simbuerg@fim.uni-passau.de>.
> -
> -This file is part of GCC.
> -
> -GCC is free software; you can redistribute it and/or modify
> -it under the terms of the GNU General Public License as published by
> -the Free Software Foundation; either version 3, or (at your option)
> -any later version.
> -
> -GCC is distributed in the hope that it will be useful,
> -but WITHOUT ANY WARRANTY; without even the implied warranty of
> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -GNU General Public License for more details.
> -
> -You should have received a copy of the GNU General Public License
> -along with GCC; see the file COPYING3.  If not see
> -<http://www.gnu.org/licenses/>.  */
> -
> -#ifndef GRAPHITE_CLOOG_COMPAT_H
> -#define GRAPHITE_CLOOG_COMPAT_H
> -
> -/* Restore compatibility to CLooG Legacy.  */
> -#ifdef CLOOG_ORG
> -typedef const struct clast_expr *clast_name_p;
> -#else
> -typedef const char *clast_name_p;
> -#endif
> -
> -#ifdef CLOOG_ORG
> -#define cloog_initialize()
> -#define cloog_finalize()
> -#endif
> -
> -#ifndef CLOOG_ORG
> -
> -/* CloogOptions compatibility.  */
> -#define build_cloog_prog(SCOP, PROG, OPT)\
> -  build_cloog_prog (SCOP, PROG)
> -#define cloog_program_extract_scalars(PROG, SCATT, OPT)\
> -  cloog_program_extract_scalars (PROG, SCATT)
> -#define cloog_program_scatter(PROG, SCATT, OPT)\
> -  cloog_program_scatter (PROG, SCATT)
> -
> -/* CLAST compatibility.  */
> -#define clast_expr_term expr_term
> -#define clast_expr_red expr_red
> -#define clast_expr_bin expr_bin
> -#define clast_pprint pprint
> -
> -/* CloogState compatibility.  */
> -#define CloogState void
> -#define cloog_state_malloc() NULL
> -#define cloog_state_free(STATE)
> -#define cloog_loop_malloc(STATE) cloog_loop_malloc ()
> -#define cloog_options_malloc(STATE) cloog_options_malloc ()
> -#define cloog_statement_alloc(STATE, INDEX) cloog_statement_alloc (INDEX)
> -#define new_Cloog_Domain_from_ppl_Pointset_Powerset(PSPS, NB, STATE)\
> -  new_Cloog_Domain_from_ppl_Pointset_Powerset (PSPS)
> -#define new_Cloog_Domain_from_ppl_Polyhedron(POLY, NB, STATE)\
> -  new_Cloog_Domain_from_ppl_Polyhedron (POLY)
> -#define cloog_domain_from_cloog_matrix(STATE, MAT, NB)\
> -  cloog_domain_matrix2domain (MAT)
> -
> -/* CloogScatteringList compatibility.  */
> -#define CloogScatteringList CloogDomainList
> -#define CloogScattering CloogDomain
> -#define cloog_set_next_scattering cloog_set_next_domain
> -#define cloog_set_scattering cloog_set_domain
> -#define cloog_scattering cloog_domain
> -#define cloog_next_scattering cloog_next_domain
> -#define cloog_scattering_free cloog_domain_free
> -#define cloog_program_dump_cloog(DUMPFILE, PROGRAM, SCATTERINGLIST)\
> -  cloog_program_dump_cloog (DUMPFILE, PROGRAM)
> -
> -#endif
> -
> -/* Adapt CLooG accessors from CLooG legacy to
> -   newer CLooG versions.  */
> -
> -#ifdef CLOOG_ORG
> -
> -static inline void *
> -cloog_statement_usr (CloogStatement *cs)
> -{
> -  return cs->usr;
> -}
> -
> -static inline CloogScattering *
> -cloog_scattering (CloogScatteringList *sl)
> -{
> -  return sl->scatt;
> -}
> -
> -static inline void
> -cloog_set_scattering (CloogScatteringList *sl, CloogScattering *scatt)
> -{
> -  sl->scatt = scatt;
> -}
> -
> -static inline CloogScatteringList *
> -cloog_next_scattering (CloogScatteringList *sl)
> -{
> -  return sl->next;
> -}
> -
> -static inline void
> -cloog_set_next_scattering (CloogScatteringList *sl, CloogScatteringList *next)
> -{
> -  sl->next = next;
> -}
> -
> -static inline int
> -cloog_program_nb_scattdims (CloogProgram *prog)
> -{
> -  return prog->nb_scattdims;
> -}
> -
> -static inline void
> -cloog_program_set_nb_scattdims (CloogProgram *prog, int nb_scattdims)
> -{
> -  prog->nb_scattdims = nb_scattdims;
> -}
> -
> -static inline CloogNames *
> -cloog_program_names (CloogProgram *prog)
> -{
> -  return prog->names;
> -}
> -
> -static inline void
> -cloog_program_set_names (CloogProgram *prog, CloogNames *names)
> -{
> -  prog->names = names;
> -}
> -
> -static inline void
> -cloog_program_set_context (CloogProgram *prog, CloogDomain *domain)
> -{
> -  prog->context = domain;
> -}
> -
> -static inline void
> -cloog_program_set_loop (CloogProgram *prog, CloogLoop *loop)
> -{
> -  prog->loop = loop;
> -}
> -
> -static inline CloogBlockList *
> -cloog_program_blocklist (CloogProgram *prog)
> -{
> -  return prog->blocklist;
> -}
> -
> -static inline void
> -cloog_program_set_blocklist (CloogProgram *prog, CloogBlockList *bl)
> -{
> -  prog->blocklist = bl;
> -}
> -
> -static inline int *
> -cloog_program_scaldims (CloogProgram *prog)
> -{
> -  return prog->scaldims;
> -}
> -
> -static inline void
> -cloog_program_set_scaldims (CloogProgram *prog, int *s)
> -{
> -  prog->scaldims = s;
> -}
> -
> -static inline int
> -cloog_names_nb_parameters (CloogNames *names)
> -{
> -  return names->nb_parameters;
> -}
> -
> -static inline void
> -cloog_names_set_nb_parameters (CloogNames *names, int nb_parameters)
> -{
> -  names->nb_parameters = nb_parameters;
> -}
> -
> -static inline char **
> -cloog_names_parameters (CloogNames *names)
> -{
> -  return names->parameters;
> -}
> -
> -static inline void
> -cloog_names_set_parameters (CloogNames *names, char **parameters)
> -{
> -  names->parameters = parameters;
> -}
> -
> -static inline void
> -cloog_names_set_nb_iterators (CloogNames *names, int nb_iterators)
> -{
> -  names->nb_iterators = nb_iterators;
> -}
> -
> -static inline void
> -cloog_names_set_iterators (CloogNames *names, char **iterators)
> -{
> -  names->iterators = iterators;
> -}
> -
> -static inline void
> -cloog_names_set_nb_scattering (CloogNames *names, int nb_scattering)
> -{
> -  names->nb_scattering = nb_scattering;
> -}
> -
> -static inline void
> -cloog_names_set_scattering (CloogNames *names, char **scattering)
> -{
> -  names->scattering = scattering;
> -}
> -
> -static inline void
> -cloog_statement_set_usr (CloogStatement *cs, void *u)
> -{
> -  cs->usr = u;
> -}
> -
> -static inline void
> -cloog_loop_set_next (CloogLoop *loop, CloogLoop *next)
> -{
> -  loop->next = next;
> -}
> -
> -static inline void
> -cloog_loop_set_domain (CloogLoop *loop, CloogDomain *domain)
> -{
> -  loop->domain = domain;
> -}
> -
> -static inline void
> -cloog_loop_set_block (CloogLoop *loop, CloogBlock *block)
> -{
> -  loop->block = block;
> -}
> -
> -static inline CloogBlockList *
> -cloog_block_list_next (CloogBlockList *bl)
> -{
> -  return bl->next;
> -}
> -
> -static inline void
> -cloog_block_list_set_next (CloogBlockList *bl, CloogBlockList *next)
> -{
> -  bl->next = next;
> -}
> -
> -static inline void
> -cloog_block_list_set_block (CloogBlockList *bl, CloogBlock *block)
> -{
> -  bl->block = block;
> -}
> -
> -static inline int cloog_matrix_ncolumns (CloogMatrix * m)
> -{
> -  return m->NbColumns;
> -}
> -
> -static inline int cloog_matrix_nrows (CloogMatrix * m)
> -{
> -   return m->NbRows;
> -}
> -#endif /* CLOOG_ORG  */
> -#endif /* GRAPHITE_CLOOG_COMPAT_H  */
> diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
> index c3d0cc1..9bc24a0 100644
> --- a/gcc/graphite-cloog-util.c
> +++ b/gcc/graphite-cloog-util.c
> @@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
>  #include "ppl_c.h"
>  #include "cloog/cloog.h"
>  #include "graphite-cloog-util.h"
> -#include "graphite-cloog-compat.h"
>
>  /* Counts the number of constraints in PCS.  */
>
> @@ -253,7 +252,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
>                                           int nb_scatt ATTRIBUTE_UNUSED,
>                                           CloogState *state ATTRIBUTE_UNUSED)
>  {
> -#ifdef CLOOG_ORG
>   CloogMatrix *mat = new_Cloog_Matrix_from_ppl_Polyhedron (ph);
>   CloogScattering *res = cloog_scattering_from_cloog_matrix (state, mat,
>                                                              nb_scatt,
> @@ -261,9 +259,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
>
>   cloog_matrix_free (mat);
>   return res;
> -#else
> -  return new_Cloog_Domain_from_ppl_Polyhedron (ph, nb_params, state);
> -#endif
>  }
>
>  /* Creates a CloogDomain from a pointset powerset PS.  */
> @@ -314,14 +309,14 @@ openscop_print_cloog_matrix (FILE *file, CloogMatrix *mat,
>                             int output, int input, int locals,
>                             int params)
>  {
> -  int i, j;
> +  unsigned i, j;
>
> -  fprintf (file, "%d %d %d %d %d %d \n", cloog_matrix_nrows (mat),
> -          cloog_matrix_ncolumns (mat), output, input, locals, params);
> +  fprintf (file, "%d %d %d %d %d %d \n", mat->NbRows,
> +          mat->NbColumns, output, input, locals, params);
>
> -  for (i = 0; i < cloog_matrix_nrows (mat); i++)
> +  for (i = 0; i < mat->NbRows; i++)
>     {
> -      for (j = 0; j < cloog_matrix_ncolumns (mat); j++)
> +      for (j = 0; j < mat->NbColumns; j++)
>         if (j == 0)
>          fprintf (file, "%ld ", mpz_get_si (mat->p[i][j]));
>         else
> diff --git a/gcc/graphite-cloog-util.h b/gcc/graphite-cloog-util.h
> index 9686e7c..da26ee9 100644
> --- a/gcc/graphite-cloog-util.h
> +++ b/gcc/graphite-cloog-util.h
> @@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
>  #define GRAPHITE_CLOOG_UTIL_H
>
>  #include "cloog/cloog.h"
> -#include "graphite-cloog-compat.h"
>
>  CloogMatrix *new_Cloog_Matrix_from_ppl_Polyhedron (ppl_const_Polyhedron_t);
>  CloogDomain *new_Cloog_Domain_from_ppl_Polyhedron (ppl_const_Polyhedron_t,
> diff --git a/gcc/graphite.c b/gcc/graphite.c
> index b013447..e746c61 100644
> --- a/gcc/graphite.c
> +++ b/gcc/graphite.c
> @@ -209,7 +209,6 @@ graphite_initialize (void)
>   gcc_assert (ppl_initialized == 0);
>
>   cloog_state = cloog_state_malloc ();
> -  cloog_initialize ();
>
>   if (dump_file && dump_flags)
>     dump_function_to_file (current_function_decl, dump_file, dump_flags);
> @@ -233,7 +232,6 @@ graphite_finalize (bool need_cfg_cleanup_p)
>     }
>
>   cloog_state_free (cloog_state);
> -  cloog_finalize ();
>   ppl_finalize ();
>   free_original_copy_tables ();
>
> --
> 1.7.4.1
>
>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 1/3] Make CLooG isl the only supported CLooG version.
  2011-08-02 15:47   ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Sebastian Pop
@ 2011-08-11  2:01     ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-08-11  2:01 UTC (permalink / raw)
  To: Sebastian Pop
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

On 08/02/2011 04:46 PM, Sebastian Pop wrote:
> Ping.
>
> Could one of the configure maintainers review these changes?

Ping II.

Would anyone be so kind to review this?

The missing documentation changes are here
http://gcc.gnu.org/ml/gcc-patches/2011-07/msg02309.html

Cheers
Tobi

>
> Thanks,
> Sebastian
>
> On Thu, Jul 21, 2011 at 18:00, Tobias Grosser<tobias@grosser.es>  wrote:
>> 2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * configure: Regenerated.
>>         * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
>>         both cloog.org and legacy versions. The only supported version will
>>         be CLooG with the isl backend.
>> ---
>>   ChangeLog       |    7 ++
>>   config/cloog.m4 |  107 +++-------------------------------
>>   configure       |  170 +++----------------------------------------------------
>>   3 files changed, 26 insertions(+), 258 deletions(-)
>>
>> diff --git a/ChangeLog b/ChangeLog
>> index 6a27fb7..a08a780 100644
>> --- a/ChangeLog
>> +++ b/ChangeLog
>> @@ -1,3 +1,10 @@
>> +2011-07-21  Tobias Grosser<tobias@grosser.es>
>> +
>> +       * configure: Regenerated.
>> +       * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
>> +       both cloog.org and legacy versions. The only supported version will
>> +       be CLooG with the isl backend.
>> +
>>   2011-07-21  Joseph Myers<joseph@codesourcery.com>
>>
>>         * MAINTAINERS (Global Reviewers): Add self.
>> diff --git a/config/cloog.m4 b/config/cloog.m4
>> index e95b98d..8662acd 100644
>> --- a/config/cloog.m4
>> +++ b/config/cloog.m4
>> @@ -37,17 +37,6 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
>>        [--with-cloog-lib=PATH],
>>        [Specify the directory for the installed CLooG library])])
>>
>> -  AC_ARG_ENABLE(cloog-backend,
>> -    [AS_HELP_STRING(
>> -      [--enable-cloog-backend[[=BACKEND]]],
>> -      [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
>> -    [ if   test "x${enableval}" = "xisl"; then
>> -       cloog_backend=isl
>> -      elif test "x${enableval}" = "xppl"; then
>> -       cloog_backend=ppl
>> -      else
>> -       cloog_backend=ppl-legacy
>> -      fi], cloog_backend=ppl-legacy)
>>    AC_ARG_ENABLE(cloog-version-check,
>>      [AS_HELP_STRING(
>>        [--disable-cloog-version-check],
>> @@ -107,23 +96,6 @@ m4_define([_CLOOG_ORG_PROG_ISL],[AC_LANG_PROGRAM(
>>    [#include "cloog/cloog.h" ],
>>    [cloog_version ()])])
>>
>> -# _CLOOG_ORG_PROG_PPL ()
>> -# ------------------
>> -# Helper for detecting CLooG.org's PPL backend.
>> -m4_define([_CLOOG_ORG_PROG_PPL],[AC_LANG_PROGRAM(
>> -  [#include "cloog/cloog.h"
>> -   #include "cloog/ppl/cloog.h"],
>> -  [cloog_version ()])])
>> -
>> -# _CLOOG_PPL_LEGACY_PROG ()
>> -# -------------------------
>> -# Helper for detecting CLooG-Legacy (CLooG-PPL).
>> -m4_define([_CLOOG_PPL_LEGACY_PROG], [AC_LANG_PROGRAM(
>> -  [#include "cloog/cloog.h"],
>> -  [#ifndef CLOOG_PPL_BACKEND
>> -    choke me
>> -   #endif ])])
>> -
>>   # CLOOG_FIND_FLAGS ()
>>   # ------------------
>>   # Detect the used CLooG-backend and set clooginc/clooglibs/cloog_org.
>> @@ -144,49 +116,17 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
>>    CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
>>    LDFLAGS="${LDFLAGS} ${clooglibs}"
>>
>> -  case $cloog_backend in
>> -    "ppl-legacy")
>> -    CFLAGS="${CFLAGS} ${pplinc}"
>> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
>> -    AC_CACHE_CHECK([for installed CLooG PPL Legacy], [gcc_cv_cloog_type],
>> -      [LIBS="-lcloog ${_cloog_saved_LIBS}"
>> -      AC_LINK_IFELSE([_CLOOG_PPL_LEGACY_PROG], [gcc_cv_cloog_type="PPL Legacy"],
>> -                    [gcc_cv_cloog_type=no])])
>> -    ;;
>> -    "isl")
>> -    AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
>> -      [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
>> -      AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
>> -                    [gcc_cv_cloog_type=no])])
>> -    ;;
>> -    "ppl")
>> -    CFLAGS="${CFLAGS} ${pplinc}"
>> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
>> -    AC_CACHE_CHECK([for installed CLooG PPL], [gcc_cv_cloog_type],
>> -      [LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
>> -      AC_LINK_IFELSE([_CLOOG_ORG_PROG_PPL], [gcc_cv_cloog_type="PPL"],
>> -                    [gcc_cv_cloog_type=no])])
>> -    ;;
>> -    *)
>> -      gcc_cv_cloog_type=""
>> -  esac
>> +  AC_CACHE_CHECK([for installed CLooG ISL], [gcc_cv_cloog_type],
>> +    [LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
>> +    AC_LINK_IFELSE([_CLOOG_ORG_PROG_ISL], [gcc_cv_cloog_type="ISL"],
>> +                  [gcc_cv_cloog_type=no])])
>>
>>    case $gcc_cv_cloog_type in
>> -    "PPL Legacy")
>> -      clooginc="${clooginc}"
>> -      clooglibs="${clooglibs} -lcloog"
>> -      cloog_org=no
>> -      ;;
>>      "ISL")
>>        clooginc="${clooginc} ${_cloogorginc}"
>>        clooglibs="${clooglibs} -lcloog-isl -lisl"
>>        cloog_org=yes
>>        ;;
>> -    "PPL")
>> -      clooginc="${clooginc} ${_cloogorginc}"
>> -      clooglibs="${clooglibs} -lcloog-ppl"
>> -      cloog_org=yes
>> -      ;;
>>      *)
>>        clooglibs=
>>        clooginc=
>> @@ -212,25 +152,10 @@ m4_define([_CLOOG_CHECK_CT_PROG],[AC_LANG_PROGRAM(
>>      choke me
>>     #endif])])
>>
>> -# _CLOOG_CHECK_RT_PROG ()
>> -# -----------------------
>> -# Helper for verifying that CLooG's compile time version
>> -# matches the run time version.
>> -m4_define([_CLOOG_CHECK_RT_PROG],[AC_LANG_PROGRAM(
>> -  [#include "cloog/cloog.h"],
>> -  [if ((cloog_version_major () != CLOOG_VERSION_MAJOR)
>> -&&  (cloog_version_minor () != CLOOG_VERSION_MINOR)
>> -&&  (cloog_version_revision () != CLOOG_VERSION_REVISION))
>> -    {
>> -      return 1;
>> -    }])])
>> -
>>   # CLOOG_CHECK_VERSION CLOOG_CHECK_VERSION (MAJOR, MINOR, REVISION)
>>   # ----------------------------------------------------------------
>>   # Test the found CLooG to be exact of version MAJOR.MINOR and at least
>>   # REVISION.
>> -# If we're using the old CLooG-PPL (Legacy), the old version check will
>> -# be executed (Ignores the provided version information).
>>   AC_DEFUN([CLOOG_CHECK_VERSION],
>>   [
>>    AC_REQUIRE([CLOOG_FIND_FLAGS])
>> @@ -242,21 +167,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION],
>>      CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>>      LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>>
>> -    if test "${cloog_org}" = yes ; then
>> -      AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
>> -        [gcc_cv_cloog_ct_0_14_0],
>> -        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
>> -          [gcc_cv_cloog_ct_0_14_0=yes],
>> -          [gcc_cv_cloog_ct_0_14_0=no])])
>> -    elif test "${cloog_org}" = no ; then
>> -      AC_CACHE_CHECK([for version 0.15.5 (or later revision) of CLooG],
>> -        [gcc_cv_cloog_ct_0_15_5],
>> -        [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,5)],
>> -          [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG(0,15,9)],
>> -           [gcc_cv_cloog_ct_0_15_5=yes],
>> -            [gcc_cv_cloog_ct_0_15_5="buggy but acceptable"])],
>> -          [gcc_cv_cloog_ct_0_15_5=no])])
>> -    fi
>> +    AC_CACHE_CHECK([for version $1.$2.$3 of CLooG],
>> +      [gcc_cv_cloog],
>> +      [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)],
>> +       [gcc_cv_cloog=yes],
>> +       [gcc_cv_cloog=no])])
>>
>>      CFLAGS=$_cloog_saved_CFLAGS
>>      LDFLAGS=$_cloog_saved_LDFLAGS
>> @@ -272,9 +187,7 @@ AC_DEFUN([CLOOG_IF_FAILED],
>>   [
>>    CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
>>
>> -  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
>> -    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
>> -    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
>> +  if test "${gcc_cv_cloog}" = no ; then
>>      clooglibs=
>>      clooginc=
>>    fi
>> diff --git a/configure b/configure
>> index facf3e4..6608b86 100755
>> --- a/configure
>> +++ b/configure
>> @@ -775,7 +775,6 @@ enable_ppl_version_check
>>   with_cloog
>>   with_cloog_include
>>   with_cloog_lib
>> -enable_cloog_backend
>>   enable_cloog_version_check
>>   enable_lto
>>   enable_stage1_languages
>> @@ -1472,9 +1471,6 @@ Optional Features:
>>                            build stages 2 and 3 with C++, not C
>>    --disable-ppl-version-check
>>                            disable check for PPL version
>> -  --enable-cloog-backend[=BACKEND]
>> -                          set the CLooG BACKEND used to either isl, ppl or
>> -                          ppl-legacy (default)
>>    --disable-cloog-version-check
>>                            disable check for CLooG version
>>    --enable-lto            enable link time optimization support
>> @@ -5709,19 +5705,6 @@ if test "${with_cloog_lib+set}" = set; then :
>>   fi
>>
>>
>> -  # Check whether --enable-cloog-backend was given.
>> -if test "${enable_cloog_backend+set}" = set; then :
>> -  enableval=$enable_cloog_backend;  if   test "x${enableval}" = "xisl"; then
>> -       cloog_backend=isl
>> -      elif test "x${enableval}" = "xppl"; then
>> -       cloog_backend=ppl
>> -      else
>> -       cloog_backend=ppl-legacy
>> -      fi
>> -else
>> -  cloog_backend=ppl-legacy
>> -fi
>> -
>>    # Check whether --enable-cloog-version-check was given.
>>   if test "${enable_cloog_version_check+set}" = set; then :
>>    enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval
>> @@ -5794,48 +5777,13 @@ if test "x$with_cloog" != "xno"; then
>>    CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
>>    LDFLAGS="${LDFLAGS} ${clooglibs}"
>>
>> -  case $cloog_backend in
>> -    "ppl-legacy")
>> -    CFLAGS="${CFLAGS} ${pplinc}"
>> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
>> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy">&5
>> -$as_echo_n "checking for installed CLooG PPL Legacy... ">&6; }
>> -if test "${gcc_cv_cloog_type+set}" = set; then :
>> -  $as_echo_n "(cached) ">&6
>> -else
>> -  LIBS="-lcloog ${_cloog_saved_LIBS}"
>> -      cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> -/* end confdefs.h.  */
>> -#include "cloog/cloog.h"
>> -int
>> -main ()
>> -{
>> -#ifndef CLOOG_PPL_BACKEND
>> -    choke me
>> -   #endif
>> -  ;
>> -  return 0;
>> -}
>> -_ACEOF
>> -if ac_fn_c_try_link "$LINENO"; then :
>> -  gcc_cv_cloog_type="PPL Legacy"
>> -else
>> -  gcc_cv_cloog_type=no
>> -fi
>> -rm -f core conftest.err conftest.$ac_objext \
>> -    conftest$ac_exeext conftest.$ac_ext
>> -fi
>> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type">&5
>> -$as_echo "$gcc_cv_cloog_type">&6; }
>> -    ;;
>> -    "isl")
>> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL">&5
>> +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL">&5
>>   $as_echo_n "checking for installed CLooG ISL... ">&6; }
>>   if test "${gcc_cv_cloog_type+set}" = set; then :
>>    $as_echo_n "(cached) ">&6
>>   else
>>    LIBS="-lcloog-isl ${_cloog_saved_LIBS}"
>> -      cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> +    cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>>   /* end confdefs.h.  */
>>   #include "cloog/cloog.h"
>>   int
>> @@ -5856,59 +5804,13 @@ rm -f core conftest.err conftest.$ac_objext \
>>   fi
>>   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type">&5
>>   $as_echo "$gcc_cv_cloog_type">&6; }
>> -    ;;
>> -    "ppl")
>> -    CFLAGS="${CFLAGS} ${pplinc}"
>> -    LDFLAGS="${LDFLAGS} ${ppllibs}"
>> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL">&5
>> -$as_echo_n "checking for installed CLooG PPL... ">&6; }
>> -if test "${gcc_cv_cloog_type+set}" = set; then :
>> -  $as_echo_n "(cached) ">&6
>> -else
>> -  LIBS="-lcloog-ppl ${_cloog_saved_LIBS}"
>> -      cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> -/* end confdefs.h.  */
>> -#include "cloog/cloog.h"
>> -   #include "cloog/ppl/cloog.h"
>> -int
>> -main ()
>> -{
>> -cloog_version ()
>> -  ;
>> -  return 0;
>> -}
>> -_ACEOF
>> -if ac_fn_c_try_link "$LINENO"; then :
>> -  gcc_cv_cloog_type="PPL"
>> -else
>> -  gcc_cv_cloog_type=no
>> -fi
>> -rm -f core conftest.err conftest.$ac_objext \
>> -    conftest$ac_exeext conftest.$ac_ext
>> -fi
>> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type">&5
>> -$as_echo "$gcc_cv_cloog_type">&6; }
>> -    ;;
>> -    *)
>> -      gcc_cv_cloog_type=""
>> -  esac
>>
>>    case $gcc_cv_cloog_type in
>> -    "PPL Legacy")
>> -      clooginc="${clooginc}"
>> -      clooglibs="${clooglibs} -lcloog"
>> -      cloog_org=no
>> -      ;;
>>      "ISL")
>>        clooginc="${clooginc} ${_cloogorginc}"
>>        clooglibs="${clooglibs} -lcloog-isl -lisl"
>>        cloog_org=yes
>>        ;;
>> -    "PPL")
>> -      clooginc="${clooginc} ${_cloogorginc}"
>> -      clooglibs="${clooglibs} -lcloog-ppl"
>> -      cloog_org=yes
>> -      ;;
>>      *)
>>        clooglibs=
>>        clooginc=
>> @@ -5932,10 +5834,9 @@ $as_echo "$gcc_cv_cloog_type">&6; }
>>      CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>>      LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>>
>> -    if test "${cloog_org}" = yes ; then
>> -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG">&5
>> +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG">&5
>>   $as_echo_n "checking for version 0.16.1 of CLooG... ">&6; }
>> -if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
>> +if test "${gcc_cv_cloog+set}" = set; then :
>>    $as_echo_n "(cached) ">&6
>>   else
>>    cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> @@ -5954,65 +5855,14 @@ main ()
>>   }
>>   _ACEOF
>>   if ac_fn_c_try_compile "$LINENO"; then :
>> -  gcc_cv_cloog_ct_0_14_0=yes
>> -else
>> -  gcc_cv_cloog_ct_0_14_0=no
>> -fi
>> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>> -fi
>> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_14_0">&5
>> -$as_echo "$gcc_cv_cloog_ct_0_14_0">&6; }
>> -    elif test "${cloog_org}" = no ; then
>> -      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15.5 (or later revision) of CLooG">&5
>> -$as_echo_n "checking for version 0.15.5 (or later revision) of CLooG... ">&6; }
>> -if test "${gcc_cv_cloog_ct_0_15_5+set}" = set; then :
>> -  $as_echo_n "(cached) ">&6
>> -else
>> -  cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> -/* end confdefs.h.  */
>> -#include "cloog/cloog.h"
>> -int
>> -main ()
>> -{
>> -#if CLOOG_VERSION_MAJOR != 0 \
>> -    || CLOOG_VERSION_MINOR != 15 \
>> -    || CLOOG_VERSION_REVISION<  5
>> -    choke me
>> -   #endif
>> -  ;
>> -  return 0;
>> -}
>> -_ACEOF
>> -if ac_fn_c_try_compile "$LINENO"; then :
>> -  cat confdefs.h -<<_ACEOF>conftest.$ac_ext
>> -/* end confdefs.h.  */
>> -#include "cloog/cloog.h"
>> -int
>> -main ()
>> -{
>> -#if CLOOG_VERSION_MAJOR != 0 \
>> -    || CLOOG_VERSION_MINOR != 15 \
>> -    || CLOOG_VERSION_REVISION<  9
>> -    choke me
>> -   #endif
>> -  ;
>> -  return 0;
>> -}
>> -_ACEOF
>> -if ac_fn_c_try_compile "$LINENO"; then :
>> -  gcc_cv_cloog_ct_0_15_5=yes
>> -else
>> -  gcc_cv_cloog_ct_0_15_5="buggy but acceptable"
>> -fi
>> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>> +  gcc_cv_cloog=yes
>>   else
>> -  gcc_cv_cloog_ct_0_15_5=no
>> +  gcc_cv_cloog=no
>>   fi
>>   rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>>   fi
>> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_ct_0_15_5">&5
>> -$as_echo "$gcc_cv_cloog_ct_0_15_5">&6; }
>> -    fi
>> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog">&5
>> +$as_echo "$gcc_cv_cloog">&6; }
>>
>>      CFLAGS=$_cloog_saved_CFLAGS
>>      LDFLAGS=$_cloog_saved_LDFLAGS
>> @@ -6036,9 +5886,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5">&6; }
>>
>>
>>
>> -  if test "${gcc_cv_cloog_ct_0_14_0}" = no \
>> -    || test "${gcc_cv_cloog_rt_0_14_0}" = no \
>> -    || test "${gcc_cv_cloog_ct_0_15_5}" = no; then
>> +  if test "${gcc_cv_cloog}" = no ; then
>>      clooglibs=
>>      clooginc=
>>    fi
>> --
>> 1.7.4.1
>>
>>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Require cloog 0.16.3
  2011-08-02 15:48     ` [PATCH 2/3] Require cloog 0.16.3 Sebastian Pop
@ 2011-08-11  2:38       ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-08-11  2:38 UTC (permalink / raw)
  To: Sebastian Pop
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

On 08/02/2011 04:47 PM, Sebastian Pop wrote:
> Ping.
>
> Could one of the configure maintainers review these changes?

Ping II.

This is needed for move to the official cloog.org library interface [1].

Thanks a lot for your time
Tobi

[1] http://gcc.gnu.org/ml/gcc-patches/2011-08/msg00976.html

> Thanks,
> Sebastian
>
>
> On Thu, Jul 21, 2011 at 18:00, Tobias Grosser<tobias@grosser.es>  wrote:
>> 2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * configure: Regenerated.
>>         * configure.ac: Require cloog isl 0.16.3
>> ---
>>   ChangeLog    |    5 +++++
>>   configure    |    6 +++---
>>   configure.ac |    2 +-
>>   3 files changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/ChangeLog b/ChangeLog
>> index a08a780..3d83bd2 100644
>> --- a/ChangeLog
>> +++ b/ChangeLog
>> @@ -1,6 +1,11 @@
>>   2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * configure: Regenerated.
>> +       * configure.ac: Require cloog isl 0.16.3
>> +
>> +2011-07-21  Tobias Grosser<tobias@grosser.es>
>> +
>> +       * configure: Regenerated.
>>         * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma,
>>         both cloog.org and legacy versions. The only supported version will
>>         be CLooG with the isl backend.
>> diff --git a/configure b/configure
>> index 6608b86..57f099b 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5834,8 +5834,8 @@ $as_echo "$gcc_cv_cloog_type">&6; }
>>      CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${pplinc} ${gmpinc}"
>>      LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
>>
>> -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG">&5
>> -$as_echo_n "checking for version 0.16.1 of CLooG... ">&6; }
>> +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.3 of CLooG">&5
>> +$as_echo_n "checking for version 0.16.3 of CLooG... ">&6; }
>>   if test "${gcc_cv_cloog+set}" = set; then :
>>    $as_echo_n "(cached) ">&6
>>   else
>> @@ -5847,7 +5847,7 @@ main ()
>>   {
>>   #if CLOOG_VERSION_MAJOR != 0 \
>>      || CLOOG_VERSION_MINOR != 16 \
>> -    || CLOOG_VERSION_REVISION<  1
>> +    || CLOOG_VERSION_REVISION<  3
>>      choke me
>>     #endif
>>    ;
>> diff --git a/configure.ac b/configure.ac
>> index e64e577..00325a1 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1588,7 +1588,7 @@ if test "x$with_cloog" != "xno"; then
>>    dnl
>>    dnl If we use CLooG-Legacy, the provided version information is
>>    dnl ignored.
>> -  CLOOG_CHECK_VERSION(0,16,1)
>> +  CLOOG_CHECK_VERSION(0,16,3)
>>
>>    dnl Only execute fail-action, if CLooG has been requested.
>>    CLOOG_IF_FAILED([
>> --
>> 1.7.4.1
>>
>>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 3/3] Remove code that supported legacy CLooG.
  2011-08-02 15:48       ` Sebastian Pop
@ 2011-08-11  3:24         ` Tobias Grosser
  0 siblings, 0 replies; 22+ messages in thread
From: Tobias Grosser @ 2011-08-11  3:24 UTC (permalink / raw)
  To: Sebastian Pop
  Cc: gcc-patches, Paolo Bonzini, DJ Delorie, neroden, Alexandre Oliva,
	Ralf Wildenhues

On 08/02/2011 04:47 PM, Sebastian Pop wrote:
> Ping.
>
> Could one of the configure maintainers review these changes?
>
> Thanks,
> Sebastian

Ping II.

This is needed for move graphite to the official cloog.org library 
interface [1].

Thanks a lot for your time
Tobi

[1] http://gcc.gnu.org/ml/gcc-patches/2011-08/msg00976.html


>
> On Thu, Jul 21, 2011 at 18:00, Tobias Grosser<tobias@grosser.es>  wrote:
>> 2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * configure: Regenerated.
>>         * config/cloog.m4: Do not define CLOOG_ORG
>>
>> and in gcc/
>>
>> 2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
>>         Remove graphite-cloog-util.h.
>>         * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
>>         build_iv_mapping, translate_clast_user, translate_clast,
>>         free_scattering, initialize_cloog_names, build_cloog_prog,
>>         create_params_index): Do not use old compatibility functions.
>>         (clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
>>         * graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
>>         compatibility functions.
>>         (new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
>>         cloog.
>>         * graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
>>         * graphite.c (graphite.c): Do not call outdated cloog_initialize() and
>>         cloog_finalize().
>>         * graphite-cloog-compat.h: Remove.
>> ---
>>   ChangeLog                      |    5 +
>>   config/cloog.m4                |    2 +-
>>   configure                      |    2 +-
>>   gcc/ChangeLog                  |   18 +++
>>   gcc/Makefile.in                |    4 +-
>>   gcc/graphite-clast-to-gimple.c |   93 ++++++--------
>>   gcc/graphite-cloog-compat.h    |  275 ----------------------------------------
>>   gcc/graphite-cloog-util.c      |   15 +--
>>   gcc/graphite-cloog-util.h      |    1 -
>>   gcc/graphite.c                 |    2 -
>>   10 files changed, 72 insertions(+), 345 deletions(-)
>>   delete mode 100644 gcc/graphite-cloog-compat.h
>>
>> diff --git a/ChangeLog b/ChangeLog
>> index 3d83bd2..9499da4 100644
>> --- a/ChangeLog
>> +++ b/ChangeLog
>> @@ -1,6 +1,11 @@
>>   2011-07-21  Tobias Grosser<tobias@grosser.es>
>>
>>         * configure: Regenerated.
>> +       * config/cloog.m4: Do not define CLOOG_ORGt
>> +
>> +2011-07-21  Tobias Grosser<tobias@grosser.es>
>> +
>> +       * configure: Regenerated.
>>         * configure.ac: Require cloog isl 0.16.3
>>
>>   2011-07-21  Tobias Grosser<tobias@grosser.es>
>> diff --git a/config/cloog.m4 b/config/cloog.m4
>> index 8662acd..9c42445 100644
>> --- a/config/cloog.m4
>> +++ b/config/cloog.m4
>> @@ -109,7 +109,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
>>    _cloog_saved_LDFLAGS=$LDFLAGS
>>    _cloog_saved_LIBS=$LIBS
>>
>> -  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
>> +  _cloogorginc="-DCLOOG_INT_GMP"
>>
>>    dnl clooglibs&  clooginc may have been initialized by CLOOG_INIT_FLAGS.
>>    CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
>> diff --git a/configure b/configure
>> index 57f099b..8de7bc69 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5771,7 +5771,7 @@ if test "x$with_cloog" != "xno"; then
>>    _cloog_saved_LDFLAGS=$LDFLAGS
>>    _cloog_saved_LIBS=$LIBS
>>
>> -  _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG"
>> +  _cloogorginc="-DCLOOG_INT_GMP"
>>
>>      CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}"
>>    CPPFLAGS="${CPPFLAGS} ${_cloogorginc}"
>> diff --git a/gcc/ChangeLog b/gcc/ChangeLog
>> index b9d95fa..b6009b7 100644
>> --- a/gcc/ChangeLog
>> +++ b/gcc/ChangeLog
>> @@ -1,3 +1,21 @@
>> +2011-07-21  Tobias Grosser<tobias@grosser.es>
>> +
>> +       * Makefile.in (graphite-clast-to-gimple.o, graphite-cloog-util.o):
>> +       Remove graphite-cloog-util.h.
>> +       * graphite-clast-to-gimple.c (gcc_type_for_iv_of_clast_loop,
>> +       build_iv_mapping, translate_clast_user, translate_clast,
>> +       free_scattering, initialize_cloog_names, build_cloog_prog,
>> +       create_params_index): Do not use old compatibility functions.
>> +       (clast_name_to_index, set_cloog_options): Remove code for legacy cloog.
>> +       * graphite-cloog-util.c (openscop_print_cloog_matrix): Do not use old
>> +       compatibility functions.
>> +       (new_Cloog_Scattering_from_ppl_Polyhedron): Remove code for legacy
>> +       cloog.
>> +       * graphite-cloog-util.h: Remove include of graphite-cloog-util.h.
>> +       * graphite.c (graphite.c): Do not call outdated cloog_initialize() and
>> +       cloog_finalize().
>> +       * graphite-cloog-compat.h: Remove.
>> +
>>   2011-07-21  Georg-Johann Lay<avr@gjlay.de>
>>
>>         * config/avr/avr.c (final_prescan_insn): Fix printing of rtx_costs.
>> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
>> index d924fb6..c5a2f7f 100644
>> --- a/gcc/Makefile.in
>> +++ b/gcc/Makefile.in
>> @@ -2690,9 +2690,9 @@ graphite-clast-to-gimple.o : graphite-clast-to-gimple.c $(CONFIG_H) \
>>     $(SYSTEM_H) coretypes.h $(DIAGNOSTIC_CORE_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
>>     $(CFGLOOP_H) $(TREE_DATA_REF_H) sese.h graphite-cloog-util.h \
>>     graphite-ppl.h graphite-poly.h graphite-clast-to-gimple.h \
>> -   graphite-dependences.h graphite-cloog-compat.h
>> +   graphite-dependences.h
>>   graphite-cloog-util.o : graphite-cloog-util.c $(CONFIG_H) $(SYSTEM_H) \
>> -   coretypes.h graphite-cloog-util.h graphite-cloog-compat.h
>> +   coretypes.h graphite-cloog-util.h
>>   graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
>>     coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
>>     sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \
>> diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
>> index 6b17631..da9b84f 100644
>> --- a/gcc/graphite-clast-to-gimple.c
>> +++ b/gcc/graphite-clast-to-gimple.c
>> @@ -38,7 +38,8 @@ along with GCC; see the file COPYING3.  If not see
>>   #include "graphite-poly.h"
>>   #include "graphite-clast-to-gimple.h"
>>   #include "graphite-dependences.h"
>> -#include "graphite-cloog-compat.h"
>> +
>> +typedef const struct clast_expr *clast_name_p;
>>
>>   /* This flag is set when an error occurred during the translation of
>>     CLAST to Gimple.  */
>> @@ -86,12 +87,8 @@ clast_name_to_index (clast_name_p name, htab_t index_table)
>>    struct clast_name_index tmp;
>>    PTR *slot;
>>
>> -#ifdef CLOOG_ORG
>>    gcc_assert (name->type == clast_expr_name);
>>    tmp.name = ((const struct clast_name *) name)->name;
>> -#else
>> -  tmp.name = name;
>> -#endif
>>
>>    slot = htab_find_slot (index_table,&tmp, NO_INSERT);
>>
>> @@ -683,7 +680,7 @@ gcc_type_for_iv_of_clast_loop (struct clast_for *stmt_for, int level,
>>    struct clast_stmt *stmt = (struct clast_stmt *) stmt_for;
>>    struct clast_user_stmt *body = clast_get_body_of_loop (stmt);
>>    CloogStatement *cs = body->statement;
>> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
>> +  poly_bb_p pbb = (poly_bb_p) cs->usr;
>>
>>    return max_signed_precision_type (lb_type, max_precision_type
>>                                     (ub_type, compute_type_for_level
>> @@ -740,7 +737,7 @@ build_iv_mapping (VEC (tree, heap) *iv_map, sese region,
>>    struct clast_stmt *t;
>>    int depth = 0;
>>    CloogStatement *cs = user_stmt->statement;
>> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (cs);
>> +  poly_bb_p pbb = (poly_bb_p) cs->usr;
>>    gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
>>
>>    for (t = user_stmt->substitutions; t; t = t->next, depth++)
>> @@ -856,7 +853,7 @@ translate_clast_user (sese region, struct clast_user_stmt *stmt, edge next_e,
>>   {
>>    int i, nb_loops;
>>    basic_block new_bb;
>> -  poly_bb_p pbb = (poly_bb_p) cloog_statement_usr (stmt->statement);
>> +  poly_bb_p pbb = (poly_bb_p) stmt->statement->usr;
>>    gimple_bb_p gbb = PBB_BLACK_BOX (pbb);
>>    VEC (tree, heap) *iv_map;
>>
>> @@ -1076,8 +1073,8 @@ free_scattering (CloogScatteringList *scattering)
>>   {
>>    while (scattering)
>>      {
>> -      CloogScattering *dom = cloog_scattering (scattering);
>> -      CloogScatteringList *next = cloog_next_scattering (scattering);
>> +      CloogScattering *dom = scattering->scatt;
>> +      CloogScatteringList *next = scattering->next;
>>
>>        cloog_scattering_free (dom);
>>        free (scattering);
>> @@ -1095,13 +1092,13 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>>    sese region = SCOP_REGION (scop);
>>    int i;
>>    int nb_iterators = scop_max_loop_depth (scop);
>> -  int nb_scattering = cloog_program_nb_scattdims (prog);
>> +  int nb_scattering = prog->nb_scattdims;
>>    int nb_parameters = VEC_length (tree, SESE_PARAMS (region));
>>    char **iterators = XNEWVEC (char *, nb_iterators * 2);
>>    char **scattering = XNEWVEC (char *, nb_scattering);
>>    char **parameters= XNEWVEC (char *, nb_parameters);
>>
>> -  cloog_program_set_names (prog, cloog_names_malloc ());
>> +  prog->names = cloog_names_malloc ();
>>
>>    for (i = 0; i<  nb_parameters; i++)
>>      {
>> @@ -1118,8 +1115,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>>        snprintf (parameters[i], len, "%s_%d", name, SSA_NAME_VERSION (param));
>>      }
>>
>> -  cloog_names_set_nb_parameters (cloog_program_names (prog), nb_parameters);
>> -  cloog_names_set_parameters (cloog_program_names (prog), parameters);
>> +  prog->names->nb_parameters = nb_parameters;
>> +  prog->names->parameters = parameters;
>>
>>    for (i = 0; i<  nb_iterators; i++)
>>      {
>> @@ -1128,10 +1125,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>>        snprintf (iterators[i], len, "git_%d", i);
>>      }
>>
>> -  cloog_names_set_nb_iterators (cloog_program_names (prog),
>> -                               nb_iterators);
>> -  cloog_names_set_iterators (cloog_program_names (prog),
>> -                            iterators);
>> +  prog->names->nb_iterators = nb_iterators;
>> +  prog->names->iterators = iterators;
>>
>>    for (i = 0; i<  nb_scattering; i++)
>>      {
>> @@ -1140,10 +1135,8 @@ initialize_cloog_names (scop_p scop, CloogProgram *prog)
>>        snprintf (scattering[i], len, "scat_%d", i);
>>      }
>>
>> -  cloog_names_set_nb_scattering (cloog_program_names (prog),
>> -                                nb_scattering);
>> -  cloog_names_set_scattering (cloog_program_names (prog),
>> -                             scattering);
>> +  prog->names->nb_scattering = nb_scattering;
>> +  prog->names->scattering = scattering;
>>   }
>>
>>   /* Initialize a CLooG input file.  */
>> @@ -1186,12 +1179,13 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>>    int nbs = 2 * max_nb_loops + 1;
>>    int *scaldims;
>>
>> -  cloog_program_set_context
>> -    (prog, new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
>> -      scop_nb_params (scop), cloog_state));
>> +  prog->context =
>> +    new_Cloog_Domain_from_ppl_Pointset_Powerset (SCOP_CONTEXT (scop),
>> +                                                scop_nb_params (scop),
>> +                                                cloog_state);
>>    nbs = unify_scattering_dimensions (scop);
>>    scaldims = (int *) xmalloc (nbs * (sizeof (int)));
>> -  cloog_program_set_nb_scattdims (prog, nbs);
>> +  prog->nb_scattdims = nbs;
>>    initialize_cloog_names (scop, prog);
>>
>>    FOR_EACH_VEC_ELT (poly_bb_p, SCOP_BBS (scop), i, pbb)
>> @@ -1211,14 +1205,14 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>>                                                           scop_nb_params (scop),
>>                                                           cloog_state);
>>        block = cloog_block_alloc (stmt, 0, NULL, pbb_dim_iter_domain (pbb));
>> -      cloog_statement_set_usr (stmt, pbb);
>> +      stmt->usr = pbb;
>>
>>        /* Build loop list.  */
>>        {
>>          CloogLoop *new_loop_list = cloog_loop_malloc (cloog_state);
>> -        cloog_loop_set_next (new_loop_list, loop_list);
>> -        cloog_loop_set_domain (new_loop_list, dom);
>> -        cloog_loop_set_block (new_loop_list, block);
>> +        new_loop_list->next = loop_list;
>> +        new_loop_list->domain = dom;
>> +        new_loop_list->block = block;
>>          loop_list = new_loop_list;
>>        }
>>
>> @@ -1226,8 +1220,8 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>>        {
>>          CloogBlockList *new_block_list = cloog_block_list_malloc ();
>>
>> -        cloog_block_list_set_next (new_block_list, block_list);
>> -        cloog_block_list_set_block (new_block_list, block);
>> +        new_block_list->next = block_list;
>> +        new_block_list->block = block;
>>          block_list = new_block_list;
>>        }
>>
>> @@ -1244,19 +1238,19 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>>            (scat, scop_nb_params (scop), pbb_nb_scattering_transform (pbb),
>>             cloog_state);
>>
>> -        cloog_set_next_scattering (new_scattering, scattering);
>> -        cloog_set_scattering (new_scattering, dom);
>> +        new_scattering->next = scattering;
>> +        new_scattering->scatt = dom;
>>          scattering = new_scattering;
>>        }
>>      }
>>
>> -  cloog_program_set_loop (prog, loop_list);
>> -  cloog_program_set_blocklist (prog, block_list);
>> +  prog->loop = loop_list;
>> +  prog->blocklist = block_list;
>>
>>    for (i = 0; i<  nbs; i++)
>>      scaldims[i] = 0 ;
>>
>> -  cloog_program_set_scaldims (prog, scaldims);
>> +  prog->scaldims = scaldims;
>>
>>    /* Extract scalar dimensions to simplify the code generation problem.  */
>>    cloog_program_extract_scalars (prog, scattering, options);
>> @@ -1277,22 +1271,21 @@ build_cloog_prog (scop_p scop, CloogProgram *prog,
>>    free_scattering (scattering);
>>
>>    /* Iterators corresponding to scalar dimensions have to be extracted.  */
>> -  cloog_names_scalarize (cloog_program_names (prog), nbs,
>> -                        cloog_program_scaldims (prog));
>> +  cloog_names_scalarize (prog->names, nbs, prog->scaldims);
>>
>>    /* Free blocklist.  */
>>    {
>> -    CloogBlockList *next = cloog_program_blocklist (prog);
>> +    CloogBlockList *next = prog->blocklist;
>>
>>      while (next)
>>        {
>>          CloogBlockList *toDelete = next;
>> -        next = cloog_block_list_next (next);
>> -        cloog_block_list_set_next (toDelete, NULL);
>> -        cloog_block_list_set_block (toDelete, NULL);
>> +        next = next->next;
>> +        toDelete->next =  NULL;
>> +        toDelete->block = NULL;
>>          cloog_block_list_free (toDelete);
>>        }
>> -    cloog_program_set_blocklist (prog, NULL);
>> +    prog->blocklist = NULL;
>>    }
>>   }
>>
>> @@ -1314,14 +1307,8 @@ set_cloog_options (void)
>>       GLooG.  */
>>    options->esp = 1;
>>
>> -#ifdef CLOOG_ORG
>>    /* Silence CLooG to avoid failing tests due to debug output to stderr.  */
>>    options->quiet = 1;
>> -#else
>> -  /* Enable C pretty-printing mode: normalizes the substitution
>> -     equations for statements.  */
>> -  options->cpp = 1;
>> -#endif
>>
>>    /* Allow cloog to build strides with a stride width different to one.
>>       This example has stride = 4:
>> @@ -1419,9 +1406,9 @@ debug_generated_program (scop_p scop)
>>
>>   static void
>>   create_params_index (htab_t index_table, CloogProgram *prog) {
>> -  CloogNames* names = cloog_program_names (prog);
>> -  int nb_parameters = cloog_names_nb_parameters (names);
>> -  char **parameters = cloog_names_parameters (names);
>> +  CloogNames* names = prog->names;
>> +  int nb_parameters = names->nb_parameters;
>> +  char **parameters = names->parameters;
>>    int i;
>>
>>    for (i = 0; i<  nb_parameters; i++)
>> diff --git a/gcc/graphite-cloog-compat.h b/gcc/graphite-cloog-compat.h
>> deleted file mode 100644
>> index 011377d..0000000
>> --- a/gcc/graphite-cloog-compat.h
>> +++ /dev/null
>> @@ -1,275 +0,0 @@
>> -/* Compatibility layer for using upstream CLooG versions with
>> -   CLooG legacy code.
>> -   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
>> -   Contributed by Andreas Simbuerger<simbuerg@fim.uni-passau.de>.
>> -
>> -This file is part of GCC.
>> -
>> -GCC is free software; you can redistribute it and/or modify
>> -it under the terms of the GNU General Public License as published by
>> -the Free Software Foundation; either version 3, or (at your option)
>> -any later version.
>> -
>> -GCC is distributed in the hope that it will be useful,
>> -but WITHOUT ANY WARRANTY; without even the implied warranty of
>> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> -GNU General Public License for more details.
>> -
>> -You should have received a copy of the GNU General Public License
>> -along with GCC; see the file COPYING3.  If not see
>> -<http://www.gnu.org/licenses/>.  */
>> -
>> -#ifndef GRAPHITE_CLOOG_COMPAT_H
>> -#define GRAPHITE_CLOOG_COMPAT_H
>> -
>> -/* Restore compatibility to CLooG Legacy.  */
>> -#ifdef CLOOG_ORG
>> -typedef const struct clast_expr *clast_name_p;
>> -#else
>> -typedef const char *clast_name_p;
>> -#endif
>> -
>> -#ifdef CLOOG_ORG
>> -#define cloog_initialize()
>> -#define cloog_finalize()
>> -#endif
>> -
>> -#ifndef CLOOG_ORG
>> -
>> -/* CloogOptions compatibility.  */
>> -#define build_cloog_prog(SCOP, PROG, OPT)\
>> -  build_cloog_prog (SCOP, PROG)
>> -#define cloog_program_extract_scalars(PROG, SCATT, OPT)\
>> -  cloog_program_extract_scalars (PROG, SCATT)
>> -#define cloog_program_scatter(PROG, SCATT, OPT)\
>> -  cloog_program_scatter (PROG, SCATT)
>> -
>> -/* CLAST compatibility.  */
>> -#define clast_expr_term expr_term
>> -#define clast_expr_red expr_red
>> -#define clast_expr_bin expr_bin
>> -#define clast_pprint pprint
>> -
>> -/* CloogState compatibility.  */
>> -#define CloogState void
>> -#define cloog_state_malloc() NULL
>> -#define cloog_state_free(STATE)
>> -#define cloog_loop_malloc(STATE) cloog_loop_malloc ()
>> -#define cloog_options_malloc(STATE) cloog_options_malloc ()
>> -#define cloog_statement_alloc(STATE, INDEX) cloog_statement_alloc (INDEX)
>> -#define new_Cloog_Domain_from_ppl_Pointset_Powerset(PSPS, NB, STATE)\
>> -  new_Cloog_Domain_from_ppl_Pointset_Powerset (PSPS)
>> -#define new_Cloog_Domain_from_ppl_Polyhedron(POLY, NB, STATE)\
>> -  new_Cloog_Domain_from_ppl_Polyhedron (POLY)
>> -#define cloog_domain_from_cloog_matrix(STATE, MAT, NB)\
>> -  cloog_domain_matrix2domain (MAT)
>> -
>> -/* CloogScatteringList compatibility.  */
>> -#define CloogScatteringList CloogDomainList
>> -#define CloogScattering CloogDomain
>> -#define cloog_set_next_scattering cloog_set_next_domain
>> -#define cloog_set_scattering cloog_set_domain
>> -#define cloog_scattering cloog_domain
>> -#define cloog_next_scattering cloog_next_domain
>> -#define cloog_scattering_free cloog_domain_free
>> -#define cloog_program_dump_cloog(DUMPFILE, PROGRAM, SCATTERINGLIST)\
>> -  cloog_program_dump_cloog (DUMPFILE, PROGRAM)
>> -
>> -#endif
>> -
>> -/* Adapt CLooG accessors from CLooG legacy to
>> -   newer CLooG versions.  */
>> -
>> -#ifdef CLOOG_ORG
>> -
>> -static inline void *
>> -cloog_statement_usr (CloogStatement *cs)
>> -{
>> -  return cs->usr;
>> -}
>> -
>> -static inline CloogScattering *
>> -cloog_scattering (CloogScatteringList *sl)
>> -{
>> -  return sl->scatt;
>> -}
>> -
>> -static inline void
>> -cloog_set_scattering (CloogScatteringList *sl, CloogScattering *scatt)
>> -{
>> -  sl->scatt = scatt;
>> -}
>> -
>> -static inline CloogScatteringList *
>> -cloog_next_scattering (CloogScatteringList *sl)
>> -{
>> -  return sl->next;
>> -}
>> -
>> -static inline void
>> -cloog_set_next_scattering (CloogScatteringList *sl, CloogScatteringList *next)
>> -{
>> -  sl->next = next;
>> -}
>> -
>> -static inline int
>> -cloog_program_nb_scattdims (CloogProgram *prog)
>> -{
>> -  return prog->nb_scattdims;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_nb_scattdims (CloogProgram *prog, int nb_scattdims)
>> -{
>> -  prog->nb_scattdims = nb_scattdims;
>> -}
>> -
>> -static inline CloogNames *
>> -cloog_program_names (CloogProgram *prog)
>> -{
>> -  return prog->names;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_names (CloogProgram *prog, CloogNames *names)
>> -{
>> -  prog->names = names;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_context (CloogProgram *prog, CloogDomain *domain)
>> -{
>> -  prog->context = domain;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_loop (CloogProgram *prog, CloogLoop *loop)
>> -{
>> -  prog->loop = loop;
>> -}
>> -
>> -static inline CloogBlockList *
>> -cloog_program_blocklist (CloogProgram *prog)
>> -{
>> -  return prog->blocklist;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_blocklist (CloogProgram *prog, CloogBlockList *bl)
>> -{
>> -  prog->blocklist = bl;
>> -}
>> -
>> -static inline int *
>> -cloog_program_scaldims (CloogProgram *prog)
>> -{
>> -  return prog->scaldims;
>> -}
>> -
>> -static inline void
>> -cloog_program_set_scaldims (CloogProgram *prog, int *s)
>> -{
>> -  prog->scaldims = s;
>> -}
>> -
>> -static inline int
>> -cloog_names_nb_parameters (CloogNames *names)
>> -{
>> -  return names->nb_parameters;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_nb_parameters (CloogNames *names, int nb_parameters)
>> -{
>> -  names->nb_parameters = nb_parameters;
>> -}
>> -
>> -static inline char **
>> -cloog_names_parameters (CloogNames *names)
>> -{
>> -  return names->parameters;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_parameters (CloogNames *names, char **parameters)
>> -{
>> -  names->parameters = parameters;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_nb_iterators (CloogNames *names, int nb_iterators)
>> -{
>> -  names->nb_iterators = nb_iterators;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_iterators (CloogNames *names, char **iterators)
>> -{
>> -  names->iterators = iterators;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_nb_scattering (CloogNames *names, int nb_scattering)
>> -{
>> -  names->nb_scattering = nb_scattering;
>> -}
>> -
>> -static inline void
>> -cloog_names_set_scattering (CloogNames *names, char **scattering)
>> -{
>> -  names->scattering = scattering;
>> -}
>> -
>> -static inline void
>> -cloog_statement_set_usr (CloogStatement *cs, void *u)
>> -{
>> -  cs->usr = u;
>> -}
>> -
>> -static inline void
>> -cloog_loop_set_next (CloogLoop *loop, CloogLoop *next)
>> -{
>> -  loop->next = next;
>> -}
>> -
>> -static inline void
>> -cloog_loop_set_domain (CloogLoop *loop, CloogDomain *domain)
>> -{
>> -  loop->domain = domain;
>> -}
>> -
>> -static inline void
>> -cloog_loop_set_block (CloogLoop *loop, CloogBlock *block)
>> -{
>> -  loop->block = block;
>> -}
>> -
>> -static inline CloogBlockList *
>> -cloog_block_list_next (CloogBlockList *bl)
>> -{
>> -  return bl->next;
>> -}
>> -
>> -static inline void
>> -cloog_block_list_set_next (CloogBlockList *bl, CloogBlockList *next)
>> -{
>> -  bl->next = next;
>> -}
>> -
>> -static inline void
>> -cloog_block_list_set_block (CloogBlockList *bl, CloogBlock *block)
>> -{
>> -  bl->block = block;
>> -}
>> -
>> -static inline int cloog_matrix_ncolumns (CloogMatrix * m)
>> -{
>> -  return m->NbColumns;
>> -}
>> -
>> -static inline int cloog_matrix_nrows (CloogMatrix * m)
>> -{
>> -   return m->NbRows;
>> -}
>> -#endif /* CLOOG_ORG  */
>> -#endif /* GRAPHITE_CLOOG_COMPAT_H  */
>> diff --git a/gcc/graphite-cloog-util.c b/gcc/graphite-cloog-util.c
>> index c3d0cc1..9bc24a0 100644
>> --- a/gcc/graphite-cloog-util.c
>> +++ b/gcc/graphite-cloog-util.c
>> @@ -28,7 +28,6 @@ along with GCC; see the file COPYING3.  If not see
>>   #include "ppl_c.h"
>>   #include "cloog/cloog.h"
>>   #include "graphite-cloog-util.h"
>> -#include "graphite-cloog-compat.h"
>>
>>   /* Counts the number of constraints in PCS.  */
>>
>> @@ -253,7 +252,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
>>                                            int nb_scatt ATTRIBUTE_UNUSED,
>>                                            CloogState *state ATTRIBUTE_UNUSED)
>>   {
>> -#ifdef CLOOG_ORG
>>    CloogMatrix *mat = new_Cloog_Matrix_from_ppl_Polyhedron (ph);
>>    CloogScattering *res = cloog_scattering_from_cloog_matrix (state, mat,
>>                                                               nb_scatt,
>> @@ -261,9 +259,6 @@ new_Cloog_Scattering_from_ppl_Polyhedron (ppl_const_Polyhedron_t ph,
>>
>>    cloog_matrix_free (mat);
>>    return res;
>> -#else
>> -  return new_Cloog_Domain_from_ppl_Polyhedron (ph, nb_params, state);
>> -#endif
>>   }
>>
>>   /* Creates a CloogDomain from a pointset powerset PS.  */
>> @@ -314,14 +309,14 @@ openscop_print_cloog_matrix (FILE *file, CloogMatrix *mat,
>>                              int output, int input, int locals,
>>                              int params)
>>   {
>> -  int i, j;
>> +  unsigned i, j;
>>
>> -  fprintf (file, "%d %d %d %d %d %d \n", cloog_matrix_nrows (mat),
>> -          cloog_matrix_ncolumns (mat), output, input, locals, params);
>> +  fprintf (file, "%d %d %d %d %d %d \n", mat->NbRows,
>> +          mat->NbColumns, output, input, locals, params);
>>
>> -  for (i = 0; i<  cloog_matrix_nrows (mat); i++)
>> +  for (i = 0; i<  mat->NbRows; i++)
>>      {
>> -      for (j = 0; j<  cloog_matrix_ncolumns (mat); j++)
>> +      for (j = 0; j<  mat->NbColumns; j++)
>>          if (j == 0)
>>           fprintf (file, "%ld ", mpz_get_si (mat->p[i][j]));
>>          else
>> diff --git a/gcc/graphite-cloog-util.h b/gcc/graphite-cloog-util.h
>> index 9686e7c..da26ee9 100644
>> --- a/gcc/graphite-cloog-util.h
>> +++ b/gcc/graphite-cloog-util.h
>> @@ -22,7 +22,6 @@ along with GCC; see the file COPYING3.  If not see
>>   #define GRAPHITE_CLOOG_UTIL_H
>>
>>   #include "cloog/cloog.h"
>> -#include "graphite-cloog-compat.h"
>>
>>   CloogMatrix *new_Cloog_Matrix_from_ppl_Polyhedron (ppl_const_Polyhedron_t);
>>   CloogDomain *new_Cloog_Domain_from_ppl_Polyhedron (ppl_const_Polyhedron_t,
>> diff --git a/gcc/graphite.c b/gcc/graphite.c
>> index b013447..e746c61 100644
>> --- a/gcc/graphite.c
>> +++ b/gcc/graphite.c
>> @@ -209,7 +209,6 @@ graphite_initialize (void)
>>    gcc_assert (ppl_initialized == 0);
>>
>>    cloog_state = cloog_state_malloc ();
>> -  cloog_initialize ();
>>
>>    if (dump_file&&  dump_flags)
>>      dump_function_to_file (current_function_decl, dump_file, dump_flags);
>> @@ -233,7 +232,6 @@ graphite_finalize (bool need_cfg_cleanup_p)
>>      }
>>
>>    cloog_state_free (cloog_state);
>> -  cloog_finalize ();
>>    ppl_finalize ();
>>    free_original_copy_tables ();
>>
>> --
>> 1.7.4.1
>>
>>

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2011-08-10 22:06 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-21 23:46 [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Tobias Grosser
2011-07-21 23:51 ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Tobias Grosser
2011-07-21 23:47   ` [PATCH 2/3] Require cloog 0.16.3 Tobias Grosser
2011-07-21 23:51     ` [PATCH 3/3] Remove code that supported legacy CLooG Tobias Grosser
2011-07-22  0:38       ` Sebastian Pop
2011-07-22  2:20         ` Tobias Grosser
2011-08-02 15:48       ` Sebastian Pop
2011-08-11  3:24         ` Tobias Grosser
2011-08-02 15:48     ` [PATCH 2/3] Require cloog 0.16.3 Sebastian Pop
2011-08-11  2:38       ` Tobias Grosser
2011-08-02 15:47   ` [PATCH 1/3] Make CLooG isl the only supported CLooG version Sebastian Pop
2011-08-11  2:01     ` Tobias Grosser
2011-07-22  0:37 ` [PATCH 0/3] Move Graphite to CLooG 0.16.3 with isl backend Sebastian Pop
2011-07-26 19:04   ` Sebastian Pop
2011-07-22  8:23 ` Richard Guenther
2011-07-22  9:47   ` Tobias Grosser
2011-07-22 13:03     ` Richard Guenther
2011-07-22 12:38 ` Joseph S. Myers
2011-07-26 18:55   ` Sebastian Pop
2011-07-28 17:21     ` Tobias Grosser
2011-07-27 16:43 ` Jack Howarth
2011-07-28 17:51   ` Tobias Grosser

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).