Skip to content

R
riscv-gcc-1
Commit 96e2d1d1 by Richard Biener Committed by Richard Biener
Options

graphite-isl-ast-to-gimple.c (set_codegen_error): With -fchecking and --param… 

graphite-isl-ast-to-gimple.c (set_codegen_error): With -fchecking and --param graphite-allow-codegen-errors=0 ICE.

2017-10-02  Richard Biener  <rguenther@suse.de>

	* graphite-isl-ast-to-gimple.c (set_codegen_error): With
	-fchecking and --param graphite-allow-codegen-errors=0 ICE.
	* params.def (PARAM_GRAPHITE_ALLOW_CODEGEN_ERRORS): New param.

	* gcc.dg/graphite/graphite.exp: Add -fdump-tree-graphite-details.
	* gcc.dg/graphite/id-15.c: Adjust for existing codegen errors.
	* gcc.dg/graphite/id-16.c: Likewise.
	* gcc.dg/graphite/pr46168.c: Likewise.
	* gcc.dg/graphite/pr68756.c: Likewise.
	* gcc.dg/graphite/pr69728.c: Likewise.
	* gcc.dg/graphite/pr71575-2.c: Likewise.
	* gcc.dg/graphite/pr77362.c: Likewise.
	* gcc.dg/graphite/pr81373.c: Likewise.
	* gcc.dg/graphite/run-id-pr67700-1.c: Likewise.
	* gfortran.dg/graphite/interchange-1.f: Likewise.
	* gfortran.dg/graphite/pr29581.f90: Likewise.
	* gfortran.dg/graphite/pr42334-1.f: Likewise.
	* gfortran.dg/graphite/pr42393-1.f90: Likewise.
	* gfortran.dg/graphite/pr42393.f90: Likewise.
	* gfortran.dg/graphite/pr47019.f: Likewise.

