Author: Kazu Hirata Date: 2021-01-14T20:30:31-08:00 New Revision: 9bcc0d1040ddd63b7f82e309c0d5feb4e0c9005e
URL: https://github.com/llvm/llvm-project/commit/9bcc0d1040ddd63b7f82e309c0d5feb4e0c9005e DIFF: https://github.com/llvm/llvm-project/commit/9bcc0d1040ddd63b7f82e309c0d5feb4e0c9005e.diff LOG: [CodeGen, Transforms] Use llvm::sort (NFC) Added: Modified: llvm/lib/CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp llvm/lib/CodeGen/RDFLiveness.cpp llvm/lib/CodeGen/RegAllocFast.cpp llvm/lib/Transforms/Coroutines/CoroFrame.cpp llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp llvm/lib/Transforms/Scalar/ConstraintElimination.cpp llvm/lib/Transforms/Scalar/NewGVN.cpp Removed: ################################################################################ diff --git a/llvm/lib/CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp b/llvm/lib/CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp index 86b804774696..1c9131edab83 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DbgEntityHistoryCalculator.cpp @@ -242,7 +242,7 @@ void DbgValueHistoryMap::trimLocationRanges( if (ReferenceCount[i] <= 0 && HistoryMapEntries[i].isClobber()) ToRemove.push_back(i); - std::sort(ToRemove.begin(), ToRemove.end()); + llvm::sort(ToRemove); // Build an offset map so we can update the EndIndex of the remaining // entries. diff --git a/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp b/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp index 34a494cef9c5..1171e4b9519d 100644 --- a/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp +++ b/llvm/lib/CodeGen/FixupStatepointCallerSaved.cpp @@ -301,7 +301,7 @@ class FrameIndexesCache { void sortRegisters(SmallVectorImpl<Register> &Regs) { if (!FixupSCSExtendSlotSize) return; - llvm::sort(Regs.begin(), Regs.end(), [&](Register &A, Register &B) { + llvm::sort(Regs, [&](Register &A, Register &B) { return getRegisterSize(TRI, A) > getRegisterSize(TRI, B); }); } diff --git a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp index b6f46daf8bba..18ffe8ba0669 100644 --- a/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp +++ b/llvm/lib/CodeGen/LiveDebugValues/InstrRefBasedImpl.cpp @@ -2282,7 +2282,7 @@ InstrRefBasedLDV::mlocJoin(MachineBasicBlock &MBB, auto Cmp = [&](const MachineBasicBlock *A, const MachineBasicBlock *B) { return BBToOrder.find(A)->second < BBToOrder.find(B)->second; }; - llvm::sort(BlockOrders.begin(), BlockOrders.end(), Cmp); + llvm::sort(BlockOrders, Cmp); // Skip entry block. if (BlockOrders.size() == 0) @@ -2649,7 +2649,7 @@ std::tuple<bool, bool> InstrRefBasedLDV::vlocJoin( return BBToOrder[A] < BBToOrder[B]; }; - llvm::sort(BlockOrders.begin(), BlockOrders.end(), Cmp); + llvm::sort(BlockOrders, Cmp); unsigned CurBlockRPONum = BBToOrder[&MBB]; @@ -2991,7 +2991,7 @@ void InstrRefBasedLDV::vlocDataflow( for (auto *MBB : BlocksToExplore) BlockOrders.push_back(const_cast<MachineBasicBlock *>(MBB)); - llvm::sort(BlockOrders.begin(), BlockOrders.end(), Cmp); + llvm::sort(BlockOrders, Cmp); unsigned NumBlocks = BlockOrders.size(); // Allocate some vectors for storing the live ins and live outs. Large. @@ -3170,7 +3170,7 @@ void InstrRefBasedLDV::emitLocations( // in the middle. for (auto &P : TTracker->Transfers) { // Sort them according to appearance order. - llvm::sort(P.Insts.begin(), P.Insts.end(), OrderDbgValues); + llvm::sort(P.Insts, OrderDbgValues); // Insert either before or after the designated point... if (P.MBB) { MachineBasicBlock &MBB = *P.MBB; diff --git a/llvm/lib/CodeGen/RDFLiveness.cpp b/llvm/lib/CodeGen/RDFLiveness.cpp index a8b254061b41..76bf0c280970 100644 --- a/llvm/lib/CodeGen/RDFLiveness.cpp +++ b/llvm/lib/CodeGen/RDFLiveness.cpp @@ -230,11 +230,11 @@ NodeList Liveness::getAllReachingDefs(RegisterRef RefRR, TmpBB.push_back(Bucket.first); if (Bucket.second.size() > 2) GetOrder(*Bucket.first); - llvm::sort(Bucket.second.begin(), Bucket.second.end(), Precedes); + llvm::sort(Bucket.second, Precedes); } // Sort the blocks with respect to dominance. - llvm::sort(TmpBB.begin(), TmpBB.end(), + llvm::sort(TmpBB, [this](auto A, auto B) { return MDT.properlyDominates(A, B); }); std::vector<NodeId> TmpInst; diff --git a/llvm/lib/CodeGen/RegAllocFast.cpp b/llvm/lib/CodeGen/RegAllocFast.cpp index d6c5e11fd0c5..6e548d4a93c8 100644 --- a/llvm/lib/CodeGen/RegAllocFast.cpp +++ b/llvm/lib/CodeGen/RegAllocFast.cpp @@ -1157,8 +1157,7 @@ void RegAllocFast::allocateInstruction(MachineInstr &MI) { } } - llvm::sort(DefOperandIndexes.begin(), DefOperandIndexes.end(), - [&](uint16_t I0, uint16_t I1) { + llvm::sort(DefOperandIndexes, [&](uint16_t I0, uint16_t I1) { const MachineOperand &MO0 = MI.getOperand(I0); const MachineOperand &MO1 = MI.getOperand(I1); Register Reg0 = MO0.getReg(); diff --git a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp index 16e7e2c2ceaf..56add11c5974 100644 --- a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp +++ b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp @@ -2003,11 +2003,10 @@ static void sinkSpillUsesAfterCoroBegin(Function &F, // Sort by dominance. SmallVector<Instruction *, 64> InsertionList(ToMove.begin(), ToMove.end()); - std::sort(InsertionList.begin(), InsertionList.end(), - [&Dom](Instruction *A, Instruction *B) -> bool { - // If a dominates b it should preceed (<) b. - return Dom.dominates(A, B); - }); + llvm::sort(InsertionList, [&Dom](Instruction *A, Instruction *B) -> bool { + // If a dominates b it should preceed (<) b. + return Dom.dominates(A, B); + }); Instruction *InsertPt = CoroBegin->getNextNode(); for (Instruction *Inst : InsertionList) diff --git a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp index a9ca1eb565ba..2d4b07939463 100644 --- a/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp +++ b/llvm/lib/Transforms/Instrumentation/SanitizerCoverage.cpp @@ -795,7 +795,7 @@ void ModuleSanitizerCoverage::InjectTraceForSwitch( C = ConstantExpr::getCast(CastInst::ZExt, It.getCaseValue(), Int64Ty); Initializers.push_back(C); } - llvm::sort(Initializers.begin() + 2, Initializers.end(), + llvm::sort(drop_begin(Initializers, 2), [](const Constant *A, const Constant *B) { return cast<ConstantInt>(A)->getLimitedValue() < cast<ConstantInt>(B)->getLimitedValue(); diff --git a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp index 35c6c415341a..3b8af6f21ce5 100644 --- a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp +++ b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp @@ -259,10 +259,9 @@ static bool eliminateConstraints(Function &F, DominatorTree &DT) { // come before blocks and conditions dominated by them. If a block and a // condition have the same numbers, the condition comes before the block, as // it holds on entry to the block. - sort(WorkList.begin(), WorkList.end(), - [](const ConstraintOrBlock &A, const ConstraintOrBlock &B) { - return std::tie(A.NumIn, A.IsBlock) < std::tie(B.NumIn, B.IsBlock); - }); + sort(WorkList, [](const ConstraintOrBlock &A, const ConstraintOrBlock &B) { + return std::tie(A.NumIn, A.IsBlock) < std::tie(B.NumIn, B.IsBlock); + }); // Finally, process ordered worklist and eliminate implied conditions. SmallVector<StackEntry, 16> DFSInStack; diff --git a/llvm/lib/Transforms/Scalar/NewGVN.cpp b/llvm/lib/Transforms/Scalar/NewGVN.cpp index ee26c299c88c..13afd3b72bea 100644 --- a/llvm/lib/Transforms/Scalar/NewGVN.cpp +++ b/llvm/lib/Transforms/Scalar/NewGVN.cpp @@ -3372,10 +3372,9 @@ bool NewGVN::runGVN() { for (auto &B : RPOT) { auto *Node = DT->getNode(B); if (Node->getNumChildren() > 1) - llvm::sort(Node->begin(), Node->end(), - [&](const DomTreeNode *A, const DomTreeNode *B) { - return RPOOrdering[A] < RPOOrdering[B]; - }); + llvm::sort(*Node, [&](const DomTreeNode *A, const DomTreeNode *B) { + return RPOOrdering[A] < RPOOrdering[B]; + }); } // Now a standard depth first ordering of the domtree is equivalent to RPO. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
