Skip to content

release/19.x: [SLP]Fix PR107036: Check if the type of the user is sizable before requesting its size. #107098

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.

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 1 commit into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15539,6 +15539,11 @@ void BoUpSLP::computeMinimumValueSizes() {
const TreeEntry *UserTE = E.UserTreeIndices.back().UserTE;
if (TE == UserTE || !TE)
return false;
if (!isa<CastInst, BinaryOperator, FreezeInst, PHINode,
SelectInst>(U) ||
!isa<CastInst, BinaryOperator, FreezeInst, PHINode,
SelectInst>(UserTE->getMainOp()))
return true;
unsigned UserTESz = DL->getTypeSizeInBits(
UserTE->Scalars.front()->getType());
auto It = MinBWs.find(TE);
Expand Down
31 changes: 31 additions & 0 deletions llvm/test/Transforms/SLPVectorizer/X86/minbw-user-non-sizable.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
; RUN: opt -S --passes=slp-vectorizer -mtriple=x86_64-unknown-linux-gnu < %s -slp-threshold=-100 | FileCheck %s

define void @test(ptr %i) {
; CHECK-LABEL: define void @test(
; CHECK-SAME: ptr [[I:%.*]]) {
; CHECK-NEXT: [[BB:.*]]:
; CHECK-NEXT: br label %[[BB2:.*]]
; CHECK: [[BB2]]:
; CHECK-NEXT: [[TMP0:%.*]] = phi <2 x i32> [ [[TMP3:%.*]], %[[BB2]] ], [ zeroinitializer, %[[BB]] ]
; CHECK-NEXT: store <2 x i32> [[TMP0]], ptr [[I]], align 4
; CHECK-NEXT: [[TMP1:%.*]] = shufflevector <2 x i32> [[TMP0]], <2 x i32> <i32 0, i32 poison>, <2 x i32> <i32 2, i32 1>
; CHECK-NEXT: [[TMP2:%.*]] = trunc <2 x i32> [[TMP1]] to <2 x i1>
; CHECK-NEXT: [[TMP3]] = select <2 x i1> [[TMP2]], <2 x i32> zeroinitializer, <2 x i32> zeroinitializer
; CHECK-NEXT: br label %[[BB2]]
;
bb:
%i1 = getelementptr i8, ptr %i, i64 4
br label %bb2

bb2:
%i3 = phi i32 [ %i6, %bb2 ], [ 0, %bb ]
%i4 = phi i32 [ %i8, %bb2 ], [ 0, %bb ]
store i32 %i3, ptr %i
store i32 %i4, ptr %i1
%i5 = trunc i32 0 to i1
%i6 = select i1 %i5, i32 0, i32 0
%i7 = trunc i32 %i4 to i1
%i8 = select i1 %i7, i32 0, i32 0
br label %bb2
}
Loading