[llvm] Use llvm::find_if (NFC)

This commit is contained in:
Kazu Hirata 2022-08-28 10:41:48 -07:00
parent 21dceb3ca6
commit ce9f007c7c
10 changed files with 29 additions and 33 deletions

View File

@ -549,9 +549,9 @@ public:
/// Return the MCAOperand which corresponds to index Idx within the original
/// MCInst.
const MCAOperand *getOperand(const unsigned Idx) const {
auto It = std::find_if(
Operands.begin(), Operands.end(),
[&Idx](const MCAOperand &Op) { return Op.getIndex() == Idx; });
auto It = llvm::find_if(Operands, [&Idx](const MCAOperand &Op) {
return Op.getIndex() == Idx;
});
if (It == Operands.end())
return nullptr;
return &(*It);

View File

@ -2456,11 +2456,10 @@ void LoopAccessInfo::emitUnsafeDependenceRemark() {
auto Deps = getDepChecker().getDependences();
if (!Deps)
return;
auto Found = std::find_if(
Deps->begin(), Deps->end(), [](const MemoryDepChecker::Dependence &D) {
return MemoryDepChecker::Dependence::isSafeForVectorization(D.Type) !=
MemoryDepChecker::VectorizationSafetyStatus::Safe;
});
auto Found = llvm::find_if(*Deps, [](const MemoryDepChecker::Dependence &D) {
return MemoryDepChecker::Dependence::isSafeForVectorization(D.Type) !=
MemoryDepChecker::VectorizationSafetyStatus::Safe;
});
if (Found == Deps->end())
return;
MemoryDepChecker::Dependence Dep = *Found;

View File

@ -323,10 +323,9 @@ void PipelineSolver::reset() {
for (auto &SG : SyncPipeline) {
SmallVector<SUnit *, 32> TempCollection = SG.Collection;
SG.Collection.clear();
auto SchedBarr = std::find_if(
TempCollection.begin(), TempCollection.end(), [](SUnit *SU) {
return SU->getInstr()->getOpcode() == AMDGPU::SCHED_GROUP_BARRIER;
});
auto SchedBarr = llvm::find_if(TempCollection, [](SUnit *SU) {
return SU->getInstr()->getOpcode() == AMDGPU::SCHED_GROUP_BARRIER;
});
if (SchedBarr != TempCollection.end())
SG.Collection.push_back(*SchedBarr);
}
@ -428,9 +427,8 @@ void PipelineSolver::removeEdges(
SUnit *Pred = PredSuccPair.first;
SUnit *Succ = PredSuccPair.second;
auto Match =
std::find_if(Succ->Preds.begin(), Succ->Preds.end(),
[&Pred](SDep &P) { return P.getSUnit() == Pred; });
auto Match = llvm::find_if(
Succ->Preds, [&Pred](SDep &P) { return P.getSUnit() == Pred; });
if (Match != Succ->Preds.end()) {
assert(Match->isArtificial());
Succ->removePred(*Match);

View File

@ -25,8 +25,8 @@ static bool isCOFFGOTSection(Section &S) { return S.getName() == "$__GOT"; }
static bool isCOFFStubsSection(Section &S) { return S.getName() == "$__STUBS"; }
static Expected<Edge &> getFirstRelocationEdge(LinkGraph &G, Block &B) {
auto EItr = std::find_if(B.edges().begin(), B.edges().end(),
[](Edge &E) { return E.isRelocation(); });
auto EItr =
llvm::find_if(B.edges(), [](Edge &E) { return E.isRelocation(); });
if (EItr == B.edges().end())
return make_error<StringError>("GOT entry in " + G.getName() + ", \"" +
B.getSection().getName() +

View File

@ -25,8 +25,8 @@ static bool isELFGOTSection(Section &S) { return S.getName() == "$__GOT"; }
static bool isELFStubsSection(Section &S) { return S.getName() == "$__STUBS"; }
static Expected<Edge &> getFirstRelocationEdge(LinkGraph &G, Block &B) {
auto EItr = std::find_if(B.edges().begin(), B.edges().end(),
[](Edge &E) { return E.isRelocation(); });
auto EItr =
llvm::find_if(B.edges(), [](Edge &E) { return E.isRelocation(); });
if (EItr == B.edges().end())
return make_error<StringError>("GOT entry in " + G.getName() + ", \"" +
B.getSection().getName() +

View File

@ -27,8 +27,8 @@ static bool isMachOStubsSection(Section &S) {
}
static Expected<Edge &> getFirstRelocationEdge(LinkGraph &G, Block &B) {
auto EItr = std::find_if(B.edges().begin(), B.edges().end(),
[](Edge &E) { return E.isRelocation(); });
auto EItr =
llvm::find_if(B.edges(), [](Edge &E) { return E.isRelocation(); });
if (EItr == B.edges().end())
return make_error<StringError>("GOT entry in " + G.getName() + ", \"" +
B.getSection().getName() +

View File

@ -559,8 +559,7 @@ objcopy::parseObjcopyOptions(ArrayRef<const char *> RawArgsArr,
ObjcopyOptTable T;
const char *const *DashDash =
std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
[](StringRef Str) { return Str == "--"; });
llvm::find_if(RawArgsArr, [](StringRef Str) { return Str == "--"; });
ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
if (DashDash != RawArgsArr.end())
DashDash = std::next(DashDash);
@ -1220,8 +1219,7 @@ Expected<DriverConfig>
objcopy::parseStripOptions(ArrayRef<const char *> RawArgsArr,
function_ref<Error(Error)> ErrorCallback) {
const char *const *DashDash =
std::find_if(RawArgsArr.begin(), RawArgsArr.end(),
[](StringRef Str) { return Str == "--"; });
llvm::find_if(RawArgsArr, [](StringRef Str) { return Str == "--"; });
ArrayRef<const char *> ArgsArr = makeArrayRef(RawArgsArr.begin(), DashDash);
if (DashDash != RawArgsArr.end())
DashDash = std::next(DashDash);

View File

@ -201,10 +201,10 @@ bool LatencyAccountant::accountRecord(const XRayRecord &Record) {
// Look for the parent up the stack.
auto Parent =
std::find_if(ThreadStack.Stack.rbegin(), ThreadStack.Stack.rend(),
[&](const std::pair<const int32_t, uint64_t> &E) {
return E.first == Record.FuncId;
});
llvm::find_if(llvm::reverse(ThreadStack.Stack),
[&](const std::pair<const int32_t, uint64_t> &E) {
return E.first == Record.FuncId;
});
if (Parent == ThreadStack.Stack.rend())
return false;

View File

@ -595,8 +595,9 @@ struct MatchableInfo {
/// findAsmOperandNamed - Find the first AsmOperand with the specified name.
/// This does not check the suboperand index.
int findAsmOperandNamed(StringRef N, int LastIdx = -1) const {
auto I = std::find_if(AsmOperands.begin() + LastIdx + 1, AsmOperands.end(),
[&](const AsmOperand &Op) { return Op.SrcOpName == N; });
auto I =
llvm::find_if(llvm::drop_begin(AsmOperands, LastIdx + 1),
[&](const AsmOperand &Op) { return Op.SrcOpName == N; });
return (I != AsmOperands.end()) ? I - AsmOperands.begin() : -1;
}

View File

@ -97,8 +97,8 @@ public:
Node *N = Root.get();
for (auto Ch : Name) {
std::string Label(1, Ch);
auto It = std::find_if(N->Children.begin(), N->Children.end(),
[&](const auto &C) { return C->Name == Label; });
auto It = llvm::find_if(N->Children,
[&](const auto &C) { return C->Name == Label; });
if (It == N->Children.end()) {
It = N->Children.insert(It, std::make_unique<Node>(Label, N));
}