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

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 <s.pop@samsung.com>

From-SVN: r232811
This commit is contained in:
Aditya Kumar 2016-01-26 00:19:11 +00:00 committed by Sebastian Pop
parent c8ee4bf593
commit 1e050c9081
10 changed files with 74 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2016-01-25 Aditya Kumar <aditya.k7@samsung.com>
Sebastian Pop <s.pop@samsung.com>
* Makefile.in: Regenerate.
* Makefile.tpl: Export ISLVER.
* configure: Regenerate.
* config/isl.m4: Detect isl-0.15.
2016-01-24 Mikhail Maltsev <maltsevm@gmail.com>
PR bootstrap/69329

2
Makefile.in
View File

@ -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@

2
Makefile.tpl
View File

@ -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@

12
config/isl.m4
View File

@ -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/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)
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

29
configure vendored
View File

@ -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 <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; }
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

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2016-01-25 Aditya Kumar <aditya.k7@samsung.com>
Sebastian Pop <s.pop@samsung.com>
* Makefile.in: Set ISLVER in site.exp.
2016-01-25 Jakub Jelinek <jakub@redhat.com>
* omp-low.c (lower_omp_target) <case USE_DEVICE_PTR>: Set

1
gcc/Makefile.in
View File

@ -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 -

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2016-01-25 Aditya Kumar <aditya.k7@samsung.com>
Sebastian Pop <s.pop@samsung.com>
* gcc.dg/graphite/graphite.exp: Only run the fuse-*.c tests with
isl-0.15.
2016-01-25 Aditya Kumar <aditya.k7@samsung.com>
Sebastian Pop <s.pop@samsung.com>

4
gcc/testsuite/gcc.dg/graphite/fuse-2.c
View File

@ -28,9 +28,9 @@ main (void)
B[i] = i + 2;
C[i] = i + 1;
}
for(int i=0; i<MAX; i++)
for(i=0; i<MAX; i++)
A[i] += B[i];
for(int i=0; i<MAX; i++)
for(i=0; i<MAX; i++)
A[i] += C[i];
for (i = 0; i < MAX; i++)

8
gcc/testsuite/gcc.dg/graphite/graphite.exp
View File

@ -44,10 +44,10 @@ set run_id_files [lsort [glob -nocomplain $srcdir/$subdir/run-id-*.c ] ]
set opt_files [lsort [glob -nocomplain $srcdir/$subdir/interchange-*.c \
$srcdir/$subdir/uns-interchange-*.c \
$srcdir/$subdir/isl-ast-gen-*.c \
$srcdir/$subdir/fuse-*.c \
$srcdir/$subdir/block-*.c \
$srcdir/$subdir/uns-block-*.c ] ]
set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ]
set fuse_files [lsort [glob -nocomplain $srcdir/$subdir/fuse-*.c ] ]
# Tests to be compiled.
set dg-do-what-default compile
@ -59,6 +59,11 @@ set dg-do-what-default run
dg-runtest $run_id_files "" "-O2 -fgraphite-identity"
dg-runtest $opt_files "" "-O2 -ffast-math -floop-nest-optimize -fdump-tree-graphite-all"
global ISLVER
if { $ISLVER == "0.15" } {
dg-runtest $fuse_files "" "-O2 -ffast-math -floop-nest-optimize -fdump-tree-graphite-all"
}
# Vectorizer tests, to be run or compiled, depending on target capabilities.
global DEFAULT_VECTCFLAGS
set DEFAULT_VECTCFLAGS "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details -ffast-math"
@ -74,6 +79,7 @@ foreach f $id_files {lremove wait_to_run_files $f}
foreach f $run_id_files {lremove wait_to_run_files $f}
foreach f $opt_files {lremove wait_to_run_files $f}
foreach f $vect_files {lremove wait_to_run_files $f}
foreach f $fuse_files {lremove wait_to_run_files $f}
dg-runtest $wait_to_run_files "" "-ansi -pedantic-errors"
# Clean up.