Skip to content

Commit 6910aec

Browse files
fhahnfhahn
committed
[VPlan] Don't use VPlan ctor taking trip count in most unit tests (NFC).
Update tests to use constructor not passing a trip count VPValue. The tests don't need that and are simpler as a result.
1 parent cb0effc commit 6910aec

File tree

4 files changed

+24
-41
lines changed

4 files changed

+24
-41
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3813,13 +3813,6 @@ class VPlan {
38133813
DenseMap<const SCEV *, VPValue *> SCEVToExpansion;
38143814

38153815
public:
3816-
/// Construct a VPlan with \p Entry entering the plan, trip count \p TC and
3817-
/// with \p ScalarHeader wrapping the original header of the scalar loop.
3818-
VPlan(VPBasicBlock *Entry, VPValue *TC, VPIRBasicBlock *ScalarHeader)
3819-
: VPlan(Entry, ScalarHeader) {
3820-
TripCount = TC;
3821-
}
3822-
38233816
/// Construct a VPlan with \p Entry to the plan and with \p ScalarHeader
38243817
/// wrapping the original header of the scalar loop.
38253818
VPlan(VPBasicBlock *Entry, VPIRBasicBlock *ScalarHeader)
@@ -3829,6 +3822,13 @@ class VPlan {
38293822
"scalar header must be a leaf node");
38303823
}
38313824

3825+
/// Construct a VPlan with \p Entry entering the plan, trip count \p TC and
3826+
/// with \p ScalarHeader wrapping the original header of the scalar loop.
3827+
VPlan(VPBasicBlock *Entry, VPValue *TC, VPIRBasicBlock *ScalarHeader)
3828+
: VPlan(Entry, ScalarHeader) {
3829+
TripCount = TC;
3830+
}
3831+
38323832
~VPlan();
38333833

