[SLP] Remove -slp-optimize-identity-hor-reduction-ops option #106238
Merged
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 code has been unchanged for two years; let's simplify the code and remove configurability which makes the code harder to follow.
|
@llvm/pr-subscribers-backend-systemz @llvm/pr-subscribers-llvm-transforms Author: Philip Reames (preames) ChangesThis code has been unchanged for two years; let's simplify the code Full diff: https://github.com/llvm/llvm-project/pull/106238.diff 3 Files Affected:
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index ed47ed661ab946..1c57855b57149c 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -136,13 +136,6 @@ static cl::opt<bool> ShouldStartVectorizeHorAtStore(
cl::desc(
"Attempt to vectorize horizontal reductions feeding into a store"));
-// NOTE: If AllowHorRdxIdenityOptimization is true, the optimization will run
-// even if we match a reduction but do not vectorize in the end.
-static cl::opt<bool> AllowHorRdxIdenityOptimization(
- "slp-optimize-identity-hor-reduction-ops", cl::init(true), cl::Hidden,
- cl::desc("Allow optimization of original scalar identity operations on "
- "matched horizontal reductions."));
-
static cl::opt<int>
MaxVectorRegSizeOption("slp-max-reg-size", cl::init(128), cl::Hidden,
cl::desc("Attempt to vectorize for this register size in bits"));
@@ -17565,10 +17558,9 @@ class HorizontalReduction {
return Num + Vals.size();
});
if (NumReducedVals < ReductionLimit &&
- (!AllowHorRdxIdenityOptimization ||
- all_of(ReducedVals, [](ArrayRef<Value *> RedV) {
- return RedV.size() < 2 || !allConstant(RedV) || !isSplat(RedV);
- }))) {
+ all_of(ReducedVals, [](ArrayRef<Value *> RedV) {
+ return RedV.size() < 2 || !allConstant(RedV) || !isSplat(RedV);
+ })) {
for (ReductionOpsType &RdxOps : ReductionOps)
for (Value *RdxOp : RdxOps)
V.analyzedReductionRoot(cast<Instruction>(RdxOp));
@@ -17698,8 +17690,7 @@ class HorizontalReduction {
}
// Emit code for constant values.
- if (AllowHorRdxIdenityOptimization && Candidates.size() > 1 &&
- allConstant(Candidates)) {
+ if (Candidates.size() > 1 && allConstant(Candidates)) {
Value *Res = Candidates.front();
++VectorizedVals.try_emplace(Candidates.front(), 0).first->getSecond();
for (Value *VC : ArrayRef(Candidates).drop_front()) {
@@ -17714,15 +17705,14 @@ class HorizontalReduction {
unsigned NumReducedVals = Candidates.size();
if (NumReducedVals < ReductionLimit &&
- (NumReducedVals < 2 || !AllowHorRdxIdenityOptimization ||
- !isSplat(Candidates)))
+ (NumReducedVals < 2 || !isSplat(Candidates)))
continue;
// Check if we support repeated scalar values processing (optimization of
// original scalar identity operations on matched horizontal reductions).
- IsSupportedHorRdxIdentityOp =
- AllowHorRdxIdenityOptimization && RdxKind != RecurKind::Mul &&
- RdxKind != RecurKind::FMul && RdxKind != RecurKind::FMulAdd;
+ IsSupportedHorRdxIdentityOp = RdxKind != RecurKind::Mul &&
+ RdxKind != RecurKind::FMul &&
+ RdxKind != RecurKind::FMulAdd;
// Gather same values.
MapVector<Value *, unsigned> SameValuesCounter;
if (IsSupportedHorRdxIdentityOp)
diff --git a/llvm/test/Transforms/SLPVectorizer/AArch64/buildvector-reduce.ll b/llvm/test/Transforms/SLPVectorizer/AArch64/buildvector-reduce.ll
index 2c417804c83e0d..bbc2bfdcb6c160 100644
--- a/llvm/test/Transforms/SLPVectorizer/AArch64/buildvector-reduce.ll
+++ b/llvm/test/Transforms/SLPVectorizer/AArch64/buildvector-reduce.ll
@@ -1,6 +1,5 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -passes=slp-vectorizer < %s -mtriple=arm64-apple-macosx | FileCheck %s
-; RUN: opt -S -passes=slp-vectorizer < %s -mtriple=arm64-apple-macosx -slp-optimize-identity-hor-reduction-ops=false | FileCheck %s --check-prefix=NO-IDENTITY
define i8 @test() {
; CHECK-LABEL: @test(
@@ -12,17 +11,6 @@ define i8 @test() {
; CHECK-NEXT: [[TMP0]] = mul i32 [[CALL278]], 8
; CHECK-NEXT: br label [[FOR_BODY]]
;
-; NO-IDENTITY-LABEL: @test(
-; NO-IDENTITY-NEXT: entry:
-; NO-IDENTITY-NEXT: br label [[FOR_BODY:%.*]]
-; NO-IDENTITY: for.body:
-; NO-IDENTITY-NEXT: [[SUM:%.*]] = phi i32 [ [[TMP2:%.*]], [[FOR_BODY]] ], [ 0, [[ENTRY:%.*]] ]
-; NO-IDENTITY-NEXT: [[CALL278:%.*]] = call i32 @fn(i32 [[SUM]])
-; NO-IDENTITY-NEXT: [[TMP0:%.*]] = insertelement <8 x i32> poison, i32 [[CALL278]], i32 0
-; NO-IDENTITY-NEXT: [[TMP1:%.*]] = shufflevector <8 x i32> [[TMP0]], <8 x i32> poison, <8 x i32> zeroinitializer
-; NO-IDENTITY-NEXT: [[TMP2]] = call i32 @llvm.vector.reduce.add.v8i32(<8 x i32> [[TMP1]])
-; NO-IDENTITY-NEXT: br label [[FOR_BODY]]
-;
entry:
br label %for.body
diff --git a/llvm/test/Transforms/SLPVectorizer/SystemZ/minbitwidth-non-vector-root.ll b/llvm/test/Transforms/SLPVectorizer/SystemZ/minbitwidth-non-vector-root.ll
deleted file mode 100644
index 6524b378f3d8bb..00000000000000
--- a/llvm/test/Transforms/SLPVectorizer/SystemZ/minbitwidth-non-vector-root.ll
+++ /dev/null
@@ -1,16 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 4
-; RUN: opt -passes=slp-vectorizer -S -slp-optimize-identity-hor-reduction-ops=false < %s -mtriple=s390x-ibm-linux -mcpu=arch13 | FileCheck %s
-
-define void @foo() {
-; CHECK-LABEL: define void @foo(
-; CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
-; CHECK-NEXT: [[TMP1:%.*]] = call i32 @llvm.vector.reduce.add.v4i32(<4 x i32> zeroinitializer)
-; CHECK-NEXT: store i32 [[TMP1]], ptr null, align 4
-; CHECK-NEXT: ret void
-;
- %1 = add i32 0, 0
- %2 = add i32 %1, 0
- %3 = add i32 %2, 0
- store i32 %3, ptr null, align 4
- ret void
-}
|
|
This option was requested by Intel engs before, not sure they are ready to remove it. |
In general, as a project, we actively do not support downstream forks with otherwise unneeded upstream code. Unless there's a clear problem expressed, I'd still like to go ahead and remove the code. They can apply a downstream patch if they want, or report an issue against the upstream. |
alexey-bataev
approved these changes
Aug 27, 2024
preames
deleted the
pr-slp-remove-slp-optimize-identity-hor-reduction-ops
branch
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/92/builds/5328 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 code has been unchanged for two years; let's simplify the code
and remove configurability which makes the code harder to follow.