Revert "[SLP] Fix a check for main/alternate interchanged instruction" #151997
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 3ee8d04. Revert reason: FAILED build for openmp-offload-amdgpu-runtime-2 https://lab.llvm.org/buildbot/#/builders/10/builds/10827
|
@llvm/pr-subscribers-llvm-transforms Author: Michael Halkenhäuser (mhalk) ChangesThis reverts commit 3ee8d04. Revert reason: FAILED build for openmp-offload-amdgpu-runtime-2 Full diff: https://github.com/llvm/llvm-project/pull/151997.diff 2 Files Affected:
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 5a956fb733c27..0ca25bf891039 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -1238,12 +1238,6 @@ class InstructionsState {
BinOpSameOpcodeHelper Converter(MainOp);
if (!Converter.add(I) || !Converter.add(MainOp))
return nullptr;
- if (!Converter.hasCandidateOpcode(MainOp->getOpcode()) && isAltShuffle()) {
- BinOpSameOpcodeHelper AltConverter(AltOp);
- if (AltConverter.add(I) && AltConverter.add(AltOp) &&
- AltConverter.hasCandidateOpcode(AltOp->getOpcode()))
- return AltOp;
- }
if (Converter.hasAltOp() && !isAltShuffle())
return nullptr;
return Converter.hasAltOp() ? AltOp : MainOp;
diff --git a/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll b/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll
deleted file mode 100644
index 472c25c0cd1b2..0000000000000
--- a/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll
+++ /dev/null
@@ -1,30 +0,0 @@
-; 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 | FileCheck %s
-
-define i64 @test() {
-; CHECK-LABEL: define i64 @test() {
-; CHECK-NEXT: [[BB:.*]]:
-; CHECK-NEXT: [[SHL:%.*]] = shl i32 0, 1
-; CHECK-NEXT: [[ADD1:%.*]] = add i32 0, 1
-; CHECK-NEXT: br label %[[BB2:.*]]
-; CHECK: [[BB2]]:
-; CHECK-NEXT: [[PHI:%.*]] = phi i32 [ [[SHL]], %[[BB]] ]
-; CHECK-NEXT: [[PHI3:%.*]] = phi i32 [ 0, %[[BB]] ]
-; CHECK-NEXT: [[PHI4:%.*]] = phi i32 [ 0, %[[BB]] ]
-; CHECK-NEXT: [[PHI5:%.*]] = phi i32 [ [[ADD1]], %[[BB]] ]
-; CHECK-NEXT: ret i64 0
-;
-bb:
- %shl = shl i32 0, 1
- %mul = mul i32 0, 0
- %add = add i32 0, 0
- %add1 = add i32 0, 1
- br label %bb2
-
-bb2:
- %phi = phi i32 [ %shl, %bb ]
- %phi3 = phi i32 [ %add, %bb ]
- %phi4 = phi i32 [ %mul, %bb ]
- %phi5 = phi i32 [ %add1, %bb ]
- ret i64 0
-}
|
|
@llvm/pr-subscribers-vectorizers Author: Michael Halkenhäuser (mhalk) ChangesThis reverts commit 3ee8d04. Revert reason: FAILED build for openmp-offload-amdgpu-runtime-2 Full diff: https://github.com/llvm/llvm-project/pull/151997.diff 2 Files Affected:
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 5a956fb733c27..0ca25bf891039 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -1238,12 +1238,6 @@ class InstructionsState {
BinOpSameOpcodeHelper Converter(MainOp);
if (!Converter.add(I) || !Converter.add(MainOp))
return nullptr;
- if (!Converter.hasCandidateOpcode(MainOp->getOpcode()) && isAltShuffle()) {
- BinOpSameOpcodeHelper AltConverter(AltOp);
- if (AltConverter.add(I) && AltConverter.add(AltOp) &&
- AltConverter.hasCandidateOpcode(AltOp->getOpcode()))
- return AltOp;
- }
if (Converter.hasAltOp() && !isAltShuffle())
return nullptr;
return Converter.hasAltOp() ? AltOp : MainOp;
diff --git a/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll b/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll
deleted file mode 100644
index 472c25c0cd1b2..0000000000000
--- a/llvm/test/Transforms/SLPVectorizer/X86/main-alternate-interechanged-detect.ll
+++ /dev/null
@@ -1,30 +0,0 @@
-; 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 | FileCheck %s
-
-define i64 @test() {
-; CHECK-LABEL: define i64 @test() {
-; CHECK-NEXT: [[BB:.*]]:
-; CHECK-NEXT: [[SHL:%.*]] = shl i32 0, 1
-; CHECK-NEXT: [[ADD1:%.*]] = add i32 0, 1
-; CHECK-NEXT: br label %[[BB2:.*]]
-; CHECK: [[BB2]]:
-; CHECK-NEXT: [[PHI:%.*]] = phi i32 [ [[SHL]], %[[BB]] ]
-; CHECK-NEXT: [[PHI3:%.*]] = phi i32 [ 0, %[[BB]] ]
-; CHECK-NEXT: [[PHI4:%.*]] = phi i32 [ 0, %[[BB]] ]
-; CHECK-NEXT: [[PHI5:%.*]] = phi i32 [ [[ADD1]], %[[BB]] ]
-; CHECK-NEXT: ret i64 0
-;
-bb:
- %shl = shl i32 0, 1
- %mul = mul i32 0, 0
- %add = add i32 0, 0
- %add1 = add i32 0, 1
- br label %bb2
-
-bb2:
- %phi = phi i32 [ %shl, %bb ]
- %phi3 = phi i32 [ %add, %bb ]
- %phi4 = phi i32 [ %mul, %bb ]
- %phi5 = phi i32 [ %add1, %bb ]
- ret i64 0
-}
|
alexey-bataev
approved these changes
Aug 4, 2025
|
Thanks for the fast response! |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/46/builds/21192 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 3ee8d04.
Revert reason: FAILED build for openmp-offload-amdgpu-runtime-2
https://lab.llvm.org/buildbot/#/builders/10/builds/10827