Author: Kazu Hirata Date: 2021-01-08T18:39:54-08:00 New Revision: b7c5e0b02ccfd12b26432b2408a71d4c05902339
URL: https://github.com/llvm/llvm-project/commit/b7c5e0b02ccfd12b26432b2408a71d4c05902339 DIFF: https://github.com/llvm/llvm-project/commit/b7c5e0b02ccfd12b26432b2408a71d4c05902339.diff LOG: [Target, Transforms] Use *Set::contains (NFC) Added: Modified: llvm/lib/Analysis/DomTreeUpdater.cpp llvm/lib/CodeGen/LexicalScopes.cpp llvm/lib/CodeGen/LiveVariables.cpp llvm/lib/CodeGen/MachinePipeliner.cpp llvm/lib/CodeGen/MachineSink.cpp llvm/lib/CodeGen/RegAllocPBQP.cpp llvm/lib/Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp llvm/lib/Target/PowerPC/PPCMacroFusion.cpp llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp Removed: ################################################################################ diff --git a/llvm/lib/Analysis/DomTreeUpdater.cpp b/llvm/lib/Analysis/DomTreeUpdater.cpp index e690d6491356..8ac7d9d4efd0 100644 --- a/llvm/lib/Analysis/DomTreeUpdater.cpp +++ b/llvm/lib/Analysis/DomTreeUpdater.cpp @@ -166,7 +166,7 @@ bool DomTreeUpdater::hasPendingPostDomTreeUpdates() const { bool DomTreeUpdater::isBBPendingDeletion(llvm::BasicBlock *DelBB) const { if (Strategy == UpdateStrategy::Eager || DeletedBBs.empty()) return false; - return DeletedBBs.count(DelBB) != 0; + return DeletedBBs.contains(DelBB); } // The DT and PDT require the nodes related to updates diff --git a/llvm/lib/CodeGen/LexicalScopes.cpp b/llvm/lib/CodeGen/LexicalScopes.cpp index 690b429832a5..8139c2cbb6cd 100644 --- a/llvm/lib/CodeGen/LexicalScopes.cpp +++ b/llvm/lib/CodeGen/LexicalScopes.cpp @@ -324,7 +324,7 @@ bool LexicalScopes::dominates(const DILocation *DL, MachineBasicBlock *MBB) { Set = std::make_unique<BlockSetT>(); getMachineBasicBlocks(DL, *Set); } - return Set->count(MBB) != 0; + return Set->contains(MBB); } #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) diff --git a/llvm/lib/CodeGen/LiveVariables.cpp b/llvm/lib/CodeGen/LiveVariables.cpp index 6490a797fd60..49b880c30936 100644 --- a/llvm/lib/CodeGen/LiveVariables.cpp +++ b/llvm/lib/CodeGen/LiveVariables.cpp @@ -666,7 +666,7 @@ bool LiveVariables::runOnMachineFunction(MachineFunction &mf) { // other part of the code generator if this happens. #ifndef NDEBUG for(MachineFunction::iterator i = MF->begin(), e = MF->end(); i != e; ++i) - assert(Visited.count(&*i) != 0 && "unreachable basic block found"); + assert(Visited.contains(&*i) && "unreachable basic block found"); #endif PhysRegDef.clear(); diff --git a/llvm/lib/CodeGen/MachinePipeliner.cpp b/llvm/lib/CodeGen/MachinePipeliner.cpp index db4d78af5fa6..9564192761d2 100644 --- a/llvm/lib/CodeGen/MachinePipeliner.cpp +++ b/llvm/lib/CodeGen/MachinePipeliner.cpp @@ -1595,12 +1595,12 @@ static bool computePath(SUnit *Cur, SetVector<SUnit *> &Path, SmallPtrSet<SUnit *, 8> &Visited) { if (Cur->isBoundaryNode()) return false; - if (Exclude.count(Cur) != 0) + if (Exclude.contains(Cur)) return false; - if (DestNodes.count(Cur) != 0) + if (DestNodes.contains(Cur)) return true; if (!Visited.insert(Cur).second) - return Path.count(Cur) != 0; + return Path.contains(Cur); bool FoundPath = false; for (auto &SI : Cur->Succs) FoundPath |= computePath(SI.getSUnit(), Path, DestNodes, Exclude, Visited); @@ -1956,7 +1956,7 @@ void SwingSchedulerDAG::computeNodeOrder(NodeSetType &NodeSets) { for (const auto &I : maxHeight->Succs) { if (Nodes.count(I.getSUnit()) == 0) continue; - if (NodeOrder.count(I.getSUnit()) != 0) + if (NodeOrder.contains(I.getSUnit())) continue; if (ignoreDependence(I, false)) continue; @@ -1968,7 +1968,7 @@ void SwingSchedulerDAG::computeNodeOrder(NodeSetType &NodeSets) { continue; if (Nodes.count(I.getSUnit()) == 0) continue; - if (NodeOrder.count(I.getSUnit()) != 0) + if (NodeOrder.contains(I.getSUnit())) continue; R.insert(I.getSUnit()); } @@ -2007,7 +2007,7 @@ void SwingSchedulerDAG::computeNodeOrder(NodeSetType &NodeSets) { for (const auto &I : maxDepth->Preds) { if (Nodes.count(I.getSUnit()) == 0) continue; - if (NodeOrder.count(I.getSUnit()) != 0) + if (NodeOrder.contains(I.getSUnit())) continue; R.insert(I.getSUnit()); } @@ -2017,7 +2017,7 @@ void SwingSchedulerDAG::computeNodeOrder(NodeSetType &NodeSets) { continue; if (Nodes.count(I.getSUnit()) == 0) continue; - if (NodeOrder.count(I.getSUnit()) != 0) + if (NodeOrder.contains(I.getSUnit())) continue; R.insert(I.getSUnit()); } diff --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp index cede18b658ef..378df1b75e25 100644 --- a/llvm/lib/CodeGen/MachineSink.cpp +++ b/llvm/lib/CodeGen/MachineSink.cpp @@ -462,7 +462,7 @@ void MachineSinking::ProcessDbgInst(MachineInstr &MI) { DebugVariable Var(MI.getDebugVariable(), MI.getDebugExpression(), MI.getDebugLoc()->getInlinedAt()); - bool SeenBefore = SeenDbgVars.count(Var) != 0; + bool SeenBefore = SeenDbgVars.contains(Var); MachineOperand &MO = MI.getDebugOperand(0); if (MO.isReg() && MO.getReg().isVirtual()) diff --git a/llvm/lib/CodeGen/RegAllocPBQP.cpp b/llvm/lib/CodeGen/RegAllocPBQP.cpp index 90e9cb5f0238..7c5af1a0c56e 100644 --- a/llvm/lib/CodeGen/RegAllocPBQP.cpp +++ b/llvm/lib/CodeGen/RegAllocPBQP.cpp @@ -230,9 +230,9 @@ class Interference : public PBQPRAConstraint { return false; if (NRegs < MRegs) - return D.count(IKey(NRegs, MRegs)) > 0; + return D.contains(IKey(NRegs, MRegs)); - return D.count(IKey(MRegs, NRegs)) > 0; + return D.contains(IKey(MRegs, NRegs)); } void setDisjointAllowedRegs(const PBQPRAGraph &G, PBQPRAGraph::NodeId NId, diff --git a/llvm/lib/Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp b/llvm/lib/Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp index 5e353c519b35..d9dba9a05ac4 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUMachineCFGStructurizer.cpp @@ -984,11 +984,11 @@ void LinearizedRegion::addMBBs(LinearizedRegion *InnerRegion) { } bool LinearizedRegion::contains(MachineBasicBlock *MBB) { - return MBBs.count(MBB) == 1; + return MBBs.contains(MBB); } bool LinearizedRegion::isLiveOut(unsigned Reg) { - return LiveOuts.count(Reg) == 1; + return LiveOuts.contains(Reg); } bool LinearizedRegion::hasNoDef(unsigned Reg, MachineRegisterInfo *MRI) { diff --git a/llvm/lib/Target/PowerPC/PPCMacroFusion.cpp b/llvm/lib/Target/PowerPC/PPCMacroFusion.cpp index 815dfd1402f4..d12c6d9cd406 100644 --- a/llvm/lib/Target/PowerPC/PPCMacroFusion.cpp +++ b/llvm/lib/Target/PowerPC/PPCMacroFusion.cpp @@ -51,8 +51,8 @@ class FusionFeature { Kd(Kind), Supported(HasFeature), DepOpIdx(Index), OpSet1(First), OpSet2(Second) {} - bool hasOp1(unsigned Opc) const { return OpSet1.count(Opc) != 0; } - bool hasOp2(unsigned Opc) const { return OpSet2.count(Opc) != 0; } + bool hasOp1(unsigned Opc) const { return OpSet1.contains(Opc); } + bool hasOp2(unsigned Opc) const { return OpSet2.contains(Opc); } bool isSupported() const { return Supported; } Optional<unsigned> depOpIdx() const { if (DepOpIdx < 0) diff --git a/llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp b/llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp index 5baab5684c96..c78185f2a6ad 100644 --- a/llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp +++ b/llvm/lib/Transforms/Scalar/SpeculativeExecution.cpp @@ -281,7 +281,7 @@ bool SpeculativeExecutionPass::considerHoistingFromTo( for (const Value *V : U->operand_values()) { if (const Instruction *I = dyn_cast<Instruction>(V)) { - if (NotHoisted.count(I) > 0) + if (NotHoisted.contains(I)) return false; } } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits