From 93b87d1ddf1e6a94e893a2da550791e43ef4919a Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 15 Feb 2017 15:43:42 +0100 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ Makefile.in | 2 -- Makefile.tpl | 2 -- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 1 - gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/graphite/graphite.exp | 8 +------- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 071a281b142..f4e6dc32ab7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-02-15 Thomas Schwinge + + * Makefile.tpl: Remove HOST_ISLVER. + (HOST_EXPORTS): Remove ISLVER. + * Makefile.in: Regenerate. + 2017-02-13 Richard Biener * configure: Re-generate. diff --git a/Makefile.in b/Makefile.in index 1c0b9e7cdda..da2600b321d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -220,7 +220,6 @@ 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; \ @@ -313,7 +312,6 @@ 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 a6a31660a0f..d0fa07005be 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -223,7 +223,6 @@ 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; \ @@ -316,7 +315,6 @@ 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/gcc/ChangeLog b/gcc/ChangeLog index 7466dab1274..fa0b01ce184 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2017-02-15 Thomas Schwinge + + * Makefile.in (site.exp): Remove "set ISLVER". + 2017-02-15 Jakub Jelinek PR target/79487 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 821584a1703..0cde1aeb1a3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3805,7 +3805,6 @@ 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 a379d2ab6b8..2097fc99d5a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-02-15 Thomas Schwinge + + * gcc.dg/graphite/graphite.exp: Merge "fuse_files" into + "opt_files". + 2017-02-15 Jakub Jelinek PR target/79487 diff --git a/gcc/testsuite/gcc.dg/graphite/graphite.exp b/gcc/testsuite/gcc.dg/graphite/graphite.exp index 2499431503c..50aae309ffd 100644 --- a/gcc/testsuite/gcc.dg/graphite/graphite.exp +++ b/gcc/testsuite/gcc.dg/graphite/graphite.exp @@ -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 \ $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 @@ -64,11 +64,6 @@ 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" @@ -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 $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.