From 1acde74cf611f560172c74324610c29ca81edf94 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 16 Apr 2020 13:07:51 +0200 Subject: [PATCH] cleanup graphite results This removes { dg-final { scan-tree-dump "tiled" "graphite" } } scans from graphite tests that pass/fail dependent on the ISL version used. Note all scans match the actually dumped "not tiled" messages with ISL 0.12 and not the alternative "tiled by ". With ISL 0.22 neither is printed because the tiling infrastructure doesn't expect the new schedule layout (though looking at a few cases it looks superior with more dimensions marked as permutable. Anyway, the scans have nothing to do with interchange and just add to testsuite noise. 2020-04-16 Richard Biener * gcc.dg/graphite/interchange-1.c: Remove scan for tiled. * gcc.dg/graphite/interchange-10.c: Likewise. * gcc.dg/graphite/interchange-11.c: Likewise. * gcc.dg/graphite/interchange-3.c: Likewise. * gcc.dg/graphite/interchange-4.c: Likewise. * gcc.dg/graphite/interchange-7.c: Likewise. * gcc.dg/graphite/interchange-9.c: Likewise. * gcc.dg/graphite/uns-interchange-9.c: Likewise. * gfortran.dg/graphite/interchange-3.f90: Likewise. --- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/gcc.dg/graphite/interchange-1.c | 7 ------- gcc/testsuite/gcc.dg/graphite/interchange-10.c | 2 -- gcc/testsuite/gcc.dg/graphite/interchange-11.c | 2 -- gcc/testsuite/gcc.dg/graphite/interchange-3.c | 2 -- gcc/testsuite/gcc.dg/graphite/interchange-4.c | 2 -- gcc/testsuite/gcc.dg/graphite/interchange-7.c | 2 -- gcc/testsuite/gcc.dg/graphite/interchange-9.c | 2 -- gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c | 2 -- gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 | 2 -- 10 files changed, 12 insertions(+), 23 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5f3228396bf..f35d4e10371 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2020-04-16 Richard Biener + + * gcc.dg/graphite/interchange-1.c: Remove scan for tiled. + * gcc.dg/graphite/interchange-10.c: Likewise. + * gcc.dg/graphite/interchange-11.c: Likewise. + * gcc.dg/graphite/interchange-3.c: Likewise. + * gcc.dg/graphite/interchange-4.c: Likewise. + * gcc.dg/graphite/interchange-7.c: Likewise. + * gcc.dg/graphite/interchange-9.c: Likewise. + * gcc.dg/graphite/uns-interchange-9.c: Likewise. + * gfortran.dg/graphite/interchange-3.f90: Likewise. + 2020-04-16 Martin Jambor PR tree-optimization/94598 diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-1.c b/gcc/testsuite/gcc.dg/graphite/interchange-1.c index b65d4861e68..65a569e7143 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-1.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-1.c @@ -48,10 +48,3 @@ main (void) return 0; } - -/*FIXME: Between isl 0.12 and isl 0.15 the schedule optimizer needs to print -something canonical so that it can be checked in the test. The final code -generated by both are same in this case but the messaged printed are -not consistent. */ - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-10.c b/gcc/testsuite/gcc.dg/graphite/interchange-10.c index a955644dea9..45c248db84d 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-10.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-10.c @@ -45,5 +45,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-11.c b/gcc/testsuite/gcc.dg/graphite/interchange-11.c index 61028225fc4..6ba6907a52e 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-11.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-11.c @@ -45,5 +45,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-3.c b/gcc/testsuite/gcc.dg/graphite/interchange-3.c index 4aec824183a..e8539e2d3d1 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-3.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-3.c @@ -46,5 +46,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-4.c b/gcc/testsuite/gcc.dg/graphite/interchange-4.c index 463ecb5a66d..1370d5f9d54 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-4.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-4.c @@ -45,5 +45,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-7.c b/gcc/testsuite/gcc.dg/graphite/interchange-7.c index 50f7dd7f8e3..b2696dbec08 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-7.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-7.c @@ -46,5 +46,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/interchange-9.c b/gcc/testsuite/gcc.dg/graphite/interchange-9.c index 88a357893e9..506b5001f83 100644 --- a/gcc/testsuite/gcc.dg/graphite/interchange-9.c +++ b/gcc/testsuite/gcc.dg/graphite/interchange-9.c @@ -43,5 +43,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c b/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c index cc108c2bbc3..a8957803207 100644 --- a/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c +++ b/gcc/testsuite/gcc.dg/graphite/uns-interchange-9.c @@ -44,5 +44,3 @@ main (void) return 0; } - -/* { dg-final { scan-tree-dump "tiled" "graphite" } } */ diff --git a/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 b/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 index 8070bbb4a8d..d827323acd3 100644 --- a/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 +++ b/gcc/testsuite/gfortran.dg/graphite/interchange-3.f90 @@ -23,5 +23,3 @@ Program FOO 366 format(/, ' PC = ',E12.4,/,' UC = ',E12.4,/,' VC = ',E12.4,/) end Program FOO - -! { dg-final { scan-tree-dump "tiled" "graphite" } } -- 2.30.2