OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac: Permit also ISL 0.15 with CLooG. 

2015-11-18  Matthias Klose  <doko@ubuntu.com>

        * configure.ac: Permit also ISL 0.15 with CLooG.
        * configure: Regenerate.

gcc/
2015-11-18  Matthias Klose  <doko@ubuntu.com>

        Backport from the gcc-5-branch

        Backport from mainline
        2015-07-21  Mike Frysinger  <vapier@gentoo.org>
                    Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>

        * configure.ac: Add check for new options in isl-0.15.
        * config.in, configure: Rebuilt.
        * graphite-blocking.c: Include <isl/constraint.h>
        * graphite-interchange.c,  graphite-poly.c: Likewise.
        * graphhite-scop-detection.c, graphite-sese-to-poly.c: Likewise.
        * graphite.c, graphite-poly.c: Likewise.
        * graphite-dependences.c: Include <isl/constraint.h>.
        (max_number_of_out_dimensions): Returns isl_stat.
        (extend_schedule_1): Likewise
        (extend_schedule): Corresponding changes.
        * graphite-optimize-isl.c: Include <isl/constraint.h> and
        <isl/union_set.h>.
        (getSingleMap): Change return type of isl_stat.
        (optimize_isl): Conditionally use
        isl_options_set_schedule_serialize_sccs.
        * graphite-poly.h (isl_stat, isl_stat_ok): Define fallbacks
        if not HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS.

From-SVN: r230610
This commit is contained in:
Matthias Klose 2015-11-19 15:19:13 +00:00 committed by Matthias Klose
parent 4f877c6206
commit 7d04e41de3
16 changed files with 160 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-11-18 Matthias Klose <doko@ubuntu.com>
* configure.ac: Permit also ISL 0.15 with CLooG.
* configure: Regenerate.
2015-06-26 Release Manager
* GCC 4.9.3 released.

49
configure vendored
View File

@ -6072,6 +6072,55 @@ $as_echo "$gcc_cv_isl" >&6; }
fi
if test "${gcc_cv_isl}" = no ; then
if test "${ENABLE_ISL_CHECK}" = yes ; then
_isl_saved_CFLAGS=$CFLAGS
_isl_saved_LDFLAGS=$LDFLAGS
_isl_saved_LIBS=$LIBS
CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.15 of ISL" >&5
$as_echo_n "checking for version 0.15 of ISL... " >&6; }
if test "$cross_compiling" = yes; then :
gcc_cv_isl=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <isl/version.h>
#include <string.h>
int
main ()
{
if (strncmp (isl_version (), "isl-0.15", strlen ("isl-0.15")) != 0)
return 1;
;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
gcc_cv_isl=yes
else
gcc_cv_isl=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
$as_echo "$gcc_cv_isl" >&6; }
CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
LIBS=$_isl_saved_LIBS
fi
fi
fi
fi
fi

3
configure.ac
View File

@ -1660,6 +1660,9 @@ if test "x$with_isl" != "xno" &&
ISL_CHECK_VERSION(0,12)
if test "${gcc_cv_isl}" = no ; then
ISL_CHECK_VERSION(0,14)
if test "${gcc_cv_isl}" = no ; then
ISL_CHECK_VERSION(0,15)
fi
fi
fi
fi

25
gcc/ChangeLog
View File

@ -1,3 +1,28 @@
2015-11-19 Matthias Klose <doko@ubuntu.com>
Backport from the gcc-5-branch
2015-07-21 Mike Frysinger <vapier@gentoo.org>
Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
* configure.ac: Add check for new options in isl-0.15.
* config.in, configure: Rebuilt.
* graphite-blocking.c: Include <isl/constraint.h>
* graphite-interchange.c, graphite-poly.c: Likewise.
* graphhite-scop-detection.c, graphite-sese-to-poly.c: Likewise.
* graphite.c, graphite-poly.c: Likewise.
* graphite-dependences.c: Include <isl/constraint.h>.
(max_number_of_out_dimensions): Returns isl_stat.
(extend_schedule_1): Likewise
(extend_schedule): Corresponding changes.
* graphite-optimize-isl.c: Include <isl/constraint.h> and
<isl/union_set.h>.
(getSingleMap): Change return type of isl_stat.
(optimize_isl): Conditionally use
isl_options_set_schedule_serialize_sccs.
* graphite-poly.h (isl_stat, isl_stat_ok): Define fallbacks
if not HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS.
2015-11-19 Eric Botcazou <ebotcazou@adacore.com>
PR lto/61313