38343834
void setEntry(VPBasicBlock *VPBB) {

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ TEST(VPDominatorTreeTest, DominanceNoRegionsTest) {
4040
VPBlockUtils::connectBlocks(VPBB2, VPBB4);
4141
VPBlockUtils::connectBlocks(VPBB3, VPBB4);
4242

43-
auto TC = std::make_unique<VPValue>();
4443
LLVMContext C;
4544
auto *ScalarHeader = BasicBlock::Create(C, "");
4645
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
4746
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
4847
VPBlockUtils::connectBlocks(VPPH, VPBB0);
49-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
48+
VPlan Plan(VPPH, ScalarHeaderVPBB);
5049

5150
VPDominatorTree VPDT;
5251
VPDT.recalculate(Plan);
@@ -123,11 +122,10 @@ TEST(VPDominatorTreeTest, DominanceRegionsTest) {
123122
VPBlockUtils::connectBlocks(R2BB1, R2BB2);
124123
VPBlockUtils::connectBlocks(R1, R2);
125124

126-
auto TC = std::make_unique<VPValue>();
127125
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
128126
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
129127
VPBlockUtils::connectBlocks(VPPH, VPBB0);
130-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
128+
VPlan Plan(VPPH, ScalarHeaderVPBB);
131129
VPDominatorTree VPDT;
132130
VPDT.recalculate(Plan);
133131

@@ -206,11 +204,10 @@ TEST(VPDominatorTreeTest, DominanceRegionsTest) {
206204
VPBasicBlock *VPBB2 = new VPBasicBlock("VPBB2");
207205
VPBlockUtils::connectBlocks(R1, VPBB2);
208206

209-
auto TC = std::make_unique<VPValue>();
210207
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
211208
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
212209
VPBlockUtils::connectBlocks(VPPH, VPBB1);
213-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
210+
VPlan Plan(VPPH, ScalarHeaderVPBB);
214211
VPDominatorTree VPDT;
215212
VPDT.recalculate(Plan);
216213

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,10 @@ TEST(VPBasicBlockTest, getPlan) {
257257
VPBlockUtils::connectBlocks(VPBB2, VPBB4);
258258
VPBlockUtils::connectBlocks(VPBB3, VPBB4);
259259

260-
auto TC = std::make_unique<VPValue>();
261260
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
262261
VPBlockUtils::connectBlocks(VPBB4, ScalarHeaderVPBB);
263262
VPBlockUtils::connectBlocks(VPPH, VPBB1);
264-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
263+
VPlan Plan(VPPH, ScalarHeaderVPBB);
265264

266265
EXPECT_EQ(&Plan, VPBB1->getPlan());
267266
EXPECT_EQ(&Plan, VPBB2->getPlan());
@@ -280,11 +279,10 @@ TEST(VPBasicBlockTest, getPlan) {
280279
VPBasicBlock *VPBB1 = new VPBasicBlock();
281280
VPBlockUtils::connectBlocks(VPBB1, R1);
282281

283-
auto TC = std::make_unique<VPValue>();
284282
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
285283
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
286284
VPBlockUtils::connectBlocks(VPPH, VPBB1);
287-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
285+
VPlan Plan(VPPH, ScalarHeaderVPBB);
288286

289287
EXPECT_EQ(&Plan, VPBB1->getPlan());
290288
EXPECT_EQ(&Plan, R1->getPlan());
@@ -313,11 +311,10 @@ TEST(VPBasicBlockTest, getPlan) {
313311
VPBlockUtils::connectBlocks(R1, VPBB2);
314312
VPBlockUtils::connectBlocks(R2, VPBB2);
315313

316-
auto TC = std::make_unique<VPValue>();
317314
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
318315
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
319316
VPBlockUtils::connectBlocks(VPPH, VPBB1);
320-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
317+
VPlan Plan(VPPH, ScalarHeaderVPBB);
321318

322319
EXPECT_EQ(&Plan, VPBB1->getPlan());
323320
EXPECT_EQ(&Plan, R1->getPlan());
@@ -360,11 +357,10 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
360357
EXPECT_EQ(VPBB2, FromIterator[1]);
361358

362359
// Use Plan to properly clean up created blocks.
363-
auto TC = std::make_unique<VPValue>();
364360
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
365361
VPBlockUtils::connectBlocks(VPBB4, ScalarHeaderVPBB);
366362
VPBlockUtils::connectBlocks(VPPH, VPBB1);
367-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
363+
VPlan Plan(VPPH, ScalarHeaderVPBB);
368364
}
369365

370366
{
@@ -463,11 +459,10 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
463459
EXPECT_EQ(R1, FromIterator[7]);
464460

465461
// Use Plan to properly clean up created blocks.
466-
auto TC = std::make_unique<VPValue>();
467462
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
468463
VPBlockUtils::connectBlocks(R2, ScalarHeaderVPBB);
469464
VPBlockUtils::connectBlocks(VPPH, VPBB0);
470-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
465+
VPlan Plan(VPPH, ScalarHeaderVPBB);
471466
}
472467

473468
{
@@ -549,11 +544,10 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
549544
EXPECT_EQ(VPBB1, FromIterator[9]);
550545

551546
// Use Plan to properly clean up created blocks.
552-
auto TC = std::make_unique<VPValue>();
553547
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
554548
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
555549
VPBlockUtils::connectBlocks(VPPH, VPBB1);
556-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
550+
VPlan Plan(VPPH, ScalarHeaderVPBB);
557551
}
558552

559553
{
@@ -600,11 +594,10 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
600594
EXPECT_EQ(VPBB1, FromIterator[4]);
601595

602596
// Use Plan to properly clean up created blocks.
603-
auto TC = std::make_unique<VPValue>();
604597
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
605598
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
606599
VPBlockUtils::connectBlocks(VPPH, VPBB1);
607-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
600+
VPlan Plan(VPPH, ScalarHeaderVPBB);
608601
}
609602

610603
{
@@ -695,11 +688,10 @@ TEST(VPBasicBlockTest, TraversingIteratorTest) {
695688
EXPECT_EQ(VPBB1, FromIterator[3]);
696689

697690
// Use Plan to properly clean up created blocks.
698-
auto TC = std::make_unique<VPValue>();
699691
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
700692
VPBlockUtils::connectBlocks(VPBB2, ScalarHeaderVPBB);
701693
VPBlockUtils::connectBlocks(VPPH, VPBB1);
702-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
694+
VPlan Plan(VPPH, ScalarHeaderVPBB);
703695
}
704696
delete ScalarHeader;
705697
}

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ TEST(VPVerifierTest, VPInstructionUseBeforeDefSameBB) {
2424
VPBB1->appendRecipe(UseI);
2525
VPBB1->appendRecipe(DefI);
2626

27-
auto TC = std::make_unique<VPValue>();
2827
VPBasicBlock *VPBB2 = new VPBasicBlock();
2928
VPRegionBlock *R1 = new VPRegionBlock(VPBB2, VPBB2, "R1");
3029
VPBlockUtils::connectBlocks(VPBB1, R1);
@@ -34,7 +33,7 @@ TEST(VPVerifierTest, VPInstructionUseBeforeDefSameBB) {
3433
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
3534
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
3635
VPBlockUtils::connectBlocks(VPPH, VPBB1);
37-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
36+
VPlan Plan(VPPH, ScalarHeaderVPBB);
3837

3938
#if GTEST_HAS_STREAM_REDIRECTION
4039
::testing::internal::CaptureStderr();
@@ -66,13 +65,12 @@ TEST(VPVerifierTest, VPInstructionUseBeforeDefDifferentBB) {
6665
VPRegionBlock *R1 = new VPRegionBlock(VPBB2, VPBB2, "R1");
6766
VPBlockUtils::connectBlocks(VPBB1, R1);
6867

69-
auto TC = std::make_unique<VPValue>();
7068
LLVMContext C;
7169
auto *ScalarHeader = BasicBlock::Create(C, "");
7270
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
7371
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
7472
VPBlockUtils::connectBlocks(VPPH, VPBB1);
75-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
73+
VPlan Plan(VPPH, ScalarHeaderVPBB);
7674

7775
#if GTEST_HAS_STREAM_REDIRECTION
7876
::testing::internal::CaptureStderr();
@@ -115,12 +113,11 @@ TEST(VPVerifierTest, VPBlendUseBeforeDefDifferentBB) {
115113
VPBlockUtils::connectBlocks(VPBB1, R1);
116114
VPBB3->setParent(R1);
117115

118-
auto TC = std::make_unique<VPValue>();
119116
auto *ScalarHeader = BasicBlock::Create(C, "");
120117
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
121118
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
122119
VPBlockUtils::connectBlocks(VPPH, VPBB1);
123-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
120+
VPlan Plan(VPPH, ScalarHeaderVPBB);
124121

125122
#if GTEST_HAS_STREAM_REDIRECTION
126123
::testing::internal::CaptureStderr();
@@ -156,13 +153,12 @@ TEST(VPVerifierTest, DuplicateSuccessorsOutsideRegion) {
156153
VPBlockUtils::connectBlocks(VPBB1, R1);
157154
VPBlockUtils::connectBlocks(VPBB1, R1);
158155

159-
auto TC = std::make_unique<VPValue>();
160156
LLVMContext C;
161157
auto *ScalarHeader = BasicBlock::Create(C, "");
162158
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
163159
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
164160
VPBlockUtils::connectBlocks(VPPH, VPBB1);
165-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
161+
VPlan Plan(VPPH, ScalarHeaderVPBB);
166162

167163
#if GTEST_HAS_STREAM_REDIRECTION
168164
::testing::internal::CaptureStderr();
@@ -199,13 +195,12 @@ TEST(VPVerifierTest, DuplicateSuccessorsInsideRegion) {
199195
VPBlockUtils::connectBlocks(VPBB1, R1);
200196
VPBB3->setParent(R1);
201197

202-
auto TC = std::make_unique<VPValue>();
203198
LLVMContext C;
204199
auto *ScalarHeader = BasicBlock::Create(C, "");
205200
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
206201
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
207202
VPBlockUtils::connectBlocks(VPPH, VPBB1);
208-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
203+
VPlan Plan(VPPH, ScalarHeaderVPBB);
209204

210205
#if GTEST_HAS_STREAM_REDIRECTION
211206
::testing::internal::CaptureStderr();
@@ -233,13 +228,12 @@ TEST(VPVerifierTest, BlockOutsideRegionWithParent) {
233228
VPRegionBlock *R1 = new VPRegionBlock(VPBB2, VPBB2, "R1");
234229
VPBlockUtils::connectBlocks(VPBB1, R1);
235230

236-
auto TC = std::make_unique<VPValue>();
237231
LLVMContext C;
238232
auto *ScalarHeader = BasicBlock::Create(C, "");
239233
VPIRBasicBlock *ScalarHeaderVPBB = new VPIRBasicBlock(ScalarHeader);
240234
VPBlockUtils::connectBlocks(R1, ScalarHeaderVPBB);
241235
VPBlockUtils::connectBlocks(VPPH, VPBB1);
242-
VPlan Plan(VPPH, &*TC, ScalarHeaderVPBB);
236+
VPlan Plan(VPPH, ScalarHeaderVPBB);
243237
VPBB1->setParent(R1);
244238

245239
#if GTEST_HAS_STREAM_REDIRECTION

0 commit comments

Comments
 (0)