Skip to content

Commit 72791fe

Browse files
fhahnfhahn
committed
[VPlan] Remove unused buildPlainCFG from unit tests (NFC).
Also clarify the name of buildHCFG -> buildVPlan.
1 parent 9e82ee5 commit 72791fe

File tree

3 files changed

+17
-31
lines changed

3 files changed

+17
-31
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) {
4141

4242
Function *F = M.getFunction("f");
4343
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
44-
auto Plan = buildHCFG(LoopHeader);
44+
auto Plan = buildVPlan(LoopHeader);
4545

4646
VPBasicBlock *Entry = Plan->getEntry()->getEntryBasicBlock();
4747
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -199,7 +199,7 @@ TEST_F(VPlanHCFGTest, testVPInstructionToVPRecipesInner) {
199199

200200
Function *F = M.getFunction("f");
201201
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
202-
auto Plan = buildHCFG(LoopHeader);
202+
auto Plan = buildVPlan(LoopHeader);
203203

204204
TargetLibraryInfoImpl TLII(Triple(M.getTargetTriple()));
205205
TargetLibraryInfo TLI(TLII);
@@ -261,7 +261,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoopMultiExit) {
261261

262262
Function *F = M.getFunction("f");
263263
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
264-
auto Plan = buildHCFG(LoopHeader);
264+
auto Plan = buildVPlan(LoopHeader);
265265

266266
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
267267
// Add an external value to check we do not print the list of external values,

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ TEST_F(VPlanSlpTest, testSlpSimple_2) {
9595

9696
Function *F = M.getFunction("add_x2");
9797
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
98-
auto Plan = buildHCFG(LoopHeader);
98+
auto Plan = buildVPlan(LoopHeader);
9999
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
100100

101101
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -168,7 +168,7 @@ TEST_F(VPlanSlpTest, testSlpSimple_3) {
168168

169169
Function *F = M.getFunction("add_x2");
170170
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
171-
auto Plan = buildHCFG(LoopHeader);
171+
auto Plan = buildVPlan(LoopHeader);
172172

173173
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
174174
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -239,7 +239,7 @@ TEST_F(VPlanSlpTest, testSlpReuse_1) {
239239

240240
Function *F = M.getFunction("add_x2");
241241
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
242-
auto Plan = buildHCFG(LoopHeader);
242+
auto Plan = buildVPlan(LoopHeader);
243243
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
244244

245245
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -303,7 +303,7 @@ TEST_F(VPlanSlpTest, testSlpReuse_2) {
303303

304304
Function *F = M.getFunction("add_x2");
305305
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
306-
auto Plan = buildHCFG(LoopHeader);
306+
auto Plan = buildVPlan(LoopHeader);
307307
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
308308

309309
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -441,7 +441,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_1) {
441441

442442
Function *F = M.getFunction("add_x3");
443443
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
444-
auto Plan = buildHCFG(LoopHeader);
444+
auto Plan = buildVPlan(LoopHeader);
445445

446446
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
447447
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -513,7 +513,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_2) {
513513

514514
Function *F = M.getFunction("add_x3");
515515
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
516-
auto Plan = buildHCFG(LoopHeader);
516+
auto Plan = buildVPlan(LoopHeader);
517517

518518
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
519519
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -585,7 +585,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_3) {
585585

586586
Function *F = M.getFunction("add_x3");
587587
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
588-
auto Plan = buildHCFG(LoopHeader);
588+
auto Plan = buildVPlan(LoopHeader);
589589

590590
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
591591
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -661,7 +661,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_4) {
661661

662662
Function *F = M.getFunction("add_x3");
663663
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
664-
auto Plan = buildHCFG(LoopHeader);
664+
auto Plan = buildVPlan(LoopHeader);
665665

666666
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
667667
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
@@ -721,7 +721,7 @@ TEST_F(VPlanSlpTest, testInstrsInDifferentBBs) {
721721

722722
Function *F = M.getFunction("add_x2");
723723
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
724-
auto Plan = buildHCFG(LoopHeader);
724+
auto Plan = buildVPlan(LoopHeader);
725725
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
726726

727727
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -784,7 +784,7 @@ TEST_F(VPlanSlpTest, testInstrsInDifferentBBs2) {
784784

785785
Function *F = M.getFunction("add_x2");
786786
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
787-
auto Plan = buildHCFG(LoopHeader);
787+
auto Plan = buildVPlan(LoopHeader);
788788
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
789789

790790
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -844,7 +844,7 @@ TEST_F(VPlanSlpTest, testSlpAtomicLoad) {
844844

845845
Function *F = M.getFunction("add_x2");
846846
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
847-
auto Plan = buildHCFG(LoopHeader);
847+
auto Plan = buildVPlan(LoopHeader);
848848
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
849849

850850
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
@@ -903,7 +903,7 @@ TEST_F(VPlanSlpTest, testSlpAtomicStore) {
903903

904904
Function *F = M.getFunction("add_x2");
905905
BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor();
906-
auto Plan = buildHCFG(LoopHeader);
906+
auto Plan = buildVPlan(LoopHeader);
907907
auto VPIAI = getInterleavedAccessInfo(*F, LI->getLoopFor(LoopHeader), *Plan);
908908

909909
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();

‎llvm/unittests/Transforms/Vectorize/VPlanTestBase.h

+2-16
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ class VPlanTestIRBase : public testing::Test {
6262
SE.reset(new ScalarEvolution(F, TLI, *AC, *DT, *LI));
6363
}
6464

65-
VPlanPtr buildHCFG(BasicBlock *LoopHeader) {
65+
/// Build the VPlan for the loop starting from \p LoopHeader.
66+
VPlanPtr buildVPlan(BasicBlock *LoopHeader) {
6667
Function &F = *LoopHeader->getParent();
6768
assert(!verifyFunction(F) && "input function must be valid");
6869
doAnalysis(F);
@@ -75,21 +76,6 @@ class VPlanTestIRBase : public testing::Test {
7576
HCFGBuilder.buildHierarchicalCFG();
7677
return Plan;
7778
}
78-
79-
/// Build the VPlan plain CFG for the loop starting from \p LoopHeader.
80-
VPlanPtr buildPlainCFG(BasicBlock *LoopHeader) {
81-
Function &F = *LoopHeader->getParent();
82-
assert(!verifyFunction(F) && "input function must be valid");
83-
doAnalysis(F);
84-
85-
Loop *L = LI->getLoopFor(LoopHeader);
86-
PredicatedScalarEvolution PSE(*SE, *L);
87-
auto Plan = VPlan::createInitialVPlan(IntegerType::get(*Ctx, 64), PSE, true,
88-
false, L);
89-
VPlanHCFGBuilder HCFGBuilder(L, LI.get(), *Plan);
90-
HCFGBuilder.buildPlainCFG();
91-
return Plan;
92-
}
9379
};
9480

9581
class VPlanTestBase : public testing::Test {

0 commit comments

Comments
 (0)