diff options
| author | Richard Biener <rguenther@suse.de> | 2023-10-20 12:22:52 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-10-20 14:14:13 +0200 |
| commit | d70575f542f575133eb4c49eda89ab61eedf83b8 (patch) | |
| tree | 7d99caa893c3fa3df139ccd7fde7ac809954d85f /gcc | |
| parent | c7ec7bd1c6590cf4eed267feab490288e0b8d691 (diff) | |
| download | gcc-d70575f542f575133eb4c49eda89ab61eedf83b8.zip gcc-d70575f542f575133eb4c49eda89ab61eedf83b8.tar.gz gcc-d70575f542f575133eb4c49eda89ab61eedf83b8.tar.bz2 | |
tree-optimization/111891 - fix assert in vectorizable_simd_clone_call
The following fixes the assert in vectorizable_simd_clone_call to
assert we have a vector type during transform. Whether we have
one during analysis depends on whether another SLP user decided
on the type of a constant/external already. When we end up with
a mismatch in desire the updating will fail and make vectorization
fail.
PR tree-optimization/111891
* tree-vect-stmts.cc (vectorizable_simd_clone_call): Fix
assert.
* gfortran.dg/pr111891.f90: New testcase.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr111891.f90 | 21 | ||||
| -rw-r--r-- | gcc/tree-vect-stmts.cc | 8 |
2 files changed, 28 insertions, 1 deletions
diff --git a/gcc/testsuite/gfortran.dg/pr111891.f90 b/gcc/testsuite/gfortran.dg/pr111891.f90 new file mode 100644 index 0000000..1167ed6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr111891.f90 @@ -0,0 +1,21 @@ +! { dg-do compile } +! { dg-options "-O2" } +! { dg-additional-options "-mavx" { target avx } } + +!GCC$ builtin (powf) attributes simd (notinbranch) if('x86_64') + +PARAMETER (NX=3, G=1.4) +DIMENSION T(NX,NX), P(NX,NX) +INTEGER Apx +COMMON P, T + +DO i = 1, 3 + IF (i < 0.0 ) THEN + P(Apx,i) = i**G + T(Apx,i) = i**G + ELSE + P(Apx,i) = 0 + T(Apx,i) = 0 + ENDIF +ENDDO +END diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 8d90286..337b24c 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -4070,7 +4070,13 @@ vectorizable_simd_clone_call (vec_info *vinfo, stmt_vec_info stmt_info, if (thisarginfo.dt == vect_constant_def || thisarginfo.dt == vect_external_def) { - gcc_assert (vec_stmt || thisarginfo.vectype == NULL_TREE); + /* With SLP we determine the vector type of constants/externals + at analysis time, handling conflicts via + vect_maybe_update_slp_op_vectype. At transform time + we have a vector type recorded for SLP. */ + gcc_assert (!vec_stmt + || !slp_node + || thisarginfo.vectype != NULL_TREE); if (!vec_stmt) thisarginfo.vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (op), |