-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[LV] Explicitly disable in-loop reductions for AnyOf and FindIV. nfc #163541
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
Conversation
|
@llvm/pr-subscribers-vectorizers @llvm/pr-subscribers-llvm-transforms Author: Mel Chen (Mel-Chen) ChangesFull diff: https://github.com/llvm/llvm-project/pull/163541.diff 3 Files Affected:
diff --git a/llvm/lib/Analysis/IVDescriptors.cpp b/llvm/lib/Analysis/IVDescriptors.cpp
index 9f8ac6e8e2e0b..641850b46bbd8 100644
--- a/llvm/lib/Analysis/IVDescriptors.cpp
+++ b/llvm/lib/Analysis/IVDescriptors.cpp
@@ -1220,11 +1220,6 @@ unsigned RecurrenceDescriptor::getOpcode(RecurKind Kind) {
return Instruction::Add;
case RecurKind::Mul:
return Instruction::Mul;
- case RecurKind::AnyOf:
- case RecurKind::FindFirstIVSMin:
- case RecurKind::FindFirstIVUMin:
- case RecurKind::FindLastIVSMax:
- case RecurKind::FindLastIVUMax:
case RecurKind::Or:
return Instruction::Or;
case RecurKind::And:
@@ -1248,6 +1243,13 @@ unsigned RecurrenceDescriptor::getOpcode(RecurKind Kind) {
case RecurKind::FMaximumNum:
case RecurKind::FMinimumNum:
return Instruction::FCmp;
+ case RecurKind::AnyOf:
+ case RecurKind::FindFirstIVSMin:
+ case RecurKind::FindFirstIVUMin:
+ case RecurKind::FindLastIVSMax:
+ case RecurKind::FindLastIVUMax:
+ // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions
+ // are supported.
default:
llvm_unreachable("Unknown recurrence operation");
}
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index b96d29e635465..77916a0ea744d 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -6515,9 +6515,14 @@ void LoopVectorizationCostModel::collectInLoopReductions() {
if (RdxDesc.getRecurrenceType() != Phi->getType())
continue;
+ // In-loop AnyOf and FindIV reductions are not yet supported.
+ RecurKind Kind = RdxDesc.getRecurrenceKind();
+ if (RecurrenceDescriptor::isAnyOfRecurrenceKind(Kind) ||
+ RecurrenceDescriptor::isFindIVRecurrenceKind(Kind))
+ continue;
+
// If the target would prefer this reduction to happen "in-loop", then we
// want to record it as such.
- RecurKind Kind = RdxDesc.getRecurrenceKind();
if (!PreferInLoopReductions && !useOrderedReductions(RdxDesc) &&
!TTI.preferInLoopReduction(Kind, Phi->getType()))
continue;
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index 2368d18b0373c..95d0b899b9085 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -784,10 +784,9 @@ Value *VPInstruction::generate(VPTransformState &State) {
auto *OrigPhi = cast<PHINode>(PhiR->getUnderlyingValue());
Value *ReducedPartRdx = State.get(getOperand(2));
for (unsigned Idx = 3; Idx < getNumOperands(); ++Idx)
- ReducedPartRdx = Builder.CreateBinOp(
- (Instruction::BinaryOps)RecurrenceDescriptor::getOpcode(
- RecurKind::AnyOf),
- State.get(getOperand(Idx)), ReducedPartRdx, "bin.rdx");
+ ReducedPartRdx =
+ Builder.CreateBinOp(Instruction::Or, State.get(getOperand(Idx)),
+ ReducedPartRdx, "bin.rdx");
return createAnyOfReduction(Builder, ReducedPartRdx,
State.get(getOperand(1), VPLane(0)), OrigPhi);
}
|
|
@llvm/pr-subscribers-llvm-analysis Author: Mel Chen (Mel-Chen) ChangesFull diff: https://github.com/llvm/llvm-project/pull/163541.diff 3 Files Affected:
diff --git a/llvm/lib/Analysis/IVDescriptors.cpp b/llvm/lib/Analysis/IVDescriptors.cpp
index 9f8ac6e8e2e0b..641850b46bbd8 100644
--- a/llvm/lib/Analysis/IVDescriptors.cpp
+++ b/llvm/lib/Analysis/IVDescriptors.cpp
@@ -1220,11 +1220,6 @@ unsigned RecurrenceDescriptor::getOpcode(RecurKind Kind) {
return Instruction::Add;
case RecurKind::Mul:
return Instruction::Mul;
- case RecurKind::AnyOf:
- case RecurKind::FindFirstIVSMin:
- case RecurKind::FindFirstIVUMin:
- case RecurKind::FindLastIVSMax:
- case RecurKind::FindLastIVUMax:
case RecurKind::Or:
return Instruction::Or;
case RecurKind::And:
@@ -1248,6 +1243,13 @@ unsigned RecurrenceDescriptor::getOpcode(RecurKind Kind) {
case RecurKind::FMaximumNum:
case RecurKind::FMinimumNum:
return Instruction::FCmp;
+ case RecurKind::AnyOf:
+ case RecurKind::FindFirstIVSMin:
+ case RecurKind::FindFirstIVUMin:
+ case RecurKind::FindLastIVSMax:
+ case RecurKind::FindLastIVUMax:
+ // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions
+ // are supported.
default:
llvm_unreachable("Unknown recurrence operation");
}
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index b96d29e635465..77916a0ea744d 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -6515,9 +6515,14 @@ void LoopVectorizationCostModel::collectInLoopReductions() {
if (RdxDesc.getRecurrenceType() != Phi->getType())
continue;
+ // In-loop AnyOf and FindIV reductions are not yet supported.
+ RecurKind Kind = RdxDesc.getRecurrenceKind();
+ if (RecurrenceDescriptor::isAnyOfRecurrenceKind(Kind) ||
+ RecurrenceDescriptor::isFindIVRecurrenceKind(Kind))
+ continue;
+
// If the target would prefer this reduction to happen "in-loop", then we
// want to record it as such.
- RecurKind Kind = RdxDesc.getRecurrenceKind();
if (!PreferInLoopReductions && !useOrderedReductions(RdxDesc) &&
!TTI.preferInLoopReduction(Kind, Phi->getType()))
continue;
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index 2368d18b0373c..95d0b899b9085 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -784,10 +784,9 @@ Value *VPInstruction::generate(VPTransformState &State) {
auto *OrigPhi = cast<PHINode>(PhiR->getUnderlyingValue());
Value *ReducedPartRdx = State.get(getOperand(2));
for (unsigned Idx = 3; Idx < getNumOperands(); ++Idx)
- ReducedPartRdx = Builder.CreateBinOp(
- (Instruction::BinaryOps)RecurrenceDescriptor::getOpcode(
- RecurKind::AnyOf),
- State.get(getOperand(Idx)), ReducedPartRdx, "bin.rdx");
+ ReducedPartRdx =
+ Builder.CreateBinOp(Instruction::Or, State.get(getOperand(Idx)),
+ ReducedPartRdx, "bin.rdx");
return createAnyOfReduction(Builder, ReducedPartRdx,
State.get(getOperand(1), VPLane(0)), OrigPhi);
}
|
fhahn
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Could you also update the description of the PR to clarify why this is NFC?
| case RecurKind::FMaximumNum: | ||
| case RecurKind::FMinimumNum: | ||
| return Instruction::FCmp; | ||
| case RecurKind::AnyOf: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we still leave AnyOf to return Or to avoid the changes in llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should maintain consistency in how we handle AnyOf and FindIV. In particular, AnyOf, whether it currently only supports integer types or will support floating-point types in the future, should consistently use Instruction::Or in ComputeAnyOfResult to fold each part.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok sounds good to me.
|
Ping, or we can go #162252 |
fhahn
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks
| case RecurKind::FMaximumNum: | ||
| case RecurKind::FMinimumNum: | ||
| return Instruction::FCmp; | ||
| case RecurKind::AnyOf: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok sounds good to me.
e64030f to
15baf5f
Compare
ayalz
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couple of post-commit review comments.
| // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions | ||
| // are supported. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions | |
| // are supported. | |
| // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions | |
| // are supported. | |
| llvm_unreachable("AnyOf and FindIV do not support in-loop"); |
rather than claiming they are Unknown recurrence operations?
Should the enclosing getOpcode() be renamed getInLoopOpcode()?
| case RecurKind::FindFirstIVUMin: | ||
| case RecurKind::FindLastIVSMax: | ||
| case RecurKind::FindLastIVUMax: | ||
| // TODO: Set AnyOf and FindIV to Instruction::Select once in-loop reductions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason is that RecurrenceDescriptor::getOpcode was set to Instruction::Or, but the recurrence chains of AnyOf and FindIV do not actually contain an Instruction::Or.
Boolean recurrence chain of AnyOf could indeed contain a Select as in nextRed = currentCond ? true : prevRed, but could also contain an Or as in nextRed = currentCond | prevRed?
Integer recurrence chain of FindIV indeed contains a Select: nextRed = currentCond ? currentIV : prevRed, though it would be good to clarify when the opcode is Select rather than an ICmp/FCmp feeding it - as in min/max reductions whose chains may also contain a Select.
Suffice for now to leave behind a TODO to return a valid opcode once these kinds of recurrences support in-loop reduction.
Currently, in-loop reductions for AnyOf and FindIV are not supported.
They were implicitly blocked. This happened because RecurrenceDescriptor::getReductionOpChain could not detect their recurrence chain. The reason is that RecurrenceDescriptor::getOpcode was set to Instruction::Or, but the recurrence chains of AnyOf and FindIV do not actually contain an Instruction::Or.
This patch explicitly disables in-loop reductions for AnyOf and FindIV instead of relying on getReductionOpChain to implicitly prevent them.