Restore Graphite fuse-*.c testing

* Makefile.tpl: Remove HOST_ISLVER.
	(HOST_EXPORTS): Remove ISLVER.
	* Makefile.in: Regenerate.
	gcc/
	* Makefile.in (site.exp): Remove "set ISLVER".
	gcc/testsuite/
	* gcc.dg/graphite/graphite.exp: Merge "fuse_files" into
	"opt_files".

From-SVN: r245483
This commit is contained in:
Thomas Schwinge 2017-02-15 15:43:42 +01:00 committed by Thomas Schwinge
parent fa8db6eaf2
commit 93b87d1ddf
7 changed files with 16 additions and 12 deletions

View File

@ -1,3 +1,9 @@
2017-02-15 Thomas Schwinge <thomas@codesourcery.com>
* Makefile.tpl: Remove HOST_ISLVER.
(HOST_EXPORTS): Remove ISLVER.
* Makefile.in: Regenerate.
2017-02-13 Richard Biener <rguenther@suse.de> 2017-02-13 Richard Biener <rguenther@suse.de>
* configure: Re-generate. * configure: Re-generate.

View File

@ -220,7 +220,6 @@ HOST_EXPORTS = \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
ISLINC="$(HOST_ISLINC)"; export ISLINC; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
ISLVER="$(HOST_ISLVER)"; export ISLVER; \
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@ -313,7 +312,6 @@ HOST_GMPINC = @gmpinc@
# Where to find isl # Where to find isl
HOST_ISLLIBS = @isllibs@ HOST_ISLLIBS = @isllibs@
HOST_ISLINC = @islinc@ HOST_ISLINC = @islinc@
HOST_ISLVER = @islver@
# Where to find libelf # Where to find libelf
HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFLIBS = @libelflibs@

View File

@ -223,7 +223,6 @@ HOST_EXPORTS = \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
ISLINC="$(HOST_ISLINC)"; export ISLINC; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
ISLVER="$(HOST_ISLVER)"; export ISLVER; \
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@ -316,7 +315,6 @@ HOST_GMPINC = @gmpinc@
# Where to find isl # Where to find isl
HOST_ISLLIBS = @isllibs@ HOST_ISLLIBS = @isllibs@
HOST_ISLINC = @islinc@ HOST_ISLINC = @islinc@
HOST_ISLVER = @islver@
# Where to find libelf # Where to find libelf
HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFLIBS = @libelflibs@

View File

@ -1,3 +1,7 @@
2017-02-15 Thomas Schwinge <thomas@codesourcery.com>
* Makefile.in (site.exp): Remove "set ISLVER".
2017-02-15 Jakub Jelinek <jakub@redhat.com> 2017-02-15 Jakub Jelinek <jakub@redhat.com>
PR target/79487 PR target/79487

View File

@ -3805,7 +3805,6 @@ site.exp: ./config.status Makefile
echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./site.tmp; \ echo "set PLUGINCFLAGS \"$(PLUGINCFLAGS)\"" >> ./site.tmp; \
echo "set GMPINC \"$(GMPINC)\"" >> ./site.tmp; \ echo "set GMPINC \"$(GMPINC)\"" >> ./site.tmp; \
fi fi
@echo "set ISLVER \"$(ISLVER)\"" >> ./site.tmp
# If newlib has been configured, we need to pass -B to gcc so it can find # 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" # 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 - # message if it doesn't, but the testsuite is supposed to ignore the message -

View File

@ -1,3 +1,8 @@
2017-02-15 Thomas Schwinge <thomas@codesourcery.com>
* gcc.dg/graphite/graphite.exp: Merge "fuse_files" into
"opt_files".
2017-02-15 Jakub Jelinek <jakub@redhat.com> 2017-02-15 Jakub Jelinek <jakub@redhat.com>
PR target/79487 PR target/79487

View File

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