6
gcc/config.in
View File

@ -1223,6 +1223,12 @@
#endif
/* Define if isl_options_set_schedule_serialize_sccs exists. */
#ifndef USED_FOR_TARGET
#undef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
#endif
/* Define if isl_schedule_constraints_compute_schedule exists. */
#ifndef USED_FOR_TARGET
#undef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE

31
gcc/configure vendored
View File

@ -27947,6 +27947,8 @@ $as_echo "#define HAVE_cloog 1" >>confdefs.h
# Check whether isl_schedule_constraints_compute_schedule is available;
# it's new in ISL-0.13.
# Check whether isl_options_set_schedule_serialize_sccs is available;
# it's new in ISL-0.15.
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ISLINC"
saved_LIBS="$LIBS"
@ -27975,6 +27977,29 @@ rm -f core conftest.err conftest.$ac_objext \
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_isl_schedule_constraints_compute_schedule" >&5
$as_echo "$ac_has_isl_schedule_constraints_compute_schedule" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking for isl_options_set_schedule_serialize_sccs" >&5
$as_echo_n "checking Checking for isl_options_set_schedule_serialize_sccs... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <isl/schedule.h>
int
main ()
{
isl_options_set_schedule_serialize_sccs (NULL, 0);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_has_isl_options_set_schedule_serialize_sccs=yes
else
ac_has_isl_options_set_schedule_serialize_sccs=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_has_isl_options_set_schedule_serialize_sccs" >&5
$as_echo "$ac_has_isl_options_set_schedule_serialize_sccs" >&6; }
LIBS="$saved_LIBS"
CFLAGS="$saved_CFLAGS"
@ -27983,6 +28008,12 @@ $as_echo "$ac_has_isl_schedule_constraints_compute_schedule" >&6; }
$as_echo "#define HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE 1" >>confdefs.h
fi
if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then
$as_echo "#define HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS 1" >>confdefs.h
fi
fi

14
gcc/configure.ac
View File

