diff options
author | Stephen Tozer <stephen.tozer@sony.com> | 2024-06-24 17:27:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-24 17:27:43 +0100 |
commit | 6481dc57612671ebe77fe9c34214fba94e1b3b27 (patch) | |
tree | 54fb3108460b2540d24118af14b32d613f6244c7 /llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp | |
parent | 317277e4f961edf13132914a58a26408db4ab0aa (diff) | |
download | llvm-6481dc57612671ebe77fe9c34214fba94e1b3b27.zip llvm-6481dc57612671ebe77fe9c34214fba94e1b3b27.tar.gz llvm-6481dc57612671ebe77fe9c34214fba94e1b3b27.tar.bz2 |
[IR][NFC] Update IRBuilder to use InsertPosition (#96497)
Uses the new InsertPosition class (added in #94226) to simplify some of
the IRBuilder interface, and removes the need to pass a BasicBlock
alongside a BasicBlock::iterator, using the fact that we can now get the
parent basic block from the iterator even if it points to the sentinel.
This patch removes the BasicBlock argument from each constructor or call
to setInsertPoint.
This has no functional effect, but later on as we look to remove the
`Instruction *InsertBefore` argument from instruction-creation
(discussed
[here](https://discourse.llvm.org/t/psa-instruction-constructors-changing-to-iterator-only-insertion/77845)),
this will simplify the process by allowing us to deprecate the
InsertPosition constructor directly and catch all the cases where we use
instructions rather than iterators.
Diffstat (limited to 'llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp')
-rw-r--r-- | llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp b/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp index 3ed3034..0adb615 100644 --- a/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp +++ b/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp @@ -2253,7 +2253,7 @@ TEST_F(OpenMPIRBuilderTest, StaticWorkshareLoopTarget) { BasicBlock *Preheader = CLI->getPreheader(); Value *TripCount = CLI->getTripCount(); - Builder.SetInsertPoint(BB, BB->getFirstInsertionPt()); + Builder.SetInsertPoint(BB->getFirstInsertionPt()); IRBuilder<>::InsertPoint AfterIP = OMPBuilder.applyWorkshareLoop( DL, CLI, AllocaIP, true, OMP_SCHEDULE_Static, nullptr, false, false, @@ -2317,7 +2317,7 @@ TEST_F(OpenMPIRBuilderTest, StaticWorkShareLoop) { Value *IV = CLI->getIndVar(); BasicBlock *ExitBlock = CLI->getExit(); - Builder.SetInsertPoint(BB, BB->getFirstInsertionPt()); + Builder.SetInsertPoint(BB->getFirstInsertionPt()); InsertPointTy AllocaIP = Builder.saveIP(); OMPBuilder.applyWorkshareLoop(DL, CLI, AllocaIP, /*NeedsBarrier=*/true, @@ -2507,7 +2507,7 @@ TEST_P(OpenMPIRBuilderTestWithParams, DynamicWorkShareLoop) { Loc, LoopBodyGen, StartVal, StopVal, StepVal, /*IsSigned=*/false, /*InclusiveStop=*/false); - Builder.SetInsertPoint(BB, BB->getFirstInsertionPt()); + Builder.SetInsertPoint(BB->getFirstInsertionPt()); InsertPointTy AllocaIP = Builder.saveIP(); // Collect all the info from CLI, as it isn't usable after the call to @@ -2649,7 +2649,7 @@ TEST_F(OpenMPIRBuilderTest, DynamicWorkShareLoopOrdered) { Loc, LoopBodyGen, StartVal, StopVal, StepVal, /*IsSigned=*/false, /*InclusiveStop=*/false); - Builder.SetInsertPoint(BB, BB->getFirstInsertionPt()); + Builder.SetInsertPoint(BB->getFirstInsertionPt()); InsertPointTy AllocaIP = Builder.saveIP(); // Collect all the info from CLI, as it isn't usable after the call to @@ -4850,7 +4850,7 @@ static bool findGEPZeroOne(Value *Ptr, Value *&Zero, Value *&One) { static OpenMPIRBuilder::InsertPointTy sumReduction(OpenMPIRBuilder::InsertPointTy IP, Value *LHS, Value *RHS, Value *&Result) { - IRBuilder<> Builder(IP.getBlock(), IP.getPoint()); + IRBuilder<> Builder(IP.getPoint()); Result = Builder.CreateFAdd(LHS, RHS, "red.add"); return Builder.saveIP(); } @@ -4858,7 +4858,7 @@ sumReduction(OpenMPIRBuilder::InsertPointTy IP, Value *LHS, Value *RHS, static OpenMPIRBuilder::InsertPointTy sumAtomicReduction(OpenMPIRBuilder::InsertPointTy IP, Type *Ty, Value *LHS, Value *RHS) { - IRBuilder<> Builder(IP.getBlock(), IP.getPoint()); + IRBuilder<> Builder(IP.getPoint()); Value *Partial = Builder.CreateLoad(Ty, RHS, "red.partial"); Builder.CreateAtomicRMW(AtomicRMWInst::FAdd, LHS, Partial, std::nullopt, AtomicOrdering::Monotonic); @@ -4868,7 +4868,7 @@ sumAtomicReduction(OpenMPIRBuilder::InsertPointTy IP, Type *Ty, Value *LHS, static OpenMPIRBuilder::InsertPointTy xorReduction(OpenMPIRBuilder::InsertPointTy IP, Value *LHS, Value *RHS, Value *&Result) { - IRBuilder<> Builder(IP.getBlock(), IP.getPoint()); + IRBuilder<> Builder(IP.getPoint()); Result = Builder.CreateXor(LHS, RHS, "red.xor"); return Builder.saveIP(); } @@ -4876,7 +4876,7 @@ xorReduction(OpenMPIRBuilder::InsertPointTy IP, Value *LHS, Value *RHS, static OpenMPIRBuilder::InsertPointTy xorAtomicReduction(OpenMPIRBuilder::InsertPointTy IP, Type *Ty, Value *LHS, Value *RHS) { - IRBuilder<> Builder(IP.getBlock(), IP.getPoint()); + IRBuilder<> Builder(IP.getPoint()); Value *Partial = Builder.CreateLoad(Ty, RHS, "red.partial"); Builder.CreateAtomicRMW(AtomicRMWInst::Xor, LHS, Partial, std::nullopt, AtomicOrdering::Monotonic); |