[VPlan] Verify dominance for incoming values of phi-like recipes. #124838

fhahn · 2025-01-28T21:10:26Z

Update the verifier to verify dominance for incoming values for phi-like recipes. The defining recipe must dominate the incoming block for the incoming value.

There are 4 different cases to consider when retrieving the incoming block:

VPIRInstructions wrapping phis: the incoming block from the blocks predecessors has the same index as the incoming value operand.
VPHeaderPhiRecipes, VPWidenPhi used in header: there's no predecessors; if the incoming value is the start value use the predecessor of the containing region, otherwise the exiting block of the region
1 predecessor: Must be a VPWidenPHI used as LCSSA phi; use the predecessor
2 predecessors: must be a VPPredInstPhiRecipe, use the second predecessor.

llvmbot · 2025-01-28T21:11:01Z

@llvm/pr-subscribers-vectorizers

Author: Florian Hahn (fhahn)

Changes

Update the verifier to verify dominance for incoming values for phi-like recipes. The defining recipe must dominate the incoming block for the incoming value.

There are 4 different cases to consider when retrieving the incoming block:

VPIRInstructions wrapping phis: the incoming block from the blocks predecessors has the same index as the incoming value operand.
VPHeaderPhiRecipes, VPWidenPhi used in header: there's no predecessors; if the incoming value is the start value use the predecessor of the containing region, otherwise the exiting block of the region
1 predecessor: Must be a VPWidenPHI used as LCSSA phi; use the predecessor
2 predecessors: must be a VPPredInstPhiRecipe, use the second predecessor.

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

1 Files Affected:

(modified) llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp (+53-5)

diff --git a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
index 0f151c897d938e..0948452e8d19cf 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
@@ -175,6 +175,11 @@ bool VPlanVerifier::verifyEVLRecipe(const VPInstruction &EVL) const {
   });
 }
 
+/// Return true if \p R is a VPIRInstruction wrapping a phi.
+static bool isVPIRInstructionPhi(const VPRecipeBase &R) {
+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);
+  return VPIRI && isa<PHINode>(VPIRI->getInstruction());
+}
 bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
   if (!verifyPhiRecipes(VPBB))
     return false;
