OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[SLP]Fix PR52756: SLPVectorizer crashes with assertion VecTy == FinalVecTy. 

Need to check for the number of the unique non-constant values since the
unique values may include several constants.

Differential Revision: https://reviews.llvm.org/D115939
This commit is contained in:
Alexey Bataev 2021-12-17 05:46:10 -08:00
parent 98d09705e1
commit fcaf290d02
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -3568,8 +3568,11 @@ void BoUpSLP::buildTree_rec(ArrayRef<Value *> VL, unsigned Depth,
} else {
LLVM_DEBUG(dbgs() << "SLP: Shuffle for reused scalars.\n");
if (NumUniqueScalarValues <= 1 ||
(NumUniqueScalarValues == 2 &&
any_of(UniqueValues, UndefValue::classof)) ||
(UniquePositions.size() == 1 && all_of(UniqueValues,
[](Value *V) {
return isa<UndefValue>(V) ||
!isConstant(V);
})) ||
!llvm::isPowerOf2_32(NumUniqueScalarValues)) {
LLVM_DEBUG(dbgs() << "SLP: Scalar used twice in bundle.\n");
newTreeEntry(VL, None /*not vectorized*/, S, UserTreeIdx);

40
llvm/test/Transforms/SLPVectorizer/X86/reused-undefs.ll Normal file
View File

@ -0,0 +1,40 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -slp-vectorizer -mtriple=x86_64-unknown-linux-gnu -slp-threshold=-1000 < %s | FileCheck %s
define i32 @main(i32 %0) {
; CHECK-LABEL: @main(
; CHECK-NEXT: for.cond.preheader:
; CHECK-NEXT: br i1 false, label [[FOR_END:%.*]], label [[FOR_INC_PREHEADER:%.*]]
; CHECK: for.inc.preheader:
; CHECK-NEXT: [[TMP1:%.*]] = insertelement <8 x i32> <i32 0, i32 0, i32 0, i32 0, i32 0, i32 0, i32 poison, i32 poison>, i32 [[TMP0:%.*]], i32 6
; CHECK-NEXT: br i1 false, label [[FOR_END]], label [[L1_PREHEADER:%.*]]
; CHECK: for.end:
; CHECK-NEXT: [[DOTPR:%.*]] = phi i32 [ 0, [[FOR_INC_PREHEADER]] ], [ 0, [[FOR_COND_PREHEADER:%.*]] ]
; CHECK-NEXT: [[TMP2:%.*]] = insertelement <8 x i32> poison, i32 [[DOTPR]], i32 0
; CHECK-NEXT: [[SHUFFLE:%.*]] = shufflevector <8 x i32> [[TMP2]], <8 x i32> poison, <8 x i32> <i32 undef, i32 undef, i32 undef, i32 0, i32 0, i32 0, i32 0, i32 0>
; CHECK-NEXT: br label [[L1_PREHEADER]]
; CHECK: L1.preheader:
; CHECK-NEXT: [[TMP3:%.*]] = phi <8 x i32> [ [[SHUFFLE]], [[FOR_END]] ], [ [[TMP1]], [[FOR_INC_PREHEADER]] ]
; CHECK-NEXT: ret i32 0
;
for.cond.preheader:
br i1 false, label %for.end, label %for.inc.preheader
for.inc.preheader:
br i1 false, label %for.end, label %L1.preheader
for.end:
%.pr = phi i32 [ 0, %for.inc.preheader ], [ 0, %for.cond.preheader ]
br label %L1.preheader
L1.preheader:
%1 = phi i32 [ %.pr, %for.end ], [ %0, %for.inc.preheader ]
%2 = phi i32 [ %.pr, %for.end ], [ 0, %for.inc.preheader ]
%3 = phi i32 [ %.pr, %for.end ], [ 0, %for.inc.preheader ]
%4 = phi i32 [ %.pr, %for.end ], [ undef, %for.inc.preheader ]
%j.2.ph1 = phi i32 [ %.pr, %for.end ], [ 0, %for.inc.preheader ]
%k.0.ph = phi i32 [ undef, %for.end ], [ 0, %for.inc.preheader ]
%o.1.ph = phi i32 [ undef, %for.end ], [ 0, %for.inc.preheader ]
%n.1.ph = phi i32 [ undef, %for.end ], [ 0, %for.inc.preheader ]
ret i32 0
}