[llvm] 11efd1c - [Analysis] Use *{Set,Map}::contains (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 14 00:32:47 PDT 2023
Author: Kazu Hirata
Date: 2023-03-14T00:32:40-07:00
New Revision: 11efd1cb04d0e9115d38f2138fa7fa455e281e09
URL: https://github.com/llvm/llvm-project/commit/11efd1cb04d0e9115d38f2138fa7fa455e281e09
DIFF: https://github.com/llvm/llvm-project/commit/11efd1cb04d0e9115d38f2138fa7fa455e281e09.diff
LOG: [Analysis] Use *{Set,Map}::contains (NFC)
Added:
Modified:
llvm/include/llvm/Analysis/Utils/TrainingLogger.h
llvm/include/llvm/Analysis/VectorUtils.h
llvm/lib/Analysis/BranchProbabilityInfo.cpp
llvm/lib/Analysis/CFGPrinter.cpp
llvm/lib/Analysis/DDG.cpp
llvm/lib/Analysis/DemandedBits.cpp
llvm/lib/Analysis/IRSimilarityIdentifier.cpp
llvm/lib/Analysis/InlineCost.cpp
llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
llvm/lib/Analysis/ScalarEvolution.cpp
llvm/lib/Analysis/StackLifetime.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/Utils/TrainingLogger.h b/llvm/include/llvm/Analysis/Utils/TrainingLogger.h
index 57a1637f59b5c..8f46779a732d1 100644
--- a/llvm/include/llvm/Analysis/Utils/TrainingLogger.h
+++ b/llvm/include/llvm/Analysis/Utils/TrainingLogger.h
@@ -128,7 +128,7 @@ class Logger final {
/// Check if there is at least an observation for the context `Ctx`.
bool hasAnyObservationForContext(StringRef Ctx) const {
- return ObservationIDs.find(Ctx) != ObservationIDs.end();
+ return ObservationIDs.contains(Ctx);
}
template <typename T> void logReward(T Value) {
diff --git a/llvm/include/llvm/Analysis/VectorUtils.h b/llvm/include/llvm/Analysis/VectorUtils.h
index af2cd6f07aa9d..da223f30e81a7 100644
--- a/llvm/include/llvm/Analysis/VectorUtils.h
+++ b/llvm/include/llvm/Analysis/VectorUtils.h
@@ -815,7 +815,7 @@ class InterleavedAccessInfo {
/// Check if \p Instr belongs to any interleave group.
bool isInterleaved(Instruction *Instr) const {
- return InterleaveGroupMap.find(Instr) != InterleaveGroupMap.end();
+ return InterleaveGroupMap.contains(Instr);
}
/// Get the interleave group that \p Instr belongs to.
@@ -979,8 +979,7 @@ class InterleavedAccessInfo {
// If we know there is a dependence from source to sink, assume the
// instructions can't be reordered. Otherwise, reordering is legal.
- return Dependences.find(Src) == Dependences.end() ||
- !Dependences.lookup(Src).count(Sink);
+ return !Dependences.contains(Src) || !Dependences.lookup(Src).count(Sink);
}
/// Collect the dependences from LoopAccessInfo.
diff --git a/llvm/lib/Analysis/BranchProbabilityInfo.cpp b/llvm/lib/Analysis/BranchProbabilityInfo.cpp
index 7931001d0a2b2..e742416746bc7 100644
--- a/llvm/lib/Analysis/BranchProbabilityInfo.cpp
+++ b/llvm/lib/Analysis/BranchProbabilityInfo.cpp
@@ -1163,7 +1163,7 @@ void BranchProbabilityInfo::copyEdgeProbabilities(BasicBlock *Src,
assert(NumSuccessors == Dst->getTerminator()->getNumSuccessors());
if (NumSuccessors == 0)
return; // Nothing to set.
- if (this->Probs.find(std::make_pair(Src, 0)) == this->Probs.end())
+ if (!this->Probs.contains(std::make_pair(Src, 0)))
return; // No probability is set for edges from Src. Keep the same for Dst.
Handles.insert(BasicBlockCallbackVH(Dst, this));
diff --git a/llvm/lib/Analysis/CFGPrinter.cpp b/llvm/lib/Analysis/CFGPrinter.cpp
index f8eba1a00f28d..f05dd6852d6dc 100644
--- a/llvm/lib/Analysis/CFGPrinter.cpp
+++ b/llvm/lib/Analysis/CFGPrinter.cpp
@@ -325,8 +325,7 @@ bool DOTGraphTraits<DOTFuncInfo *>::isNodeHidden(const BasicBlock *Node,
return true;
}
if (HideUnreachablePaths || HideDeoptimizePaths) {
- if (isOnDeoptOrUnreachablePath.find(Node) ==
- isOnDeoptOrUnreachablePath.end())
+ if (!isOnDeoptOrUnreachablePath.contains(Node))
computeDeoptOrUnreachablePaths(Node->getParent());
return isOnDeoptOrUnreachablePath[Node];
}
diff --git a/llvm/lib/Analysis/DDG.cpp b/llvm/lib/Analysis/DDG.cpp
index da64ef1539602..30f8d317dcd00 100644
--- a/llvm/lib/Analysis/DDG.cpp
+++ b/llvm/lib/Analysis/DDG.cpp
@@ -241,7 +241,7 @@ bool DataDependenceGraph::addNode(DDGNode &N) {
}
const PiBlockDDGNode *DataDependenceGraph::getPiBlock(const NodeType &N) const {
- if (PiBlockMap.find(&N) == PiBlockMap.end())
+ if (!PiBlockMap.contains(&N))
return nullptr;
auto *Pi = PiBlockMap.find(&N)->second;
assert(PiBlockMap.find(Pi) == PiBlockMap.end() &&
diff --git a/llvm/lib/Analysis/DemandedBits.cpp b/llvm/lib/Analysis/DemandedBits.cpp
index e5d693a220d1e..35c5217fb8a5e 100644
--- a/llvm/lib/Analysis/DemandedBits.cpp
+++ b/llvm/lib/Analysis/DemandedBits.cpp
@@ -475,8 +475,7 @@ APInt DemandedBits::getDemandedBits(Use *U) {
bool DemandedBits::isInstructionDead(Instruction *I) {
performAnalysis();
- return !Visited.count(I) && AliveBits.find(I) == AliveBits.end() &&
- !isAlwaysLive(I);
+ return !Visited.count(I) && !AliveBits.contains(I) && !isAlwaysLive(I);
}
bool DemandedBits::isUseDead(Use *U) {
diff --git a/llvm/lib/Analysis/IRSimilarityIdentifier.cpp b/llvm/lib/Analysis/IRSimilarityIdentifier.cpp
index f471e32344cbc..a56539717ee08 100644
--- a/llvm/lib/Analysis/IRSimilarityIdentifier.cpp
+++ b/llvm/lib/Analysis/IRSimilarityIdentifier.cpp
@@ -439,7 +439,7 @@ IRSimilarityCandidate::IRSimilarityCandidate(unsigned StartIdx, unsigned Len,
// Map the operand values to an unsigned integer if it does not already
// have an unsigned integer assigned to it.
for (Value *Arg : ID->OperVals)
- if (ValueToNumber.find(Arg) == ValueToNumber.end()) {
+ if (!ValueToNumber.contains(Arg)) {
ValueToNumber.try_emplace(Arg, LocalValNumber);
NumberToValue.try_emplace(LocalValNumber, Arg);
LocalValNumber++;
@@ -447,7 +447,7 @@ IRSimilarityCandidate::IRSimilarityCandidate(unsigned StartIdx, unsigned Len,
// Mapping the instructions to an unsigned integer if it is not already
// exist in the mapping.
- if (ValueToNumber.find(ID->Inst) == ValueToNumber.end()) {
+ if (!ValueToNumber.contains(ID->Inst)) {
ValueToNumber.try_emplace(ID->Inst, LocalValNumber);
NumberToValue.try_emplace(LocalValNumber, ID->Inst);
LocalValNumber++;
@@ -464,7 +464,7 @@ IRSimilarityCandidate::IRSimilarityCandidate(unsigned StartIdx, unsigned Len,
DenseSet<BasicBlock *> BBSet;
getBasicBlocks(BBSet);
for (BasicBlock *BB : BBSet) {
- if (ValueToNumber.find(BB) != ValueToNumber.end())
+ if (ValueToNumber.contains(BB))
continue;
ValueToNumber.try_emplace(BB, LocalValNumber);
@@ -1026,7 +1026,7 @@ void IRSimilarityCandidate::createCanonicalRelationFrom(
// We can skip the BasicBlock if the canonical numbering has already been
// found in a separate instruction.
- if (NumberToCanonNum.find(BBGVNForCurrCand) != NumberToCanonNum.end())
+ if (NumberToCanonNum.contains(BBGVNForCurrCand))
continue;
// If the basic block is the starting block, then the shared instruction may
diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp
index f303670c72868..9a31633472d1a 100644
--- a/llvm/lib/Analysis/InlineCost.cpp
+++ b/llvm/lib/Analysis/InlineCost.cpp
@@ -493,7 +493,7 @@ class CallAnalyzer : public InstVisitor<CallAnalyzer, bool> {
InlineResult analyze();
std::optional<Constant *> getSimplifiedValue(Instruction *I) {
- if (SimplifiedValues.find(I) != SimplifiedValues.end())
+ if (SimplifiedValues.contains(I))
return SimplifiedValues[I];
return std::nullopt;
}
@@ -1054,7 +1054,7 @@ class InlineCostCallAnalyzer final : public CallAnalyzer {
void print(raw_ostream &OS);
std::optional<InstructionCostDetail> getCostDetails(const Instruction *I) {
- if (InstructionCostDetailMap.find(I) != InstructionCostDetailMap.end())
+ if (InstructionCostDetailMap.contains(I))
return InstructionCostDetailMap[I];
return std::nullopt;
}
diff --git a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
index 78e7f456ebc69..0ce72dae0c4b4 100644
--- a/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
+++ b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp
@@ -47,7 +47,7 @@ const Instruction *InstructionPrecedenceTracking::getFirstSpecialInstruction(
validate(BB);
#endif
- if (FirstSpecialInsts.find(BB) == FirstSpecialInsts.end()) {
+ if (!FirstSpecialInsts.contains(BB)) {
fill(BB);
assert(FirstSpecialInsts.find(BB) != FirstSpecialInsts.end() && "Must be!");
}
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index f9fa71219a40f..29fd9ffcfba83 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
@@ -6497,7 +6497,7 @@ ScalarEvolution::getRangeRefIter(const SCEV *S,
auto AddToWorklist = [&WorkList, &Seen, &Cache](const SCEV *Expr) {
if (!Seen.insert(Expr).second)
return;
- if (Cache.find(Expr) != Cache.end())
+ if (Cache.contains(Expr))
return;
switch (Expr->getSCEVType()) {
case scUnknown:
diff --git a/llvm/lib/Analysis/StackLifetime.cpp b/llvm/lib/Analysis/StackLifetime.cpp
index 46e1f132c8d2d..3e1b5dea6f6c2 100644
--- a/llvm/lib/Analysis/StackLifetime.cpp
+++ b/llvm/lib/Analysis/StackLifetime.cpp
@@ -39,7 +39,7 @@ StackLifetime::getLiveRange(const AllocaInst *AI) const {
}
bool StackLifetime::isReachable(const Instruction *I) const {
- return BlockInstRange.find(I->getParent()) != BlockInstRange.end();
+ return BlockInstRange.contains(I->getParent());
}
bool StackLifetime::isAliveAfter(const AllocaInst *AI,
More information about the llvm-commits
mailing list