@@ -207,14 +212,57 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
 
       for (const VPUser *U : V->users()) {
         auto *UI = cast<VPRecipeBase>(U);
-        // TODO: check dominance of incoming values for phis properly.
-        if (!UI ||
-            isa<VPHeaderPHIRecipe, VPWidenPHIRecipe, VPPredInstPHIRecipe>(UI))
+        const VPBlockBase *UserVPBB = UI->getParent();
+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most
+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the
+        // corresponding incoming block.
+        if (isVPIRInstructionPhi(*UI)) {
+          for (const auto &[Idx, Op] : enumerate(UI->operands())) {
+            if (V != Op)
+              continue;
+            const VPBlockBase *Incoming = UserVPBB->getPredecessors()[Idx];
+            if (Incoming != VPBB && !VPDT.dominates(VPBB, Incoming)) {
+              errs() << "Use before def!\n";
+              return false;
+            }
+          }
           continue;
+        }
+        // Verify incoming value of various phi-like recipes.
+        if (isa<VPWidenPHIRecipe, VPHeaderPHIRecipe, VPPredInstPHIRecipe>(UI)) {
+          const VPBlockBase *Incoming = nullptr;
+          // Get the incoming block based on the number of predecessors.
+          if (UserVPBB->getNumPredecessors() == 0) {
+            assert((isa<VPWidenPHIRecipe>(UI) || isa<VPHeaderPHIRecipe>(UI)) &&
+                   "Unexpected recipe with 0 predecessors");
+            const VPRegionBlock *UserRegion = UserVPBB->getParent();
+            Incoming = V == UI->getOperand(0)
+                           ? UserRegion->getSinglePredecessor()
+                           : UserRegion->getExiting();
+          } else if (UserVPBB->getNumPredecessors() == 1) {
+            assert(isa<VPWidenPHIRecipe>(UI) &&
+                   "Unexpected recipe with 1 predecessors");
+            Incoming = UserVPBB->getSinglePredecessor();
+          } else {
+            assert(UserVPBB->getNumPredecessors() == 2 &&
+                   isa<VPPredInstPHIRecipe>(UI) &&
+                   "Unexpected recipe with 2 or more predecessors");
+            Incoming = UserVPBB->getPredecessors()[1];
+          }
+          if (auto *R = dyn_cast<VPRegionBlock>(Incoming))
+            Incoming = R->getExiting();
+          if (Incoming != VPBB && !VPDT.dominates(VPBB, Incoming)) {
+            errs() << "Use before def!\n";
+            return false;
+          }
+          continue;
+        }
 
         // If the user is in the same block, check it comes after R in the
         // block.
-        if (UI->getParent() == VPBB) {
+        if (UserVPBB == VPBB) {
           if (RecipeNumbering[UI] < RecipeNumbering[&R]) {
             errs() << "Use before def!\n";
             return false;
@@ -222,7 +270,7 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
           continue;
         }
 
-        if (!VPDT.dominates(VPBB, UI->getParent())) {
+        if (!VPDT.dominates(VPBB, UserVPBB)) {
           errs() << "Use before def!\n";
           return false;
         }

llvmbot · 2025-01-28T21:11:01Z

@llvm/pr-subscribers-llvm-transforms

Author: Florian Hahn (fhahn)

Changes

Update the verifier to verify dominance for incoming values for phi-like recipes. The defining recipe must dominate the incoming block for the incoming value.

There are 4 different cases to consider when retrieving the incoming block:

VPIRInstructions wrapping phis: the incoming block from the blocks predecessors has the same index as the incoming value operand.
VPHeaderPhiRecipes, VPWidenPhi used in header: there's no predecessors; if the incoming value is the start value use the predecessor of the containing region, otherwise the exiting block of the region
1 predecessor: Must be a VPWidenPHI used as LCSSA phi; use the predecessor
2 predecessors: must be a VPPredInstPhiRecipe, use the second predecessor.

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

1 Files Affected:

(modified) llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp (+53-5)

diff --git a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
index 0f151c897d938e..0948452e8d19cf 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp
@@ -175,6 +175,11 @@ bool VPlanVerifier::verifyEVLRecipe(const VPInstruction &EVL) const {
   });
 }
 
+/// Return true if \p R is a VPIRInstruction wrapping a phi.
+static bool isVPIRInstructionPhi(const VPRecipeBase &R) {
+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);
+  return VPIRI && isa<PHINode>(VPIRI->getInstruction());
+}
 bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
   if (!verifyPhiRecipes(VPBB))
     return false;
@@ -207,14 +212,57 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
 
       for (const VPUser *U : V->users()) {
         auto *UI = cast<VPRecipeBase>(U);
-        // TODO: check dominance of incoming values for phis properly.
-        if (!UI ||
-            isa<VPHeaderPHIRecipe, VPWidenPHIRecipe, VPPredInstPHIRecipe>(UI))
+        const VPBlockBase *UserVPBB = UI->getParent();
+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most
+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the
+        // corresponding incoming block.
+        if (isVPIRInstructionPhi(*UI)) {
+          for (const auto &[Idx, Op] : enumerate(UI->operands())) {
+            if (V != Op)
+              continue;
+            const VPBlockBase *Incoming = UserVPBB->getPredecessors()[Idx];
+            if (Incoming != VPBB && !VPDT.dominates(VPBB, Incoming)) {
+              errs() << "Use before def!\n";
+              return false;
+            }
+          }
           continue;
+        }
+        // Verify incoming value of various phi-like recipes.
+        if (isa<VPWidenPHIRecipe, VPHeaderPHIRecipe, VPPredInstPHIRecipe>(UI)) {
+          const VPBlockBase *Incoming = nullptr;
+          // Get the incoming block based on the number of predecessors.
+          if (UserVPBB->getNumPredecessors() == 0) {
+            assert((isa<VPWidenPHIRecipe>(UI) || isa<VPHeaderPHIRecipe>(UI)) &&
+                   "Unexpected recipe with 0 predecessors");
+            const VPRegionBlock *UserRegion = UserVPBB->getParent();
+            Incoming = V == UI->getOperand(0)
+                           ? UserRegion->getSinglePredecessor()
+                           : UserRegion->getExiting();
+          } else if (UserVPBB->getNumPredecessors() == 1) {
+            assert(isa<VPWidenPHIRecipe>(UI) &&
+                   "Unexpected recipe with 1 predecessors");
+            Incoming = UserVPBB->getSinglePredecessor();
+          } else {
+            assert(UserVPBB->getNumPredecessors() == 2 &&
+                   isa<VPPredInstPHIRecipe>(UI) &&
+                   "Unexpected recipe with 2 or more predecessors");
+            Incoming = UserVPBB->getPredecessors()[1];
+          }
+          if (auto *R = dyn_cast<VPRegionBlock>(Incoming))
+            Incoming = R->getExiting();
+          if (Incoming != VPBB && !VPDT.dominates(VPBB, Incoming)) {
+            errs() << "Use before def!\n";
+            return false;
+          }
+          continue;
+        }
 
         // If the user is in the same block, check it comes after R in the
         // block.
-        if (UI->getParent() == VPBB) {
+        if (UserVPBB == VPBB) {
           if (RecipeNumbering[UI] < RecipeNumbering[&R]) {
             errs() << "Use before def!\n";
             return false;
@@ -222,7 +270,7 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
           continue;
         }
 
-        if (!VPDT.dominates(VPBB, UI->getParent())) {
+        if (!VPDT.dominates(VPBB, UserVPBB)) {
           errs() << "Use before def!\n";
           return false;
         }

david-arm

Thanks for this - looks sensible to me. I just had a couple of comments.

david-arm · 2025-01-29T09:02:01Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+static bool isVPIRInstructionPhi(const VPRecipeBase &R) {
+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);
+  return VPIRI && isa<PHINode>(VPIRI->getInstruction());
+}


nit: Add new line after function?

Adde a newline, thanks

david-arm · 2025-01-29T09:30:48Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+                   "Unexpected recipe with 2 or more predecessors");
+            Incoming = UserVPBB->getPredecessors()[1];
+          }
+          if (auto *R = dyn_cast<VPRegionBlock>(Incoming))


Just out of curiosity, what's the scenario where the incoming block for a VPWidenPHIRecipe, VPHeaderPHIRecipe or VPPredInstPHIRecipe recipe would be the region? Is it the recipes we create in the middle block? If so, could this check potentially fail with uncountable early exits, i.e. the incoming block is effectively the middle.split block? I assume it's fine, but just wondering if there are missing tests for all the scenarios.

The only case at the moment is in VPWidenPHIRecipes added in the VPlan-native path. I added an assert; it cannot happen in the inner-loop vectorizer path.

fhahn

ping :)

ayalz

Good to see this TODO being addressed, adding various comments.

ayalz · 2025-02-16T08:13:02Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

@@ -207,24 +213,69 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {

      for (const VPUser *U : V->users()) {
        auto *UI = cast<VPRecipeBase>(U);


unrelated nit:

Suggested change

auto *UI = cast<VPRecipeBase>(U);

auto *UR = cast<VPRecipeBase>(U);

Will fix independently.

ayalz · 2025-02-16T08:13:35Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

-             isa<PHINode>(cast<VPIRInstruction>(UI)->getInstruction())))
+        const VPBlockBase *UserVPBB = UI->getParent();
+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most


Suggested change

// Verify incoming values of VPIRInstructions wrapping phis. V most

// Verify incoming values of VPIRInstructions wrapping phis. V must

fixed, thanks

ayalz · 2025-02-16T08:14:12Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most
+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the


Suggested change

// incoming value matches the predecessor block index of the

// incoming value must match the predecessor block index of the

Done thanks!

ayalz · 2025-02-16T08:17:53Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+        // incoming value matches the predecessor block index of the
+        // corresponding incoming block.
+        if (isVPIRInstructionPhi(*UI)) {
+          for (const auto &[Idx, Op] : enumerate(UI->operands())) {


Suggested change

for (const auto &[Idx, Op] : enumerate(UI->operands())) {

for (const auto &[Index, OpAtIndex] : enumerate(UI->operands())) {

ayalz · 2025-02-16T08:18:22Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+          for (const auto &[Idx, Op] : enumerate(UI->operands())) {
+            if (V != Op)
+              continue;
+            const VPBlockBase *Incoming = UserVPBB->getPredecessors()[Idx];


Suggested change

const VPBlockBase *Incoming = UserVPBB->getPredecessors()[Idx];

const VPBlockBase *PredAtIndex = UserVPBB->getPredecessors()[Idx];

ayalz · 2025-02-16T15:25:53Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+        if (isa<VPWidenPHIRecipe, VPHeaderPHIRecipe, VPPredInstPHIRecipe>(UI)) {
+          const VPBlockBase *Incoming = nullptr;
+          // Get the incoming block based on the number of predecessors.


nit: better switch over the types of recipes involved, asserting the number of predecessors, than vice-versa? Nearly every recipe seems to be doing its own thing anyhow.

Code has been replaced by type-switch and using incoming values/blocks iterator.

ayalz · 2025-02-16T15:29:44Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+                   "Unexpected recipe with 2 or more predecessors");
+            Incoming = UserVPBB->getPredecessors()[1];
+          }
+          if (auto *R = dyn_cast<VPRegionBlock>(Incoming)) {


Suggested change

if (auto *R = dyn_cast<VPRegionBlock>(Incoming)) {

if (auto *IncomingRegion = dyn_cast<VPRegionBlock>(Incoming)) {

to avoid confusion with R which is also being used for the current Recipe.

Code is gone in latest version

ayalz · 2025-02-16T16:22:05Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+                   "VPWidenPHIRecipe");
+            Incoming = R->getExiting();
+          }
+          if (Incoming != VPBB && !VPDT.dominates(VPBB, Incoming)) {


Same comment as above.

Code is gone in latest version

ayalz · 2025-02-16T16:26:32Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the
+        // corresponding incoming block.
+        if (isVPIRInstructionPhi(*UI)) {


Can the case of VPIRInstruction be handled along with all other phi recipes below?

There are cases where the block containing a VPIR Phi has multiple predecessors (some cases with early exits), for those we need the proper phi-handling

ayalz · 2025-02-16T16:27:27Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+            return false;
+          }
+          continue;
+        }

        // If the user is in the same block, check it comes after R in the


Suggested change

// If the user is in the same block, check it comes after R in the

// If the user is in the same block, check that it comes after R in the

Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks, with corresponding iterators. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying llvm#124838.

fhahn

I reworked the PR quite a bit and it is now building on a few additional patches:

Add interface to retrieve incoming blocks & values + iterators, usable for all phi-like recipes: [VPlan] Add new VPIRPhi overlay for VPIRInsts wrapping phi nodes (NFC). #129387
Add VPIRPhi [VPlan] Add new VPIRPhi overlay for VPIRInsts wrapping phi nodes (NFC). #129387

fhahn · 2025-02-24T22:33:04Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);
+  return VPIRI && isa<PHINode>(VPIRI->getInstruction());
+}
+
 bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
  if (!verifyPhiRecipes(VPBB))


I am not sure how we could move the new code to verifyPhiRecipes, as here we verify def before use property looking at the uses of a defined VPValue and when looking at the uses we need to handle phi-like recipes.

fhahn · 2025-02-24T22:33:16Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

@@ -175,6 +175,12 @@ bool VPlanVerifier::verifyEVLRecipe(const VPInstruction &EVL) const {
  });
 }

+/// Return true if \p R is a VPIRInstruction wrapping a phi.
+static bool isVPIRInstructionPhi(const VPRecipeBase &R) {
+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);


Will check separately, thanks!

fhahn · 2025-02-24T22:35:42Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+  auto *VPIRI = dyn_cast<VPIRInstruction>(&R);
+  return VPIRI && isa<PHINode>(VPIRI->getInstruction());
+}
+
 bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {
  if (!verifyPhiRecipes(VPBB))


It should be complete now, updated, thanks!

fhahn · 2025-02-24T22:36:09Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

@@ -207,24 +213,69 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {

      for (const VPUser *U : V->users()) {
        auto *UI = cast<VPRecipeBase>(U);


Will fix independently.

fhahn · 2025-02-24T22:36:25Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

-             isa<PHINode>(cast<VPIRInstruction>(UI)->getInstruction())))
+        const VPBlockBase *UserVPBB = UI->getParent();
+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most


fixed, thanks

fhahn · 2025-02-24T22:36:40Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+
+        // Verify incoming values of VPIRInstructions wrapping phis. V most
+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the


Done thanks!

fhahn · 2025-02-24T22:39:30Z

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

+        // dominate the end of the incoming block. The operand index of the
+        // incoming value matches the predecessor block index of the
+        // corresponding incoming block.
+        if (isVPIRInstructionPhi(*UI)) {


There are cases where the block containing a VPIR Phi has multiple predecessors (some cases with early exits), for those we need the proper phi-handling

github-actions · 2025-03-01T16:16:59Z

✅ With the latest revision this PR passed the C/C++ code formatter.

Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks, with corresponding iterators. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying llvm#124838.

[VPlan] Use VPPhiAccessors for VPIRPhi. astOf

…#129388) Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying #124838. PR: #129388

…llvm#129388) Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying llvm#124838. PR: llvm#129388

…cipes (NFC) (#129388) Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying llvm/llvm-project#124838. PR: llvm/llvm-project#129388

…llvm#129388) Add a VPPhiAccessors class to provide interfaces to access incoming values and blocks. The first user is VPWidenPhiRecipe, with the other phi-like recipes following soon. This will also be used to verify def-use chains where users are phi-like recipes, simplifying llvm#124838. PR: llvm#129388

fhahn requested review from alexey-bataev, ayalz, aniragil and david-arm January 28, 2025 21:10

llvmbot added vectorizers llvm:transforms labels Jan 28, 2025

fhahn mentioned this pull request Jan 28, 2025

[LoopVectorize] Enable vectorisation of early exit loops with live-outs #120567

Merged

david-arm reviewed Jan 29, 2025

View reviewed changes

fhahn force-pushed the vplan-verify-def-use-phi branch from 29aa9b0 to 695ef3c Compare January 29, 2025 20:47

fhahn force-pushed the vplan-verify-def-use-phi branch from 695ef3c to 129e8ad Compare February 15, 2025 21:16

fhahn commented Feb 15, 2025

View reviewed changes

ayalz reviewed Feb 16, 2025

View reviewed changes

fhahn mentioned this pull request Mar 1, 2025

[VPlan] Add VPPhiAccessors to provide interface for phi recipes (NFC) #129388

Merged

fhahn force-pushed the vplan-verify-def-use-phi branch from 129e8ad to bbd3712 Compare March 1, 2025 16:13

fhahn commented Mar 1, 2025

View reviewed changes

fhahn added 9 commits March 13, 2025 15:07

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

9113022

!fixup address latest comments, thanks

c61233f

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

a73a137

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

90b2d4d

!fixup address latest comments, thanks

f768b97

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

d6d6bb5

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

8dfd569

!fixup address latest comments, thanks

595b057

Merge remote-tracking branch 'origin/main' into vplan-phi-accessors

a2b4ebb

fhahn added 2 commits May 3, 2025 10:52

!fixup address comments, make getAsRecipe pure virtual.

46780ab

Use virtual

5fee077

[VPlan] Use VPPhiAccessors for VPIRPhi. astOf

fhahn force-pushed the vplan-verify-def-use-phi branch from bbd3712 to 5fee077 Compare May 3, 2025 09:58

Merge remote-tracking branch 'origin/main' into vplan-verify-def-use-phi

450901e

This was referenced May 4, 2025

[VPlan] Add VPPhiAccessors to provide interface for phi recipes (NFC) #138472

Open

[VPlan] Use VPPhiAccessors for VPIRPhi. #129389

Closed

		@@ -207,24 +213,69 @@ bool VPlanVerifier::verifyVPBasicBlock(const VPBasicBlock *VPBB) {

		for (const VPUser *U : V->users()) {
		auto *UI = cast<VPRecipeBase>(U);

	auto *UI = cast<VPRecipeBase>(U);
	auto *UR = cast<VPRecipeBase>(U);

	// Verify incoming values of VPIRInstructions wrapping phis. V most
	// Verify incoming values of VPIRInstructions wrapping phis. V must

	// incoming value matches the predecessor block index of the
	// incoming value must match the predecessor block index of the

	for (const auto &[Idx, Op] : enumerate(UI->operands())) {
	for (const auto &[Index, OpAtIndex] : enumerate(UI->operands())) {

	const VPBlockBase *Incoming = UserVPBB->getPredecessors()[Idx];
	const VPBlockBase *PredAtIndex = UserVPBB->getPredecessors()[Idx];

	if (auto *R = dyn_cast<VPRegionBlock>(Incoming)) {
	if (auto *IncomingRegion = dyn_cast<VPRegionBlock>(Incoming)) {

	// If the user is in the same block, check it comes after R in the
	// If the user is in the same block, check that it comes after R in the

[VPlan] Verify dominance for incoming values of phi-like recipes. #124838

Are you sure you want to change the base?

[VPlan] Verify dominance for incoming values of phi-like recipes. #124838

Conversation

fhahn commented Jan 28, 2025

llvmbot commented Jan 28, 2025

llvmbot commented Jan 28, 2025

david-arm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fhahn left a comment

Choose a reason for hiding this comment

ayalz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fhahn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Mar 1, 2025 • edited Loading

github-actions bot commented Mar 1, 2025 •

edited

Loading