[llvm] [VPlan] Add initial CFG simplification, removing BranchOnCond true. (PR #106748)

[Florian Hahn via llvm-commits]

================
@@ -1437,6 +1437,49 @@ void VPlanTransforms::truncateToMinimalBitwidths(
          "some entries in MinBWs haven't been processed");
 }
 
+/// Remove BranchOnCond recipes with constant conditions together with removing
+/// dead edges to their successors.
+static void simplifyCFG(VPlan &Plan) {
+  using namespace llvm::VPlanPatternMatch;
+  for (VPBasicBlock *VPBB : VPBlockUtils::blocksOnly<VPBasicBlock>(
+           vp_depth_first_deep(Plan.getEntry()))) {
+    if (VPBB->getNumSuccessors() != 2 || VPBB->begin() == VPBB->end() ||
+        !match(&VPBB->back(), m_BranchOnCond(m_True())))
+      continue;
+
+    VPBasicBlock *DeadSucc = cast<VPBasicBlock>(VPBB->getSuccessors()[1]);
+    const auto &Preds = DeadSucc->getPredecessors();
+    unsigned DeadIdx = std::distance(Preds.begin(), find(Preds, VPBB));
+
+    // Remove values coming from VPBB from phi-like recipes in DeadSucc.
+    for (VPRecipeBase &R : make_early_inc_range(*DeadSucc)) {
+      assert((!isa<VPIRInstruction>(&R) ||
+              !isa<PHINode>(cast<VPIRInstruction>(&R)->getInstruction())) &&
+             !isa<VPHeaderPHIRecipe>(&R) &&
+             "Cannot update VPIRInstructions wrapping phis or header phis yet");
+      auto *VPI = dyn_cast<VPInstruction>(&R);
+      if (VPI && VPI->getOpcode() == VPInstruction::ResumePhi) {
+        VPBuilder B(VPI);
+        SmallVector<VPValue *> NewOps;
+        // Create new operand list, with the dead incoming value filtered out.
+        for (const auto &[Idx, Op] : enumerate(VPI->operands())) {
+          if (Idx == DeadIdx)
+            continue;
+          NewOps.push_back(Op);
+        }
+        VPI->replaceAllUsesWith(B.createNaryOp(VPInstruction::ResumePhi, NewOps,
+                                               VPI->getDebugLoc(),
+                                               VPI->getName()));
+        VPI->eraseFromParent();
+      }
+    }
+    // Disconnect blocks and remove the terminator. DeadSucc will be deleted
+    // automatically on VPlan descruction.
----------------
fhahn wrote:

Done thanks

https://github.com/llvm/llvm-project/pull/106748