Skip to content

[SLP][REVEC] The vectorized result for ShuffleVector may not be ShuffleVectorInst. #116940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2024
Merged

[SLP][REVEC] The vectorized result for ShuffleVector may not be ShuffleVectorInst. #116940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0667878
[SLP][REVEC] Pre-commit test.
HanKuanChen Nov 20, 2024
f449be8
[SLP][REVEC] The vectorized result for ShuffleVector may not be
HanKuanChen Nov 20, 2024
9dd249c
apply comment
HanKuanChen Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15713,16 +15713,18 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E, bool PostponedPHIs) {
LLVM_DEBUG(dbgs() << "SLP: Diamond merged for " << *VL0 << ".\n");
return E->VectorizedValue;
}
assert(isa<ShuffleVectorInst>(Src) &&
"Not supported shufflevector usage.");
auto *SVSrc = cast<ShuffleVectorInst>(Src);
assert(isa<PoisonValue>(SVSrc->getOperand(1)) &&
"Not supported shufflevector usage.");
SmallVector<int> ThisMask(calculateShufflevectorMask(E->Scalars));
SmallVector<int> NewMask(ThisMask.size());
transform(ThisMask, NewMask.begin(),
[&SVSrc](int Mask) { return SVSrc->getShuffleMask()[Mask]; });
V = Builder.CreateShuffleVector(SVSrc->getOperand(0), NewMask);
if (auto *SVSrc = dyn_cast<ShuffleVectorInst>(Src)) {
assert(isa<PoisonValue>(SVSrc->getOperand(1)) &&
"Not supported shufflevector usage.");
SmallVector<int> NewMask(ThisMask.size());
transform(ThisMask, NewMask.begin(), [&SVSrc](int Mask) {
return SVSrc->getShuffleMask()[Mask];
});
V = Builder.CreateShuffleVector(SVSrc->getOperand(0), NewMask);
Comment on lines +15720 to +15724
Copy link
Member

@alexey-bataev alexey-bataev Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it just copy the original shuffle mask for SVSrc and create a copy of SVSrc?

Copy link
Contributor Author

@HanKuanChen HanKuanChen Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. SVSrc has its own mask. But the current shufflevector has its own mask (from calculateShufflevectorMask(E->Scalars)) too. We are trying to blend the mask from calculateShufflevectorMask and SVSrc.

} else {
V = Builder.CreateShuffleVector(Src, ThisMask);
}
propagateIRFlags(V, E->Scalars, VL0);
if (auto *I = dyn_cast<Instruction>(V))
V = propagateMetadata(I, E->Scalars);
Expand Down
16 changes: 16 additions & 0 deletions llvm/test/Transforms/SLPVectorizer/revec-shufflevector.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,19 @@ entry:
store <4 x i32> %2, ptr %6, align 4
ret void
}

define void @test5(ptr %out) {
; CHECK-LABEL: @test5(
; CHECK-NEXT: entry:
; CHECK-NEXT: store <8 x i32> zeroinitializer, ptr [[OUT:%.*]], align 4
; CHECK-NEXT: ret void
;
entry:
%0 = shufflevector <8 x i32> zeroinitializer, <8 x i32> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 3>
%1 = shufflevector <8 x i32> zeroinitializer, <8 x i32> poison, <4 x i32> <i32 4, i32 5, i32 6, i32 7>
%2 = getelementptr inbounds i32, ptr %out, i64 0
%3 = getelementptr inbounds i32, ptr %out, i64 4
store <4 x i32> %0, ptr %2, align 4
store <4 x i32> %1, ptr %3, align 4
ret void
}
Loading