Skip to content

Commit 0558fe3

Browse files
fhahnfhahn
committed
[VPlan] Update unit tests to use getVectorLoopRegion (NFC).
Use getVectorLoopRegion to retrieve the vector loop header instead of relying on getting the successor of the entry block. This makes sure the code still works correctly as more parts of the skeleton are modeled in VPlan.
1 parent a291f00 commit 0558fe3

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) {
5050

5151
// Check that the region following the preheader is a single basic-block
5252
// region (loop).
53-
VPBasicBlock *VecBB = Entry->getSingleSuccessor()->getEntryBasicBlock();
53+
VPBasicBlock *VecBB = Plan->getVectorLoopRegion()->getEntryBasicBlock();
5454
EXPECT_EQ(8u, VecBB->size());
5555
EXPECT_EQ(0u, VecBB->getNumPredecessors());
5656
EXPECT_EQ(0u, VecBB->getNumSuccessors());
@@ -193,7 +193,7 @@ TEST_F(VPlanHCFGTest, testVPInstructionToVPRecipesInner) {
193193

194194
// Check that the region following the preheader is a single basic-block
195195
// region (loop).
196-
VPBasicBlock *VecBB = Entry->getSingleSuccessor()->getEntryBasicBlock();
196+
VPBasicBlock *VecBB = Plan->getVectorLoopRegion()->getEntryBasicBlock();
197197
EXPECT_EQ(8u, VecBB->size());
198198
EXPECT_EQ(0u, VecBB->getNumPredecessors());
199199
EXPECT_EQ(0u, VecBB->getNumSuccessors());

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ TEST_F(VPlanSlpTest, testSlpSimple_2) {
9999

100100
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
101101
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
102-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
102+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
103103

104104
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
105105
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
@@ -171,7 +171,7 @@ TEST_F(VPlanSlpTest, testSlpSimple_3) {
171171

172172
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
173173
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
174-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
174+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
175175

176176
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
177177
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
@@ -243,7 +243,7 @@ TEST_F(VPlanSlpTest, testSlpReuse_1) {
243243

244244
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
245245
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
246-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
246+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
247247

248248
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 8));
249249
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 10));
@@ -307,7 +307,7 @@ TEST_F(VPlanSlpTest, testSlpReuse_2) {
307307

308308
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
309309
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
310-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
310+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
311311

312312
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 5));
313313
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 10));
@@ -444,7 +444,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_1) {
444444

445445
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
446446
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
447-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
447+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
448448

449449
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
450450
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
@@ -516,7 +516,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_2) {
516516

517517
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
518518
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
519-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
519+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
520520

521521
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
522522
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
@@ -588,7 +588,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_3) {
588588

589589
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
590590
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
591-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
591+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
592592

593593
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
594594
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
@@ -664,7 +664,7 @@ TEST_F(VPlanSlpTest, testSlpReorder_4) {
664664

665665
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
666666
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
667-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
667+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
668668

669669
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 24));
670670
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 26));
@@ -725,7 +725,7 @@ TEST_F(VPlanSlpTest, testInstrsInDifferentBBs) {
725725

726726
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
727727
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
728-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
728+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
729729
VPBasicBlock *BB2 = Body->getSingleSuccessor()->getEntryBasicBlock();
730730

731731
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(BB2->begin(), 3));
@@ -788,7 +788,7 @@ TEST_F(VPlanSlpTest, testInstrsInDifferentBBs2) {
788788

789789
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
790790
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
791-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
791+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
792792
VPBasicBlock *BB2 = Body->getSingleSuccessor()->getEntryBasicBlock();
793793

794794
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(BB2->begin(), 1));
@@ -848,7 +848,7 @@ TEST_F(VPlanSlpTest, testSlpAtomicLoad) {
848848

849849
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
850850
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
851-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
851+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
852852

853853
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
854854
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));
@@ -907,7 +907,7 @@ TEST_F(VPlanSlpTest, testSlpAtomicStore) {
907907

908908
VPBlockBase *Entry = Plan->getEntry()->getEntryBasicBlock();
909909
EXPECT_NE(nullptr, Entry->getSingleSuccessor());
910-
VPBasicBlock *Body = Entry->getSingleSuccessor()->getEntryBasicBlock();
910+
VPBasicBlock *Body = Plan->getVectorLoopRegion()->getEntryBasicBlock();
911911

912912
VPInstruction *Store1 = cast<VPInstruction>(&*std::next(Body->begin(), 12));
913913
VPInstruction *Store2 = cast<VPInstruction>(&*std::next(Body->begin(), 14));

0 commit comments

Comments
 (0)