[VPlan] Always set trip count when creating plan for unit tests (NFC).

Simplifies some tests which no do not need to pass TC, and future
changes will require to always have a trip count available.

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -4214,10 +4214,9 @@ class VPlan {
 
   /// Construct a VPlan with a new VPBasicBlock as entry, a VPIRBasicBlock
   /// wrapping \p ScalarHeaderBB and a trip count of \p TC.
-  VPlan(BasicBlock *ScalarHeaderBB, VPValue *TC) {
+  VPlan(BasicBlock *ScalarHeaderBB) {
     setEntry(createVPBasicBlock("preheader"));
     ScalarHeader = createVPIRBasicBlock(ScalarHeaderBB);
-    TripCount = TC;
   }
 
   LLVM_ABI_FOR_TEST ~VPlan();

llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

@@ -720,12 +720,10 @@ TEST_F(VPBasicBlockTest, splitAtEnd) {
 
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 TEST_F(VPBasicBlockTest, print) {
-  VPInstruction *TC = new VPInstruction(Instruction::PHI, {});
-  VPlan &Plan = getPlan(TC);
+  VPlan &Plan = getPlan();
   IntegerType *Int32 = IntegerType::get(C, 32);
   VPValue *Val = Plan.getOrAddLiveIn(ConstantInt::get(Int32, 1));
   VPBasicBlock *VPBB0 = Plan.getEntry();
-  VPBB0->appendRecipe(TC);
 
   VPInstruction *I1 = new VPInstruction(Instruction::Add, {Val, Val});
   VPInstruction *I2 = new VPInstruction(Instruction::Sub, {I1, Val});
@@ -762,28 +760,27 @@ TEST_F(VPBasicBlockTest, print) {
   Plan.printDOT(OS);
 
   const char *ExpectedStr = R"(digraph VPlan {
-graph [labelloc=t, fontsize=30; label="Vectorization Plan\n for UF\>=1\nvp\<%1\> = original trip-count\n"]
+graph [labelloc=t, fontsize=30; label="Vectorization Plan\n for UF\>=1\nLive-in ir\<1024\> = original trip-count\n"]
 node [shape=rect, fontname=Courier, fontsize=30]
 edge [fontname=Courier, fontsize=30]
 compound=true
   N0 [label =
     "preheader:\l" +
-    "  EMIT-SCALAR vp\<%1\> = phi \l" +
     "Successor(s): bb1\l"
   ]
   N0 -> N1 [ label=""]
   N1 [label =
     "bb1:\l" +
-    "  EMIT vp\<%2\> = add ir\<1\>, ir\<1\>\l" +
-    "  EMIT vp\<%3\> = sub vp\<%2\>, ir\<1\>\l" +
-    "  EMIT br vp\<%2\>, vp\<%3\>\l" +
+    "  EMIT vp\<%1\> = add ir\<1\>, ir\<1\>\l" +
+    "  EMIT vp\<%2\> = sub vp\<%1\>, ir\<1\>\l" +
+    "  EMIT br vp\<%1\>, vp\<%2\>\l" +
     "Successor(s): bb2\l"
   ]
   N1 -> N2 [ label=""]
   N2 [label =
     "bb2:\l" +
-    "  EMIT vp\<%5\> = mul vp\<%3\>, vp\<%2\>\l" +
-    "  EMIT br vp\<%5\>\l" +
+    "  EMIT vp\<%4\> = mul vp\<%2\>, vp\<%1\>\l" +
+    "  EMIT br vp\<%4\>\l" +
     "Successor(s): ir-bb\<scalar.header\>\l"
   ]
   N2 -> N3 [ label=""]
@@ -796,9 +793,9 @@ compound=true
   EXPECT_EQ(ExpectedStr, FullDump);
 
   const char *ExpectedBlock1Str = R"(bb1:
-  EMIT vp<%2> = add ir<1>, ir<1>
-  EMIT vp<%3> = sub vp<%2>, ir<1>
-  EMIT br vp<%2>, vp<%3>
+  EMIT vp<%1> = add ir<1>, ir<1>
+  EMIT vp<%2> = sub vp<%1>, ir<1>
+  EMIT br vp<%1>, vp<%2>
 Successor(s): bb2
 )";
   std::string Block1Dump;
@@ -808,8 +805,8 @@ Successor(s): bb2
 
   // Ensure that numbering is good when dumping the second block in isolation.
   const char *ExpectedBlock2Str = R"(bb2:
-  EMIT vp<%5> = mul vp<%3>, vp<%2>
-  EMIT br vp<%5>
+  EMIT vp<%4> = mul vp<%2>, vp<%1>
+  EMIT br vp<%4>
 Successor(s): ir-bb<scalar.header>
 )";
   std::string Block2Dump;
@@ -822,22 +819,20 @@ Successor(s): ir-bb<scalar.header>
     raw_string_ostream OS(I3Dump);
     VPSlotTracker SlotTracker(&Plan);
     I3->print(OS, "", SlotTracker);
-    EXPECT_EQ("EMIT br vp<%2>, vp<%3>", I3Dump);
+    EXPECT_EQ("EMIT br vp<%1>, vp<%2>", I3Dump);
   }
 
   {
     std::string I4Dump;
     raw_string_ostream OS(I4Dump);
     OS << *I4;
-    EXPECT_EQ("EMIT vp<%5> = mul vp<%3>, vp<%2>", I4Dump);
+    EXPECT_EQ("EMIT vp<%4> = mul vp<%2>, vp<%1>", I4Dump);
   }
 }
 
 TEST_F(VPBasicBlockTest, printPlanWithVFsAndUFs) {
-  VPInstruction *TC = new VPInstruction(Instruction::Sub, {});
-  VPlan &Plan = getPlan(TC);
+  VPlan &Plan = getPlan();
   VPBasicBlock *VPBB0 = Plan.getEntry();
-  VPBB0->appendRecipe(TC);
 
   VPInstruction *I1 = new VPInstruction(Instruction::Add, {});
   VPBasicBlock *VPBB1 = Plan.createVPBasicBlock("");
@@ -855,14 +850,13 @@ TEST_F(VPBasicBlockTest, printPlanWithVFsAndUFs) {
     Plan.print(OS);
 
     const char *ExpectedStr = R"(VPlan 'TestPlan for VF={4},UF>=1' {
-vp<%1> = original trip-count
+Live-in ir<1024> = original trip-count
 
 preheader:
-  EMIT vp<%1> = sub 
 Successor(s): bb1
 
 bb1:
-  EMIT vp<%2> = add 
+  EMIT vp<%1> = add 
 Successor(s): ir-bb<scalar.header>
 
 ir-bb<scalar.header>:
@@ -879,14 +873,13 @@ No successors
     Plan.print(OS);
 
     const char *ExpectedStr = R"(VPlan 'TestPlan for VF={4,vscale x 8},UF>=1' {
-vp<%1> = original trip-count
+Live-in ir<1024> = original trip-count
 
 preheader:
-  EMIT vp<%1> = sub 
 Successor(s): bb1
 
 bb1:
-  EMIT vp<%2> = add 
+  EMIT vp<%1> = add 
 Successor(s): ir-bb<scalar.header>
 
 ir-bb<scalar.header>:
@@ -903,14 +896,13 @@ No successors
     Plan.print(OS);
 
     const char *ExpectedStr = R"(VPlan 'TestPlan for VF={4,vscale x 8},UF={4}' {
-vp<%1> = original trip-count
+Live-in ir<1024> = original trip-count
 
 preheader:
-  EMIT vp<%1> = sub 
 Successor(s): bb1
 
 bb1:
-  EMIT vp<%2> = add 
+  EMIT vp<%1> = add 
 Successor(s): ir-bb<scalar.header>
 
 ir-bb<scalar.header>:
@@ -922,7 +914,7 @@ No successors
 }
 
 TEST_F(VPBasicBlockTest, cloneAndPrint) {
-  VPlan &Plan = getPlan(nullptr);
+  VPlan &Plan = getPlan();
   VPBasicBlock *VPBB0 = Plan.getEntry();
 
   IntegerType *Int32 = IntegerType::get(C, 32);
@@ -940,7 +932,7 @@ TEST_F(VPBasicBlockTest, cloneAndPrint) {
   VPBlockUtils::connectBlocks(VPBB0, VPBB1);
 
   const char *ExpectedStr = R"(digraph VPlan {
-graph [labelloc=t, fontsize=30; label="Vectorization Plan\n for UF\>=1\n"]
+graph [labelloc=t, fontsize=30; label="Vectorization Plan\n for UF\>=1\nLive-in ir\<1024\> = original trip-count\n"]
 node [shape=rect, fontname=Courier, fontsize=30]
 edge [fontname=Courier, fontsize=30]
 compound=true

llvm/unittests/Transforms/Vectorize/VPlanTestBase.h

@@ -93,9 +93,12 @@ class VPlanTestBase : public testing::Test {
     BranchInst::Create(&*ScalarHeader, &*ScalarHeader);
   }
 
-  VPlan &getPlan(VPValue *TC = nullptr) {
-    Plans.push_back(std::make_unique<VPlan>(&*ScalarHeader, TC));
-    return *Plans.back();
+  VPlan &getPlan() {
+    Plans.push_back(std::make_unique<VPlan>(&*ScalarHeader));
+    VPlan &Plan = *Plans.back();
+    VPValue *DefaultTC = Plan.getConstantInt(32, 1024);
+    Plan.setTripCount(DefaultTC);
+    return Plan;
   }
 };