[llvm] 9dad160 - [VPlan] Relax type of DerivedIV start value (NFC) (#206464)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 10 03:47:30 PDT 2026
Author: Ramkumar Ramachandra
Date: 2026-07-10T11:47:25+01:00
New Revision: 9dad160b3b26e8ba2698f0ab695630444b2760fb
URL: https://github.com/llvm/llvm-project/commit/9dad160b3b26e8ba2698f0ab695630444b2760fb
DIFF: https://github.com/llvm/llvm-project/commit/9dad160b3b26e8ba2698f0ab695630444b2760fb.diff
LOG: [VPlan] Relax type of DerivedIV start value (NFC) (#206464)
Change it from VPIRValue -> VPValue, as several usecases require it,
while adding a check in the verifier.
Added:
Modified:
llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
llvm/lib/Transforms/Vectorize/VPlan.h
llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h b/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
index e4cfdecfb1acf..cd02ced2942d1 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
@@ -406,7 +406,7 @@ class VPBuilder {
/// induction with \p Start and \p Step values, using \p Start + \p Current *
/// \p Step.
VPDerivedIVRecipe *createDerivedIV(InductionDescriptor::InductionKind Kind,
- FPMathOperator *FPBinOp, VPIRValue *Start,
+ FPMathOperator *FPBinOp, VPValue *Start,
VPValue *Current, VPValue *Step) {
return tryInsertInstruction(
new VPDerivedIVRecipe(Kind, FPBinOp, Start, Current, Step));
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
index eefe02b3e41ad..1ce5786793c49 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -4181,8 +4181,8 @@ class VPDerivedIVRecipe : public VPSingleDefRecipe {
public:
VPDerivedIVRecipe(InductionDescriptor::InductionKind Kind,
- const FPMathOperator *FPBinOp, VPIRValue *Start,
- VPValue *IV, VPValue *Step)
+ const FPMathOperator *FPBinOp, VPValue *Start, VPValue *IV,
+ VPValue *Step)
: VPSingleDefRecipe(VPRecipeBase::VPDerivedIVSC, {Start, IV, Step},
Start->getScalarType(), nullptr),
Kind(Kind), FPBinOp(FPBinOp) {}
@@ -4204,7 +4204,7 @@ class VPDerivedIVRecipe : public VPSingleDefRecipe {
InstructionCost computeCost(ElementCount VF,
VPCostContext &Ctx) const override;
- VPIRValue *getStartValue() const { return cast<VPIRValue>(getOperand(0)); }
+ VPValue *getStartValue() const { return getOperand(0); }
VPValue *getIndex() const { return getOperand(1); }
VPValue *getStepValue() const { return getOperand(2); }
const FPMathOperator *getFPBinOp() const { return FPBinOp; }
diff --git a/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp b/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
index b4f7a5f7359f7..1185b748599d1 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp
@@ -4086,7 +4086,7 @@ static void expandVPWidenPointerInduction(VPWidenPointerInductionRecipe *R) {
/// Expand a VPDerivedIVRecipe into executable recipes.
static void expandVPDerivedIV(VPDerivedIVRecipe *R) {
VPBuilder Builder(R);
- VPIRValue *Start = R->getStartValue();
+ VPValue *Start = R->getStartValue();
VPValue *Step = R->getStepValue();
VPValue *Index = R->getIndex();
Type *StepTy = Step->getScalarType();
diff --git a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
index 656a5f25878df..a4d6cc0ecb480 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
@@ -334,6 +334,13 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
break;
}
}
+ if (const auto *DIV = dyn_cast<VPDerivedIVRecipe>(&R)) {
+ if (!DIV->getStartValue()->isDefinedOutsideLoopRegions()) {
+ errs() << "VPDerivedIVRecipe must have start value defined outside "
+ "loop regions\n";
+ return false;
+ }
+ }
if (const auto *ScalarIVSteps = dyn_cast<VPScalarIVStepsRecipe>(&R)) {
unsigned NumOps = ScalarIVSteps->getNumOperands();
if (NumOps != 3 && NumOps != 4) {
diff --git a/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp b/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp
index 64101278c08bf..ebf7a0942ae2c 100644
--- a/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp
+++ b/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp
@@ -7,8 +7,8 @@
//===----------------------------------------------------------------------===//
#include "../lib/Transforms/Vectorize/VPlanVerifier.h"
+#include "../lib/Transforms/Vectorize/LoopVectorizationPlanner.h"
#include "../lib/Transforms/Vectorize/VPlan.h"
-#include "../lib/Transforms/Vectorize/VPlanCFG.h"
#include "VPlanTestBase.h"
#include "llvm/IR/Instruction.h"
#include "llvm/IR/Instructions.h"
@@ -330,6 +330,34 @@ TEST_F(VPVerifierTest, NonHeaderPHIInHeader) {
delete PHINode;
}
+TEST_F(VPVerifierTest, DerivedIVWithStartInLoopRegions) {
+ VPlan &Plan = getPlan();
+ auto *I32Ty = Type::getInt32Ty(C);
+ VPBasicBlock *Entry = Plan.getEntry();
+ VPBasicBlock *Latch = Plan.createVPBasicBlock("latch");
+
+ VPBuilder Builder(Latch);
+ VPValue *Start = Builder.createNot(Plan.getPoison(I32Ty));
+ Builder.createDerivedIV(InductionDescriptor::IK_IntInduction, nullptr, Start,
+ Plan.getPoison(I32Ty), Plan.getPoison(I32Ty));
+ Builder.createNaryOp(VPInstruction::BranchOnCond, Plan.getTrue());
+
+ VPRegionBlock *LoopR = Plan.createLoopRegion(I32Ty, DebugLoc::getUnknown(),
+ "loop", Latch, Latch);
+ VPBlockUtils::connectBlocks(Entry, LoopR);
+ VPBlockUtils::connectBlocks(LoopR, Plan.getScalarHeader());
+
+#if GTEST_HAS_STREAM_REDIRECTION
+ ::testing::internal::CaptureStderr();
+#endif
+ EXPECT_FALSE(verifyVPlanIsValid(Plan));
+#if GTEST_HAS_STREAM_REDIRECTION
+ EXPECT_STREQ(
+ "VPDerivedIVRecipe must have start value defined outside loop regions\n",
+ ::testing::internal::GetCapturedStderr().c_str());
+#endif
+}
+
TEST_F(VPVerifierTest, testRUN_VPLAN_PASS) {
VPlan &Plan = getPlan();
VPIRValue *Zero = Plan.getConstantInt(32, 0);
More information about the llvm-commits
mailing list