Skip to content

Commit 58cfa39

Browse files
fhahnfhahn
committed
[VPlan] Remove legacy VPlan() constructors (NFC).
The constructors were retained to reduce the diff during transition. Remove them now.
1 parent bfe8a21 commit 58cfa39

File tree

5 files changed

+42
-41
lines changed

5 files changed

+42
-41
lines changed

‎llvm/lib/Transforms/Vectorize/VPlan.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -821,18 +821,6 @@ void VPRegionBlock::print(raw_ostream &O, const Twine &Indent,
821821
}
822822
#endif
823823

824-
VPlan::VPlan(VPBasicBlock *OriginalPreheader, VPValue *TC,
825-
VPBasicBlock *EntryVectorPreHeader, VPIRBasicBlock *ScalarHeader)
826-
: VPlan(OriginalPreheader, TC, ScalarHeader) {
827-
VPBlockUtils::connectBlocks(OriginalPreheader, EntryVectorPreHeader);
828-
}
829-
830-
VPlan::VPlan(VPBasicBlock *OriginalPreheader,
831-
VPBasicBlock *EntryVectorPreHeader, VPIRBasicBlock *ScalarHeader)
832-
: VPlan(OriginalPreheader, ScalarHeader) {
833-
VPBlockUtils::connectBlocks(OriginalPreheader, EntryVectorPreHeader);
834-
}
835-
836824
VPlan::~VPlan() {
837825
if (Entry) {
838826
VPValue DummyValue;

‎llvm/lib/Transforms/Vectorize/VPlan.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3832,14 +3832,6 @@ class VPlan {
38323832
TripCount = TC;
38333833
}
38343834

3835-
/// Constructor variants that take disconnected preheader and entry blocks,
3836-
/// connecting them as part of construction.
3837-
/// FIXME: Only used to reduce the need of code changes during transition.
3838-
VPlan(VPBasicBlock *OriginalPreheader, VPValue *TC,
3839-
VPBasicBlock *EntryVectorPreHeader, VPIRBasicBlock *ScalarHeader);
3840-
VPlan(VPBasicBlock *OriginalPreheader, VPBasicBlock *EntryVectorPreHeader,
3841-
VPIRBasicBlock *ScalarHeader);
3842-
38433835
/// Construct a VPlan with \p Entry to the plan and with \p ScalarHeader
38443836
/// wrapping the original header of the scalar loop.
38453837
VPlan(VPBasicBlock *Entry, VPIRBasicBlock *ScalarHeader)

‎llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ TEST(VPDominatorTreeTest, DominanceNoRegionsTest) {
4545
auto *ScalarHeader = BasicBlock::Create(C, "");
4646
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
4747
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
48-
VPlan Plan(VPPH, &*TC, VPBB0, ScalarHeaderVPBB);
48+
VPBlockUtils::connectBlocks(VPPH, VPBB0);
49+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
4950

5051
VPDominatorTree VPDT;
5152
VPDT.recalculate(Plan);
@@ -125,7 +126,8 @@ TEST(VPDominatorTreeTest, DominanceRegionsTest) {
125126
auto TC = std::make_unique<VPValue>();
126127
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
127128
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
128-
VPlan Plan(VPPH, &*TC, VPBB0, ScalarHeaderVPBB);
129+
VPBlockUtils::connectBlocks(VPPH, VPBB0);
130+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
129131
VPDominatorTree VPDT;
130132
VPDT.recalculate(Plan);
131133

@@ -207,7 +209,8 @@ TEST(VPDominatorTreeTest, DominanceRegionsTest) {
207209
auto TC = std::make_unique<VPValue>();
208210
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
209211
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
210-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
212+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
213+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
211214
VPDominatorTree VPDT;
212215
VPDT.recalculate(Plan);
213216

‎llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ TEST(VPBasicBlockTest, getPlan) {
260260
auto TC = std::make_unique<VPValue>();
261261
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
262262
VPBlockUtils::connectBlocks(VPBB4, ScalarHeaderVPBB);
263-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
263+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
264+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
264265

265266
EXPECT_EQ(&Plan, VPBB1->getPlan());
266267
EXPECT_EQ(&Plan, VPBB2->getPlan());
@@ -282,7 +283,8 @@ TEST(VPBasicBlockTest, getPlan) {
282283
auto TC = std::make_unique<VPValue>();
283284
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
284285
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
285-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
286+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
287+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
286288

287289
EXPECT_EQ(&Plan, VPBB1->getPlan());
288290
EXPECT_EQ(&Plan, R1->getPlan());
@@ -314,7 +316,8 @@ TEST(VPBasicBlockTest, getPlan) {
314316
auto TC = std::make_unique<VPValue>();
315317
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
316318
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
317-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
319+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
320+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
318321

319322
EXPECT_EQ(&Plan, VPBB1->getPlan());
320323
EXPECT_EQ(&Plan, R1->getPlan());
@@ -360,7 +363,8 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
360363
auto TC = std::make_unique<VPValue>();
361364
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
362365
VPBlockUtils::connectBlocks(VPBB4, ScalarHeaderVPBB);
363-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
366+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
367+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
364368
}
365369

366370
{
@@ -462,7 +466,8 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
462466
auto TC = std::make_unique<VPValue>();
463467
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
464468
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
465-
VPlan Plan(VPPH, &*TC, VPBB0, ScalarHeaderVPBB);
469+
VPBlockUtils::connectBlocks(VPPH, VPBB0);
470+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
466471
}
467472

468473
{
@@ -547,7 +552,8 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
547552
auto TC = std::make_unique<VPValue>();
548553
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
549554
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
550-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
555+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
556+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
551557
}
552558

553559
{
@@ -597,7 +603,8 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
597603
auto TC = std::make_unique<VPValue>();
598604
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
599605
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
600-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
606+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
607+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
601608
}
602609

603610
{
@@ -691,7 +698,8 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
691698
auto TC = std::make_unique<VPValue>();
692699
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
693700
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
694-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
701+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
702+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
695703
}
696704
delete ScalarHeader;
697705
}
@@ -734,7 +742,8 @@ TEST(VPBasicBlockTest, print) {
734742
auto *ScalarHeader = BasicBlock::Create(C, "scalar.header");
735743
auto * ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
736744
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
737-
VPlan Plan(VPBB0, TC, VPBB1, ScalarHeaderVPBB);
745+
VPBlockUtils::connectBlocks(VPBB0, VPBB1);
746+
VPlan Plan(VPBB0, TC, ScalarHeaderVPBB);
738747
std::string FullDump;
739748
raw_string_ostream OS(FullDump);
740749
Plan.printDOT(OS);
@@ -827,7 +836,8 @@ TEST(VPBasicBlockTest, printPlanWithVFsAndUFs) {
827836
auto *ScalarHeader = BasicBlock::Create(C, "");
828837
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
829838
VPBlockUtils::connectBlocks(VPBB1, ScalarHeaderVPBB);
830-
VPlan Plan(VPBB0, TC, VPBB1, ScalarHeaderVPBB);
839+
VPBlockUtils::connectBlocks(VPBB0, VPBB1);
840+
VPlan Plan(VPBB0, TC, ScalarHeaderVPBB);
831841
Plan.setName("TestPlan");
832842
Plan.addVF(ElementCount::getFixed(4));
833843

@@ -1301,7 +1311,8 @@ TEST(VPRecipeTest, dumpRecipeInPlan) {
13011311
auto *ScalarHeader = BasicBlock::Create(C, "");
13021312
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
13031313
VPBlockUtils::connectBlocks(VPBB1, ScalarHeaderVPBB);
1304-
VPlan Plan(VPBB0, VPBB1, ScalarHeaderVPBB);
1314+
VPBlockUtils::connectBlocks(VPBB0, VPBB1);
1315+
VPlan Plan(VPBB0, ScalarHeaderVPBB);
13051316

13061317
IntegerType *Int32 = IntegerType::get(C, 32);
13071318
auto *AI = BinaryOperator::CreateAdd(PoisonValue::get(Int32),
@@ -1373,7 +1384,8 @@ TEST(VPRecipeTest, dumpRecipeUnnamedVPValuesInPlan) {
13731384
auto *ScalarHeader = BasicBlock::Create(C, "");
13741385
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
13751386
VPBlockUtils::connectBlocks(VPBB1, ScalarHeaderVPBB);
1376-
VPlan Plan(VPBB0, VPBB1, ScalarHeaderVPBB);
1387+
VPBlockUtils::connectBlocks(VPBB0, VPBB1);
1388+
VPlan Plan(VPBB0, ScalarHeaderVPBB);
13771389

13781390
IntegerType *Int32 = IntegerType::get(C, 32);
13791391
auto *AI = BinaryOperator::CreateAdd(PoisonValue::get(Int32),

‎llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ TEST(VPVerifierTest, VPInstructionUseBeforeDefSameBB) {
3333
auto *ScalarHeader = BasicBlock::Create(C, "");
3434
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
3535
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
36-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
36+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
37+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
3738

3839
#if GTEST_HAS_STREAM_REDIRECTION
3940
::testing::internal::CaptureStderr();
@@ -70,7 +71,8 @@ TEST(VPVerifierTest, VPInstructionUseBeforeDefDifferentBB) {
7071
auto *ScalarHeader = BasicBlock::Create(C, "");
7172
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
7273
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
73-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
74+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
75+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
7476

7577
#if GTEST_HAS_STREAM_REDIRECTION
7678
::testing::internal::CaptureStderr();
@@ -117,7 +119,8 @@ TEST(VPVerifierTest, VPBlendUseBeforeDefDifferentBB) {
117119
auto *ScalarHeader = BasicBlock::Create(C, "");
118120
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
119121
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
120-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
122+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
123+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
121124

122125
#if GTEST_HAS_STREAM_REDIRECTION
123126
::testing::internal::CaptureStderr();
@@ -158,7 +161,8 @@ TEST(VPVerifierTest, DuplicateSuccessorsOutsideRegion) {
158161
auto *ScalarHeader = BasicBlock::Create(C, "");
159162
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
160163
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
161-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
164+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
165+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
162166

163167
#if GTEST_HAS_STREAM_REDIRECTION
164168
::testing::internal::CaptureStderr();
@@ -200,7 +204,8 @@ TEST(VPVerifierTest, DuplicateSuccessorsInsideRegion) {
200204
auto *ScalarHeader = BasicBlock::Create(C, "");
201205
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
202206
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
203-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
207+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
208+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
204209

205210
#if GTEST_HAS_STREAM_REDIRECTION
206211
::testing::internal::CaptureStderr();
@@ -233,7 +238,8 @@ TEST(VPVerifierTest, BlockOutsideRegionWithParent) {
233238
auto *ScalarHeader = BasicBlock::Create(C, "");
234239
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
235240
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
236-
VPlan Plan(VPPH, &*TC, VPBB1, ScalarHeaderVPBB);
241+
VPBlockUtils::connectBlocks(VPPH, VPBB1);
242+
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
237243
VPBB1->setParent(R1);
238244

239245
#if GTEST_HAS_STREAM_REDIRECTION

0 commit comments

Comments
 (0)