From-SVN: r253342
parent a1488398
Showing with 83 additions and 14 deletions
gcc/ChangeLog
2017-10-02 Richard Biener <rguenther@suse.de>
* graphite-isl-ast-to-gimple.c (set_codegen_error): With
-fchecking and --param graphite-allow-codegen-errors=0 ICE.
* params.def (PARAM_GRAPHITE_ALLOW_CODEGEN_ERRORS): New param.
2017-10-02 Richard Sandiford <richard.sandiford@linaro.org> 2017-10-02 Richard Sandiford <richard.sandiford@linaro.org>
* tree.h (wi::int_traits <const_tree>::decompose): Assert that the * tree.h (wi::int_traits <const_tree>::decompose): Assert that the
gcc/graphite-isl-ast-to-gimple.c
...@@ -240,7 +240,14 @@ class translate_isl_ast_to_gimple ...@@ -240,7 +240,14 @@ class translate_isl_ast_to_gimple
void gsi_insert_earliest (gimple_seq seq); void gsi_insert_earliest (gimple_seq seq);
tree rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb); tree rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb);
bool codegen_error_p () const { return codegen_error; } bool codegen_error_p () const { return codegen_error; }
void set_codegen_error () { codegen_error = true; }
void set_codegen_error ()
{
codegen_error = true;
gcc_assert (! flag_checking
|| PARAM_VALUE (PARAM_GRAPHITE_ALLOW_CODEGEN_ERRORS));
}
bool is_constant (tree op) const bool is_constant (tree op) const
{ {
return TREE_CODE (op) == INTEGER_CST return TREE_CODE (op) == INTEGER_CST
......
gcc/params.def
...@@ -894,6 +894,12 @@ DEFPARAM (PARAM_MAX_ISL_OPERATIONS, ...@@ -894,6 +894,12 @@ DEFPARAM (PARAM_MAX_ISL_OPERATIONS,
"maximum number of isl operations, 0 means unlimited", "maximum number of isl operations, 0 means unlimited",
350000, 0, 0) 350000, 0, 0)
/* For testsuite purposes allow to check for codegen error handling. */
DEFPARAM (PARAM_GRAPHITE_ALLOW_CODEGEN_ERRORS,
"graphite-allow-codegen-errors",
"whether codegen errors should be ICEs when -fchecking.",
0, 0, 1)
/* Avoid data dependence analysis on very large loops. */ /* Avoid data dependence analysis on very large loops. */
DEFPARAM (PARAM_LOOP_MAX_DATAREFS_FOR_DATADEPS, DEFPARAM (PARAM_LOOP_MAX_DATAREFS_FOR_DATADEPS,
"loop-max-datarefs-for-datadeps", "loop-max-datarefs-for-datadeps",
......
gcc/testsuite/ChangeLog
2017-10-02 Richard Biener <rguenther@suse.de>
* gcc.dg/graphite/graphite.exp: Add -fdump-tree-graphite-details.
* gcc.dg/graphite/id-15.c: Adjust for existing codegen errors.
* gcc.dg/graphite/id-16.c: Likewise.
* gcc.dg/graphite/pr46168.c: Likewise.
* gcc.dg/graphite/pr68756.c: Likewise.
* gcc.dg/graphite/pr69728.c: Likewise.
* gcc.dg/graphite/pr71575-2.c: Likewise.
* gcc.dg/graphite/pr77362.c: Likewise.
* gcc.dg/graphite/pr81373.c: Likewise.
* gcc.dg/graphite/run-id-pr67700-1.c: Likewise.
* gfortran.dg/graphite/interchange-1.f: Likewise.
* gfortran.dg/graphite/pr29581.f90: Likewise.
* gfortran.dg/graphite/pr42334-1.f: Likewise.
* gfortran.dg/graphite/pr42393-1.f90: Likewise.
* gfortran.dg/graphite/pr42393.f90: Likewise.
* gfortran.dg/graphite/pr47019.f: Likewise.
2017-10-02 Paolo Carlini <paolo.carlini@oracle.com> 2017-10-02 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/69977 PR c++/69977
......
gcc/testsuite/gcc.dg/graphite/graphite.exp
...@@ -57,11 +57,11 @@ set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ] ...@@ -57,11 +57,11 @@ set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.c ] ]
# Tests to be compiled. # Tests to be compiled.
set dg-do-what-default compile set dg-do-what-default compile
dg-runtest $scop_files "" "-O2 -fgraphite -fdump-tree-graphite-all" dg-runtest $scop_files "" "-O2 -fgraphite -fdump-tree-graphite-all"
dg-runtest $id_files "" "-O2 -fgraphite-identity -ffast-math" dg-runtest $id_files "" "-O2 -fgraphite-identity -ffast-math -fdump-tree-graphite-details"
# Tests to be run. # Tests to be run.
set dg-do-what-default run set dg-do-what-default run
dg-runtest $run_id_files "" "-O2 -fgraphite-identity" dg-runtest $run_id_files "" "-O2 -fgraphite-identity -fdump-tree-graphite-details"
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"
# Vectorizer tests, to be run or compiled, depending on target capabilities. # Vectorizer tests, to be run or compiled, depending on target capabilities.
......
gcc/testsuite/gcc.dg/graphite/id-15.c
/* { dg-require-effective-target int32plus } */ /* { dg-require-effective-target int32plus } */
/* { dg-additional-options "--param graphite-allow-codegen-errors=1" { target ilp32 } } */
typedef long unsigned int size_t; typedef long unsigned int size_t;
extern void *memset (void *__s, int __c, size_t __n) __attribute__ ((__nothrow__)) __attribute__ ((__nonnull__ (1))); extern void *memset (void *__s, int __c, size_t __n) __attribute__ ((__nothrow__)) __attribute__ ((__nonnull__ (1)));
...@@ -118,3 +119,4 @@ mul_double (l1, h1, l2, h2, lv, hv) ...@@ -118,3 +119,4 @@ mul_double (l1, h1, l2, h2, lv, hv)
return (*hv < 0 ? ~(toplow & tophigh) : toplow | tophigh) != 0; return (*hv < 0 ? ~(toplow & tophigh) : toplow | tophigh) != 0;
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" { target ilp32 } } } */
gcc/testsuite/gcc.dg/graphite/id-16.c
/* { dg-additional-options "--param graphite-allow-codegen-errors=1" } */
int transformation[(2*19 - 1) * (2*19 - 1)][8]; int transformation[(2*19 - 1) * (2*19 - 1)][8];
const int transformation2[8][2][2] = { const int transformation2[8][2][2] = {
...@@ -42,3 +44,5 @@ transformation_init (void) ...@@ -42,3 +44,5 @@ transformation_init (void)
} }
} }
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr46168.c
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-O -ftree-loop-linear" } */ /* { dg-options "-O -ftree-loop-linear -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" } */
int int
foo (int a[4096], int mi, int mj) foo (int a[4096], int mi, int mj)
...@@ -13,3 +13,5 @@ foo (int a[4096], int mi, int mj) ...@@ -13,3 +13,5 @@ foo (int a[4096], int mi, int mj)
} }
return i16; return i16;
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr68756.c
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-O1 -floop-nest-optimize" } */ /* { dg-options "-O1 -floop-nest-optimize -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" } */
unsigned int z4, pz; unsigned int z4, pz;
int nn[2]; int nn[2];
...@@ -24,3 +24,5 @@ la (void) ...@@ -24,3 +24,5 @@ la (void)
pz = xq (hn); pz = xq (hn);
} }
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr69728.c
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-O3 -floop-nest-optimize" } */ /* { dg-options "-O3 -floop-nest-optimize -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" } */
int a[1]; int a[1];
int b, c, d, e; int b, c, d, e;
...@@ -19,3 +19,5 @@ fn1 () ...@@ -19,3 +19,5 @@ fn1 ()
} }
} }
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr71575-2.c
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-Ofast -floop-nest-optimize" } */ /* { dg-options "-Ofast -floop-nest-optimize -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" } */
int *a; int *a;
int b, c, d, e, g; int b, c, d, e, g;
...@@ -14,3 +14,5 @@ void fn1() { ...@@ -14,3 +14,5 @@ void fn1() {
} }
} }
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr77362.c
/* { dg-do compile } */ /* { dg-do compile } */
/* { dg-options "-O2 -floop-nest-optimize" } */ /* { dg-options "-O2 -floop-nest-optimize -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" } */
int mc[2]; int mc[2];
int f2, sk; int f2, sk;
...@@ -19,3 +19,4 @@ zm (void) ...@@ -19,3 +19,4 @@ zm (void)
} }
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/pr81373.c
/* { dg-options "-fno-tree-scev-cprop -fgraphite-identity -O -fdump-tree-graphite-all" } */ /* { dg-options "-fno-tree-scev-cprop -fgraphite-identity -O -fdump-tree-graphite-all --param graphite-allow-codegen-errors=1" } */
void bar (void); void bar (void);
...@@ -38,3 +38,4 @@ int toto() ...@@ -38,3 +38,4 @@ int toto()
} }
/* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */ /* { dg-final { scan-tree-dump-times "number of SCoPs: 2" 1 "graphite"} } */
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gcc.dg/graphite/run-id-pr67700-1.c
/* { dg-additional-options "--param graphite-allow-codegen-errors=1" } */
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
...@@ -46,3 +48,4 @@ int main() ...@@ -46,3 +48,4 @@ int main()
return 0; return 0;
} }
/* { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } } */
gcc/testsuite/gfortran.dg/graphite/interchange-1.f
! { dg-additional-options "--param graphite-allow-codegen-errors=1" }
subroutine foo(f1,f2,f3,f4,f5,f6,f7,f8,f9,f0,g1,g2,g3) subroutine foo(f1,f2,f3,f4,f5,f6,f7,f8,f9,f0,g1,g2,g3)
implicit none implicit none
integer f4,f3,f2,f1 integer f4,f3,f2,f1
...@@ -42,3 +43,4 @@ ...@@ -42,3 +43,4 @@
! kernel from bwaves. ! kernel from bwaves.
! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } } ! { dg-final { scan-tree-dump-times "will be interchanged" 1 "graphite" { xfail *-*-* } } }
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
gcc/testsuite/gfortran.dg/graphite/pr29581.f90
! PR tree-optimization/29581 ! PR tree-optimization/29581
! { dg-do run } ! { dg-do run }
! { dg-options "-O2 -ftree-loop-linear" } ! { dg-options "-O2 -ftree-loop-linear -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" }
SUBROUTINE FOO (K) SUBROUTINE FOO (K)
INTEGER I, J, K, A(5,5), B INTEGER I, J, K, A(5,5), B
...@@ -25,3 +25,5 @@ ...@@ -25,3 +25,5 @@
A(1,1) = 0 A(1,1) = 0
IF (ANY(A.NE.0)) CALL ABORT IF (ANY(A.NE.0)) CALL ABORT
END END
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
gcc/testsuite/gfortran.dg/graphite/pr42334-1.f
! { dg-options "-O2 -floop-interchange" } ! { dg-options "-O2 -floop-interchange -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" }
subroutine linel(icmdl,stre,anisox) subroutine linel(icmdl,stre,anisox)
real*8 stre(6),tkl(3,3),ekl(3,3),anisox(3,3,3,3) real*8 stre(6),tkl(3,3),ekl(3,3),anisox(3,3,3,3)
...@@ -14,3 +14,5 @@ ...@@ -14,3 +14,5 @@
enddo enddo
stre(1)=tkl(1,1) stre(1)=tkl(1,1)
end end
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
gcc/testsuite/gfortran.dg/graphite/pr42393-1.f90
! { dg-options "-O2 -fgraphite-identity -fno-loop-block -fno-loop-interchange -fno-loop-strip-mine" } ! { dg-options "-O2 -fgraphite-identity -fno-loop-block -fno-loop-interchange -fno-loop-strip-mine --param graphite-allow-codegen-errors=1" }
MODULE beta_gamma_psi MODULE beta_gamma_psi
INTEGER, PARAMETER :: dp=KIND(0.0D0) INTEGER, PARAMETER :: dp=KIND(0.0D0)
...@@ -22,3 +22,5 @@ CONTAINS ...@@ -22,3 +22,5 @@ CONTAINS
fn_val = sum fn_val = sum
END FUNCTION basym END FUNCTION basym
END MODULE beta_gamma_psi END MODULE beta_gamma_psi
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
gcc/testsuite/gfortran.dg/graphite/pr42393.f90
! { dg-options "-O2 -fgraphite-identity -fno-loop-block -fno-loop-interchange -fno-loop-strip-mine" } ! { dg-options "-O2 -fgraphite-identity -fno-loop-block -fno-loop-interchange -fno-loop-strip-mine -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" }
MODULE beta_gamma_psi MODULE beta_gamma_psi
INTEGER, PARAMETER :: dp=KIND(0.0D0) INTEGER, PARAMETER :: dp=KIND(0.0D0)
...@@ -28,3 +28,5 @@ CONTAINS ...@@ -28,3 +28,5 @@ CONTAINS
fn_val = e0*t*u*sum fn_val = e0*t*u*sum
END FUNCTION basym END FUNCTION basym
END MODULE beta_gamma_psi END MODULE beta_gamma_psi
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
gcc/testsuite/gfortran.dg/graphite/pr47019.f
! { dg-options "-O -ftree-pre -fgraphite-identity -fno-tree-copy-prop" } ! { dg-options "-O -ftree-pre -fgraphite-identity -fno-tree-copy-prop -fdump-tree-graphite-details --param graphite-allow-codegen-errors=1" }
subroutine foo (ldmx,ldmy,v) subroutine foo (ldmx,ldmy,v)
integer :: ldmx, ldmy, v, l, m integer :: ldmx, ldmy, v, l, m
...@@ -10,3 +10,5 @@ ...@@ -10,3 +10,5 @@
v(m,3,2) = m v(m,3,2) = m
end do end do
end end
! { dg-final { scan-tree-dump-times "code generation error" 1 "graphite" } }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment