From 1e050c90812529ced914e94ef584d3774b66a360 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Tue, 26 Jan 2016 00:19:11 +0000 Subject: [PATCH] fix PR68343: disable fuse-*.c tests for isl 0.14 or earlier The patch disables all fuse-*.c tests when configuring gcc with isl 0.14 or earlier. ChangeLog: * Makefile.in: Regenerate. * Makefile.tpl: Export ISLVER. * configure: Regenerate. * config/isl.m4: Detect isl-0.15. gcc/ * Makefile.in: Set ISLVER in site.exp. gcc/testsuite/ * gcc.dg/graphite/graphite.exp: Only run the fuse-*.c tests with isl-0.15. Co-Authored-By: Sebastian Pop From-SVN: r232811 --- ChangeLog | 8 ++++++ Makefile.in | 2 ++ Makefile.tpl | 2 ++ config/isl.m4 | 12 +++++++++ configure | 29 ++++++++++++++++++++++ gcc/ChangeLog | 5 ++++ gcc/Makefile.in | 1 + gcc/testsuite/ChangeLog | 6 +++++ gcc/testsuite/gcc.dg/graphite/fuse-2.c | 4 +-- gcc/testsuite/gcc.dg/graphite/graphite.exp | 8 +++++- 10 files changed, 74 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb1d51b91b8..ea0dbd1c8cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-01-25 Aditya Kumar + Sebastian Pop + + * Makefile.in: Regenerate. + * Makefile.tpl: Export ISLVER. + * configure: Regenerate. + * config/isl.m4: Detect isl-0.15. + 2016-01-24 Mikhail Maltsev PR bootstrap/69329 diff --git a/Makefile.in b/Makefile.in index 20d1c900794..a519a547533 100644 --- a/Makefile.in +++ b/Makefile.in @@ -222,6 +222,7 @@ HOST_EXPORTS = \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ + ISLVER="$(HOST_ISLVER)"; export ISLVER; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ @@ -315,6 +316,7 @@ HOST_GMPINC = @gmpinc@ # Where to find isl HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ +HOST_ISLVER = @islver@ # Where to find libelf HOST_LIBELFLIBS = @libelflibs@ diff --git a/Makefile.tpl b/Makefile.tpl index 25673652547..829f664ae00 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -225,6 +225,7 @@ HOST_EXPORTS = \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ + ISLVER="$(HOST_ISLVER)"; export ISLVER; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ @@ -318,6 +319,7 @@ HOST_GMPINC = @gmpinc@ # Where to find isl HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ +HOST_ISLVER = @islver@ # Where to find libelf HOST_LIBELFLIBS = @libelflibs@ diff --git a/config/isl.m4 b/config/isl.m4 index 86ccb94abaf..0103f1f3362 100644 --- a/config/isl.m4 +++ b/config/isl.m4 @@ -117,6 +117,18 @@ AC_DEFUN([ISL_CHECK_VERSION], AC_MSG_RESULT([recommended isl version is 0.15, minimum required isl version 0.14 is deprecated]) fi + AC_MSG_CHECKING([for isl-0.15]) + AC_TRY_LINK([#include ], + [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) + + if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then + islver="0.15" + AC_SUBST([islver]) + fi + CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS LIBS=$_isl_saved_LIBS diff --git a/configure b/configure index cae33738047..b9a4b517046 100755 --- a/configure +++ b/configure @@ -650,6 +650,7 @@ extra_linker_plugin_flags extra_linker_plugin_configure_flags islinc isllibs +islver poststage1_ldflags poststage1_libs stage1_ldflags @@ -6048,6 +6049,34 @@ $as_echo "$gcc_cv_isl" >&6; } $as_echo "recommended isl version is 0.15, minimum required isl version 0.14 is deprecated" >&6; } fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl-0.15" >&5 +$as_echo_n "checking for isl-0.15... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +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; } + + if test x"$ac_has_isl_options_set_schedule_serialize_sccs" = x"yes"; then + islver="0.15" + + fi + CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS LIBS=$_isl_saved_LIBS diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00652e83923..f161d27d60e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-01-25 Aditya Kumar + Sebastian Pop + + * Makefile.in: Set ISLVER in site.exp. + 2016-01-25 Jakub Jelinek * omp-low.c (lower_omp_target) : Set diff --git a/gcc/Makefile.in b/gcc/Makefile.in index ab9cbbfaf02..aa3c01831b4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3698,6 +3698,7 @@ site.exp: ./config.status Makefile echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./site.tmp; \ echo "set GMPINC \"$(GMPINC)\"" >> ./site.tmp; \ fi + @echo "set ISLVER \"$(ISLVER)\"" >> ./site.tmp # If newlib has been configured, we need to pass -B to gcc so it can find # newlib's crt0.o if it exists. This will cause a "path prefix not used" # message if it doesn't, but the testsuite is supposed to ignore the message - diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9f171924297..b06599e26fd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-01-25 Aditya Kumar + Sebastian Pop + + * gcc.dg/graphite/graphite.exp: Only run the fuse-*.c tests with + isl-0.15. + 2016-01-25 Aditya Kumar Sebastian Pop diff --git a/gcc/testsuite/gcc.dg/graphite/fuse-2.c b/gcc/testsuite/gcc.dg/graphite/fuse-2.c index a76f3a660f7..f4cea4360d9 100644 --- a/gcc/testsuite/gcc.dg/graphite/fuse-2.c +++ b/gcc/testsuite/gcc.dg/graphite/fuse-2.c @@ -28,9 +28,9 @@ main (void) B[i] = i + 2; C[i] = i + 1; } - for(int i=0; i