@ -5535,6 +5535,8 @@ if test "x${CLOOGLIBS}" != "x" ; then
# Check whether isl_schedule_constraints_compute_schedule is available;
# it's new in ISL-0.13.
# Check whether isl_options_set_schedule_serialize_sccs is available;
# it's new in ISL-0.15.
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ISLINC"
saved_LIBS="$LIBS"
@ -5547,6 +5549,13 @@ if test "x${CLOOGLIBS}" != "x" ; then
[ac_has_isl_schedule_constraints_compute_schedule=no])
AC_MSG_RESULT($ac_has_isl_schedule_constraints_compute_schedule)
AC_MSG_CHECKING([Checking for isl_options_set_schedule_serialize_sccs])
AC_TRY_LINK([#include <isl/schedule.h>],
[isl_options_set_schedule_serialize_sccs (NULL, 0);],
[ac_has_isl_options_set_schedule_serialize_sccs=yes],
[ac_has_isl_options_set_schedule_serialize_sccs=no])
AC_MSG_RESULT($ac_has_isl_options_set_schedule_serialize_sccs)
LIBS="$saved_LIBS"
CFLAGS="$saved_CFLAGS"
@ -5554,6 +5563,11 @@ if test "x${CLOOGLIBS}" != "x" ; then
AC_DEFINE(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE, 1,
[Define if isl_schedule_constraints_compute_schedule exists.])
fi
if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then
AC_DEFINE(HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS, 1,
[Define if isl_options_set_schedule_serialize_sccs exists.])
fi
fi

1
gcc/graphite-blocking.c
View File

@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/union_map.h>

15
gcc/graphite-dependences.c
View File

@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/union_map.h>
@ -183,7 +184,7 @@ scop_get_transformed_schedule (scop_p scop, vec<poly_bb_p> pbbs)
/* Helper function used on each MAP of a isl_union_map. Computes the
maximal output dimension. */
static int
static isl_stat
max_number_of_out_dimensions (__isl_take isl_map *map, void *user)
{
int global_max = *((int *) user);
@ -195,7 +196,7 @@ max_number_of_out_dimensions (__isl_take isl_map *map, void *user)
isl_map_free (map);
isl_space_free (space);
return 0;
return isl_stat_ok;
}
/* Extends the output dimension of MAP to MAX dimensions. */
@ -219,12 +220,12 @@ struct extend_schedule_str {
/* Helper function for extend_schedule. */
static int
static isl_stat
extend_schedule_1 (__isl_take isl_map *map, void *user)
{
struct extend_schedule_str *str = (struct extend_schedule_str *) user;
str->umap = isl_union_map_add_map (str->umap, extend_map (map, str->max));
return 0;
return isl_stat_ok;
}
/* Return a relation that has uniform output dimensions. */
@ -233,16 +234,16 @@ __isl_give isl_union_map *
extend_schedule (__isl_take isl_union_map *x)
{
int max = 0;
int res;
isl_stat res;
struct extend_schedule_str str;
res = isl_union_map_foreach_map (x, max_number_of_out_dimensions, (void *) &max);
gcc_assert (res == 0);
gcc_assert (res == isl_stat_ok);
str.max = max;
str.umap = isl_union_map_empty (isl_union_map_get_space (x));
res = isl_union_map_foreach_map (x, extend_schedule_1, (void *) &str);
gcc_assert (res == 0);
gcc_assert (res == isl_stat_ok);
isl_union_map_free (x);
return str.umap;

1
gcc/graphite-interchange.c
View File

@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/aff.h>
#include <isl/set.h>
#include <isl/map.h>

10
gcc/graphite-optimize-isl.c
View File

@ -21,7 +21,9 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/union_set.h>
#include <isl/map.h>
#include <isl/union_map.h>
#include <isl/schedule.h>
@ -415,13 +417,13 @@ getScheduleMap (isl_schedule *Schedule)
return ScheduleMap;
}
static int
static isl_stat
getSingleMap (__isl_take isl_map *map, void *user)
{
isl_map **singleMap = (isl_map **) user;
*singleMap = map;
return 0;
return isl_stat_ok;
}
static void
@ -469,7 +471,11 @@ optimize_isl (scop_p scop)
isl_options_set_schedule_max_constant_term (scop->ctx, CONSTANT_BOUND);
isl_options_set_schedule_maximize_band_depth (scop->ctx, 1);
#ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
isl_options_set_schedule_serialize_sccs (scop->ctx, 1);
#else
isl_options_set_schedule_fuse (scop->ctx, ISL_SCHEDULE_FUSE_MIN);
#endif
isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_CONTINUE);
schedule = isl_union_set_compute_schedule (domain, validity, proximity);
isl_options_set_on_error (scop->ctx, ISL_ON_ERROR_ABORT);

1
gcc/graphite-poly.c
View File

@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/union_map.h>

5
gcc/graphite-poly.h
View File

@ -22,6 +22,11 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_GRAPHITE_POLY_H
#define GCC_GRAPHITE_POLY_H
#ifndef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS
# define isl_stat int
# define isl_stat_ok 0
#endif
typedef struct poly_dr *poly_dr_p;
typedef struct poly_bb *poly_bb_p;

1
gcc/graphite-scop-detection.c
View File

@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/union_map.h>

1
gcc/graphite-sese-to-poly.c
View File

@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/union_map.h>

1
gcc/graphite.c
View File

@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "config.h"
#ifdef HAVE_cloog
#include <isl/constraint.h>
#include <isl/set.h>
#include <isl/map.h>
#include <isl/options.h>