diff options
Diffstat (limited to 'llvm/unittests/Transforms')
-rw-r--r-- | llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp | 10 | ||||
-rw-r--r-- | llvm/unittests/Transforms/Vectorize/VPlanTest.cpp | 26 | ||||
-rw-r--r-- | llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp | 16 |
3 files changed, 26 insertions, 26 deletions
diff --git a/llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp b/llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp index 2a0f500..e108c4d 100644 --- a/llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp +++ b/llvm/unittests/Transforms/Vectorize/VPDomTreeTest.cpp @@ -33,7 +33,7 @@ TEST_F(VPDominatorTreeTest, DominanceNoRegionsTest) { VPBasicBlock *VPBB2 = Plan.createVPBasicBlock("VPBB2"); VPBasicBlock *VPBB3 = Plan.createVPBasicBlock("VPBB3"); VPBasicBlock *VPBB4 = Plan.createVPBasicBlock("VPBB4"); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB1, VPBB4); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB1, VPBB4); VPBB2->setParent(R1); VPBB3->setParent(R1); @@ -99,7 +99,7 @@ TEST_F(VPDominatorTreeTest, DominanceRegionsTest) { VPBasicBlock *R1BB2 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB3 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB4 = Plan.createVPBasicBlock(""); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB4, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB4); R1BB2->setParent(R1); R1BB3->setParent(R1); VPBlockUtils::connectBlocks(VPBB0, R1); @@ -112,7 +112,7 @@ TEST_F(VPDominatorTreeTest, DominanceRegionsTest) { VPBasicBlock *R2BB1 = Plan.createVPBasicBlock(""); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock(""); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB2, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); VPBlockUtils::connectBlocks(R1, R2); @@ -171,12 +171,12 @@ TEST_F(VPDominatorTreeTest, DominanceRegionsTest) { VPBasicBlock *R1BB1 = Plan.createVPBasicBlock("R1BB1"); VPBasicBlock *R1BB2 = Plan.createVPBasicBlock("R1BB2"); VPBasicBlock *R1BB3 = Plan.createVPBasicBlock("R1BB3"); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB3, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB3); VPBasicBlock *R2BB1 = Plan.createVPBasicBlock("R2BB1"); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock("R2BB2"); VPBasicBlock *R2BB3 = Plan.createVPBasicBlock("R2BB#"); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB3, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB3); R2BB2->setParent(R2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB2, R2BB1); diff --git a/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp b/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp index db64c75..c1791dfa 100644 --- a/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp +++ b/llvm/unittests/Transforms/Vectorize/VPlanTest.cpp @@ -269,7 +269,7 @@ TEST_F(VPBasicBlockTest, getPlan) { // VPBasicBlock is the entry into the VPlan, followed by a region. VPBasicBlock *R1BB1 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB2 = Plan.createVPBasicBlock(""); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB2); VPBlockUtils::connectBlocks(R1BB1, R1BB2); VPBlockUtils::connectBlocks(VPBB1, R1); @@ -286,12 +286,12 @@ TEST_F(VPBasicBlockTest, getPlan) { VPlan &Plan = getPlan(); VPBasicBlock *R1BB1 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB2 = Plan.createVPBasicBlock(""); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB2); VPBlockUtils::connectBlocks(R1BB1, R1BB2); VPBasicBlock *R2BB1 = Plan.createVPBasicBlock(""); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock(""); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB2, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); VPBasicBlock *VPBB1 = Plan.getEntry(); @@ -369,7 +369,7 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) { VPBasicBlock *R1BB2 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB3 = Plan.createVPBasicBlock(""); VPBasicBlock *R1BB4 = Plan.createVPBasicBlock(""); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB4, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB4); R1BB2->setParent(R1); R1BB3->setParent(R1); VPBlockUtils::connectBlocks(VPBB0, R1); @@ -382,7 +382,7 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) { VPBasicBlock *R2BB1 = Plan.createVPBasicBlock(""); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock(""); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB2, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); VPBlockUtils::connectBlocks(R1, R2); @@ -467,12 +467,12 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) { VPBasicBlock *R1BB1 = Plan.createVPBasicBlock("R1BB1"); VPBasicBlock *R1BB2 = Plan.createVPBasicBlock("R1BB2"); VPBasicBlock *R1BB3 = Plan.createVPBasicBlock("R1BB3"); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB3, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R1BB1, R1BB3); VPBasicBlock *R2BB1 = Plan.createVPBasicBlock("R2BB1"); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock("R2BB2"); VPBasicBlock *R2BB3 = Plan.createVPBasicBlock("R2BB3"); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB3, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB3); R2BB2->setParent(R2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB2, R2BB1); @@ -537,10 +537,10 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) { VPlan &Plan = getPlan(); VPBasicBlock *R2BB1 = Plan.createVPBasicBlock("R2BB1"); VPBasicBlock *R2BB2 = Plan.createVPBasicBlock("R2BB2"); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB2, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R2BB2); VPBlockUtils::connectBlocks(R2BB1, R2BB2); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R2, R2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R2, R2); R2->setParent(R1); VPBasicBlock *VPBB1 = Plan.getEntry(); @@ -590,14 +590,14 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) { // VPlan &Plan = getPlan(); VPBasicBlock *R3BB1 = Plan.createVPBasicBlock("R3BB1"); - VPRegionBlock *R3 = Plan.createVPRegionBlock(R3BB1, R3BB1, "R3"); + VPRegionBlock *R3 = Plan.createLoopRegion("R3", R3BB1, R3BB1); VPBasicBlock *R2BB1 = Plan.createVPBasicBlock("R2BB1"); - VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R3, "R2"); + VPRegionBlock *R2 = Plan.createLoopRegion("R2", R2BB1, R3); R3->setParent(R2); VPBlockUtils::connectBlocks(R2BB1, R3); - VPRegionBlock *R1 = Plan.createVPRegionBlock(R2, R2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", R2, R2); R2->setParent(R1); VPBasicBlock *VPBB1 = Plan.getEntry(); @@ -687,7 +687,7 @@ TEST_F(VPBasicBlockTest, reassociateBlocks) { VPlan &Plan = getPlan(); VPBasicBlock *VPBB1 = Plan.createVPBasicBlock("VPBB1"); VPBasicBlock *VPBB2 = Plan.createVPBasicBlock("VPBB2"); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); auto *WidenPhi = new VPWidenPHIRecipe(nullptr); diff --git a/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp b/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp index c2f045b..50ad4d5 100644 --- a/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp +++ b/llvm/unittests/Transforms/Vectorize/VPlanVerifierTest.cpp @@ -32,7 +32,7 @@ TEST_F(VPVerifierTest, VPInstructionUseBeforeDefSameBB) { VPBasicBlock *VPBB2 = Plan.createVPBasicBlock(""); VPBB2->appendRecipe(CanIV); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); VPBlockUtils::connectBlocks(R1, Plan.getScalarHeader()); @@ -71,7 +71,7 @@ TEST_F(VPVerifierTest, VPInstructionUseBeforeDefDifferentBB) { VPBB2->appendRecipe(DefI); VPBB2->appendRecipe(BranchOnCond); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); VPBlockUtils::connectBlocks(R1, Plan.getScalarHeader()); @@ -117,7 +117,7 @@ TEST_F(VPVerifierTest, VPBlendUseBeforeDefDifferentBB) { VPBlockUtils::connectBlocks(VPBB2, VPBB3); VPBlockUtils::connectBlocks(VPBB3, VPBB4); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB4, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB4); VPBlockUtils::connectBlocks(VPBB1, R1); VPBB3->setParent(R1); @@ -160,7 +160,7 @@ TEST_F(VPVerifierTest, VPPhiIncomingValueDoesntDominateIncomingBlock) { auto *CanIV = new VPCanonicalIVPHIRecipe(Zero, {}); VPBB3->appendRecipe(CanIV); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB3, VPBB3, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB3, VPBB3); VPBlockUtils::connectBlocks(VPBB1, VPBB2); VPBlockUtils::connectBlocks(VPBB2, R1); VPBlockUtils::connectBlocks(VPBB4, Plan.getScalarHeader()); @@ -200,7 +200,7 @@ TEST_F(VPVerifierTest, DuplicateSuccessorsOutsideRegion) { VPBB2->appendRecipe(CanIV); VPBB2->appendRecipe(BranchOnCond); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); VPBlockUtils::connectBlocks(VPBB1, R1); @@ -237,7 +237,7 @@ TEST_F(VPVerifierTest, DuplicateSuccessorsInsideRegion) { VPBlockUtils::connectBlocks(VPBB2, VPBB3); VPBlockUtils::connectBlocks(VPBB2, VPBB3); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB3, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB3); VPBlockUtils::connectBlocks(VPBB1, R1); VPBB3->setParent(R1); @@ -270,7 +270,7 @@ TEST_F(VPVerifierTest, BlockOutsideRegionWithParent) { VPBB1->appendRecipe(DefI); VPBB2->appendRecipe(BranchOnCond); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); VPBlockUtils::connectBlocks(R1, Plan.getScalarHeader()); @@ -302,7 +302,7 @@ TEST_F(VPVerifierTest, NonHeaderPHIInHeader) { VPBB2->appendRecipe(IRPhi); VPBB2->appendRecipe(BranchOnCond); - VPRegionBlock *R1 = Plan.createVPRegionBlock(VPBB2, VPBB2, "R1"); + VPRegionBlock *R1 = Plan.createLoopRegion("R1", VPBB2, VPBB2); VPBlockUtils::connectBlocks(VPBB1, R1); VPBlockUtils::connectBlocks(R1, Plan.getScalarHeader()); |