This is an archive of the discontinued LLVM Phabricator instance.

Differential D115939

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

Authored by ABataev on Dec 17 2021, 6:18 AM.

Details

Reviewers
fhahn
RKSimon
anton-afanasyev
dtemirbulatov
Commits
rGab9078f3d369: [SLP]Fix PR52756: SLPVectorizer crashes with assertion VecTy == FinalVecTy.
rGfcaf290d0278: [SLP]Fix PR52756: SLPVectorizer crashes with assertion VecTy == FinalVecTy.
Summary

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

Diff Detail

Revision Contents

PathSize
llvm/
lib/
Transforms/
Vectorize/
7 lines
test/
Transforms/
SLPVectorizer/
X86/
40 lines

Diff 395424

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 3,562 Lines • ▼ Show 20 Lines for (Value *V : VL) {
UniqueValues.emplace_back(V); UniqueValues.emplace_back(V);
} }
size_t NumUniqueScalarValues = UniqueValues.size(); size_t NumUniqueScalarValues = UniqueValues.size();
if (NumUniqueScalarValues == VL.size()) { if (NumUniqueScalarValues == VL.size()) {
ReuseShuffleIndicies.clear(); ReuseShuffleIndicies.clear();
} else { } else {
LLVM_DEBUG(dbgs() << "SLP: Shuffle for reused scalars.\n"); LLVM_DEBUG(dbgs() << "SLP: Shuffle for reused scalars.\n");
if (NumUniqueScalarValues <= 1 || if (NumUniqueScalarValues <= 1 ||
(NumUniqueScalarValues == 2 && (UniquePositions.size() == 1 && all_of(UniqueValues,
any_of(UniqueValues, UndefValue::classof)) || [](Value *V) {
return isa<UndefValue>(V) ||
!isConstant(V);
})) ||
!llvm::isPowerOf2_32(NumUniqueScalarValues)) { !llvm::isPowerOf2_32(NumUniqueScalarValues)) {
LLVM_DEBUG(dbgs() << "SLP: Scalar used twice in bundle.\n"); LLVM_DEBUG(dbgs() << "SLP: Scalar used twice in bundle.\n");
newTreeEntry(VL, None /*not vectorized*/, S, UserTreeIdx); newTreeEntry(VL, None /*not vectorized*/, S, UserTreeIdx);
return false; return false;
} }
VL = UniqueValues; VL = UniqueValues;
} }
return true; return true;
▲ Show 20 Lines • Show All 6,641 Lines • Show Last 20 Lines

llvm/test/Transforms/SLPVectorizer/X86/reused-undefs.ll

  • This file was added.
; 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
}