[SLP] Check if instructions exist after vectorization #120434

dianqk · 2024-12-18T15:09:28Z

Fixes #120433.

llvmbot · 2024-12-18T15:10:06Z

@llvm/pr-subscribers-llvm-transforms

Author: DianQK (DianQK)

Changes

Fixes #120433.

Full diff: https://github.com/llvm/llvm-project/pull/120434.diff

2 Files Affected:

(modified) llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp (+4-1)
(added) llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll (+51)

diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index d967813075bb9f..88049897b29ab1 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -21148,8 +21148,11 @@ bool SLPVectorizerPass::vectorizeCmpInsts(iterator_range<ItT> CmpInsts,
     if (R.isDeleted(I))
       continue;
     for (Value *Op : I->operands())
-      if (auto *RootOp = dyn_cast<Instruction>(Op))
+      if (auto *RootOp = dyn_cast<Instruction>(Op)) {
         Changed |= vectorizeRootInstruction(nullptr, RootOp, BB, R);
+        if (R.isDeleted(I))
+          break;
+      }
   }
   // Try to vectorize operands as vector bundles.
   for (CmpInst *I : CmpInsts) {
diff --git a/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll b/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll
new file mode 100644
index 00000000000000..d3995f1bb7f85d
--- /dev/null
+++ b/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll
@@ -0,0 +1,51 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S -passes=slp-vectorizer < %s | FileCheck %s
+
+define void @foo() {
+; CHECK-LABEL: define void @foo() {
+; CHECK-NEXT:  [[BB:.*]]:
+; CHECK-NEXT:    br label %[[BB1:.*]]
+; CHECK:       [[BB1]]:
+; CHECK-NEXT:    [[TMP0:%.*]] = phi <2 x i32> [ [[TMP11:%.*]], %[[BB3:.*]] ], [ zeroinitializer, %[[BB]] ]
+; CHECK-NEXT:    br label %[[BB3]]
+; CHECK:       [[BB3]]:
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc <2 x i32> [[TMP0]] to <2 x i1>
+; CHECK-NEXT:    [[TMP2:%.*]] = mul <2 x i1> [[TMP1]], zeroinitializer
+; CHECK-NEXT:    [[TMP3:%.*]] = or <2 x i1> zeroinitializer, [[TMP2]]
+; CHECK-NEXT:    [[TMP4:%.*]] = and <2 x i1> [[TMP3]], zeroinitializer
+; CHECK-NEXT:    [[TMP5:%.*]] = extractelement <2 x i1> [[TMP4]], i32 0
+; CHECK-NEXT:    [[TMP6:%.*]] = zext i1 [[TMP5]] to i32
+; CHECK-NEXT:    [[TMP7:%.*]] = extractelement <2 x i1> [[TMP4]], i32 1
+; CHECK-NEXT:    [[TMP8:%.*]] = zext i1 [[TMP7]] to i32
+; CHECK-NEXT:    [[I22:%.*]] = or i32 [[TMP6]], [[TMP8]]
+; CHECK-NEXT:    [[TMP9:%.*]] = insertelement <2 x i32> <i32 poison, i32 0>, i32 [[I22]], i32 0
+; CHECK-NEXT:    [[TMP10:%.*]] = icmp ult <2 x i32> [[TMP9]], zeroinitializer
+; CHECK-NEXT:    [[TMP11]] = select <2 x i1> [[TMP10]], <2 x i32> zeroinitializer, <2 x i32> zeroinitializer
+; CHECK-NEXT:    br label %[[BB1]]
+;
+bb:
+  br label %bb1
+
+bb1:                                              ; preds = %bb3, %bb
+  %i = phi i32 [ %i26, %bb3 ], [ 0, %bb ]
+  %i2 = phi i32 [ %i24, %bb3 ], [ 0, %bb ]
+  br label %bb3
+
+bb3:                                              ; preds = %bb1
+  %i4 = zext i32 %i2 to i64
+  %i5 = mul i64 %i4, 0
+  %i10 = or i64 0, %i5
+  %i11 = trunc i64 %i10 to i32
+  %i12 = and i32 %i11, 0
+  %i13 = zext i32 %i to i64
+  %i14 = mul i64 %i13, 0
+  %i19 = or i64 0, %i14
+  %i20 = trunc i64 %i19 to i32
+  %i21 = and i32 %i20, 0
+  %i22 = or i32 %i12, %i21
+  %i23 = icmp ult i32 %i22, 0
+  %i24 = select i1 %i23, i32 0, i32 0
+  %i25 = icmp ult i32 0, 0
+  %i26 = select i1 %i25, i32 0, i32 0
+  br label %bb1
+}

llvmbot · 2024-12-18T15:10:06Z

@llvm/pr-subscribers-vectorizers

Author: DianQK (DianQK)

Changes

Fixes #120433.

Full diff: https://github.com/llvm/llvm-project/pull/120434.diff

2 Files Affected:

(modified) llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp (+4-1)
(added) llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll (+51)

diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index d967813075bb9f..88049897b29ab1 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -21148,8 +21148,11 @@ bool SLPVectorizerPass::vectorizeCmpInsts(iterator_range<ItT> CmpInsts,
     if (R.isDeleted(I))
       continue;
     for (Value *Op : I->operands())
-      if (auto *RootOp = dyn_cast<Instruction>(Op))
+      if (auto *RootOp = dyn_cast<Instruction>(Op)) {
         Changed |= vectorizeRootInstruction(nullptr, RootOp, BB, R);
+        if (R.isDeleted(I))
+          break;
+      }
   }
   // Try to vectorize operands as vector bundles.
   for (CmpInst *I : CmpInsts) {
diff --git a/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll b/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll
new file mode 100644
index 00000000000000..d3995f1bb7f85d
--- /dev/null
+++ b/llvm/test/Transforms/SLPVectorizer/slp-deleted-inst.ll
@@ -0,0 +1,51 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt -S -passes=slp-vectorizer < %s | FileCheck %s
+
+define void @foo() {
+; CHECK-LABEL: define void @foo() {
+; CHECK-NEXT:  [[BB:.*]]:
+; CHECK-NEXT:    br label %[[BB1:.*]]
+; CHECK:       [[BB1]]:
+; CHECK-NEXT:    [[TMP0:%.*]] = phi <2 x i32> [ [[TMP11:%.*]], %[[BB3:.*]] ], [ zeroinitializer, %[[BB]] ]
+; CHECK-NEXT:    br label %[[BB3]]
+; CHECK:       [[BB3]]:
+; CHECK-NEXT:    [[TMP1:%.*]] = trunc <2 x i32> [[TMP0]] to <2 x i1>
+; CHECK-NEXT:    [[TMP2:%.*]] = mul <2 x i1> [[TMP1]], zeroinitializer
+; CHECK-NEXT:    [[TMP3:%.*]] = or <2 x i1> zeroinitializer, [[TMP2]]
+; CHECK-NEXT:    [[TMP4:%.*]] = and <2 x i1> [[TMP3]], zeroinitializer
+; CHECK-NEXT:    [[TMP5:%.*]] = extractelement <2 x i1> [[TMP4]], i32 0
+; CHECK-NEXT:    [[TMP6:%.*]] = zext i1 [[TMP5]] to i32
+; CHECK-NEXT:    [[TMP7:%.*]] = extractelement <2 x i1> [[TMP4]], i32 1
+; CHECK-NEXT:    [[TMP8:%.*]] = zext i1 [[TMP7]] to i32
+; CHECK-NEXT:    [[I22:%.*]] = or i32 [[TMP6]], [[TMP8]]
+; CHECK-NEXT:    [[TMP9:%.*]] = insertelement <2 x i32> <i32 poison, i32 0>, i32 [[I22]], i32 0
+; CHECK-NEXT:    [[TMP10:%.*]] = icmp ult <2 x i32> [[TMP9]], zeroinitializer
+; CHECK-NEXT:    [[TMP11]] = select <2 x i1> [[TMP10]], <2 x i32> zeroinitializer, <2 x i32> zeroinitializer
+; CHECK-NEXT:    br label %[[BB1]]
+;
+bb:
+  br label %bb1
+
+bb1:                                              ; preds = %bb3, %bb
+  %i = phi i32 [ %i26, %bb3 ], [ 0, %bb ]
+  %i2 = phi i32 [ %i24, %bb3 ], [ 0, %bb ]
+  br label %bb3
+
+bb3:                                              ; preds = %bb1
+  %i4 = zext i32 %i2 to i64
+  %i5 = mul i64 %i4, 0
+  %i10 = or i64 0, %i5
+  %i11 = trunc i64 %i10 to i32
+  %i12 = and i32 %i11, 0
+  %i13 = zext i32 %i to i64
+  %i14 = mul i64 %i13, 0
+  %i19 = or i64 0, %i14
+  %i20 = trunc i64 %i19 to i32
+  %i21 = and i32 %i20, 0
+  %i22 = or i32 %i12, %i21
+  %i23 = icmp ult i32 %i22, 0
+  %i24 = select i1 %i23, i32 0, i32 0
+  %i25 = icmp ult i32 0, 0
+  %i26 = select i1 %i25, i32 0, i32 0
+  br label %bb1
+}

alexey-bataev

LG

dianqk · 2024-12-18T22:23:11Z

/cherry-pick e7a4d78

llvmbot · 2024-12-18T22:28:31Z

Failed to cherry-pick: e7a4d78

https://github.com/llvm/llvm-project/actions/runs/12402342030

Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request

Fixes llvm#120433. (cherry picked from commit e7a4d78)

dianqk · 2024-12-19T00:28:19Z

PR: #120505

Fixes llvm#120433. (cherry picked from commit e7a4d78)

Fixes llvm#120433. (cherry-picked from 586119118634fab434917a78889338d9f5e4f94)

[SLP] Check if instructions exist after vectorization (llvm#120434) Fixes llvm#120433. (cherry-picked from 5861191) rdar://148832843

Fixes llvm#120433. (cherry-picked from e7a4d78) rdar://148832843

[SLP] Check if instructions exist after vectorization (llvm#120434)

[SLP] Check if instructions exist after vectorization

bf6c774

dianqk requested review from HanKuanChen and alexey-bataev December 18, 2024 15:09

llvmbot added vectorizers llvm:transforms labels Dec 18, 2024

alexey-bataev approved these changes Dec 18, 2024

View reviewed changes

dianqk merged commit e7a4d78 into llvm:main Dec 18, 2024
11 checks passed

dianqk deleted the slp branch December 18, 2024 22:22

dianqk added this to the LLVM 19.X Release milestone Dec 18, 2024

llvmbot added the release:cherry-pick-failed label Dec 18, 2024

dianqk added a commit to dianqk/llvm-project that referenced this pull request Dec 19, 2024

[SLP] Check if instructions exist after vectorization (llvm#120434)

d7f48a1

Fixes llvm#120433. (cherry picked from commit e7a4d78)

tru pushed a commit to dianqk/llvm-project that referenced this pull request Jan 14, 2025

[SLP] Check if instructions exist after vectorization (llvm#120434)

75d46f6

Fixes llvm#120433. (cherry picked from commit e7a4d78)

tru pushed a commit to dianqk/llvm-project that referenced this pull request Jan 14, 2025

[SLP] Check if instructions exist after vectorization (llvm#120434)

8fa5dff

Fixes llvm#120433. (cherry picked from commit e7a4d78)

fhahn pushed a commit to swiftlang/llvm-project that referenced this pull request Apr 29, 2025

[SLP] Check if instructions exist after vectorization (llvm#120434)

2bf12b3

Fixes llvm#120433. (cherry-picked from 586119118634fab434917a78889338d9f5e4f94)

fhahn added a commit to swiftlang/llvm-project that referenced this pull request Apr 29, 2025

Merge pull request #10560 from fhahn/fix-slp-crash

2eb6c16

[SLP] Check if instructions exist after vectorization (llvm#120434) Fixes llvm#120433. (cherry-picked from 5861191) rdar://148832843

fhahn pushed a commit to fhahn/llvm-project that referenced this pull request May 12, 2025

[SLP] Check if instructions exist after vectorization (llvm#120434)

c7456cc

Fixes llvm#120433. (cherry-picked from e7a4d78) rdar://148832843

AnnaZaks added a commit to swiftlang/llvm-project that referenced this pull request May 13, 2025

Merge pull request #10645 from fhahn/pick-slp-fixe2

cef328c

[SLP] Check if instructions exist after vectorization (llvm#120434)

This was referenced Jun 2, 2025

[MTE] [NFC] use vector to collect globals to tag (#120283) #142329

Closed

[MTE] [NFC] use vector to collect globals to tag (#120283) #142330

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[SLP] Check if instructions exist after vectorization #120434

[SLP] Check if instructions exist after vectorization #120434

Uh oh!

dianqk commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

alexey-bataev left a comment

Uh oh!

Uh oh!

dianqk commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

dianqk commented Dec 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[SLP] Check if instructions exist after vectorization #120434

[SLP] Check if instructions exist after vectorization #120434

Uh oh!

Conversation

dianqk commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

alexey-bataev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dianqk commented Dec 18, 2024

Uh oh!

llvmbot commented Dec 18, 2024

Uh oh!

dianqk commented Dec 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants