maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Tablegen] Use llvm::is_contained (NFC)

This commit is contained in:
Kazu Hirata 2020-12-09 23:34:07 -08:00
parent 025d4faadb
commit e4a23a418b
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/utils/TableGen/CodeGenSchedule.cpp
View File

@ -950,9 +950,9 @@ void CodeGenSchedModels::collectSchedClasses() {
} }
// If ProcIndices contains zero, the class applies to all processors. // If ProcIndices contains zero, the class applies to all processors.
LLVM_DEBUG({ LLVM_DEBUG({
if (!std::count(ProcIndices.begin(), ProcIndices.end(), 0)) { if (!llvm::is_contained(ProcIndices, 0)) {
for (const CodeGenProcModel &PM : ProcModels) { for (const CodeGenProcModel &PM : ProcModels) {
if (!std::count(ProcIndices.begin(), ProcIndices.end(), PM.Index)) if (!llvm::is_contained(ProcIndices, PM.Index))
dbgs() << "No machine model for " << Inst->TheDef->getName() dbgs() << "No machine model for " << Inst->TheDef->getName()
<< " on processor " << PM.ModelName << '\n'; << " on processor " << PM.ModelName << '\n';
} }
@ -1248,7 +1248,7 @@ void CodeGenSchedModels::inferFromItinClass(Record *ItinClassDef,
bool HasMatch = false; bool HasMatch = false;
for (const Record *Rec : PM.ItinRWDefs) { for (const Record *Rec : PM.ItinRWDefs) {
RecVec Matched = Rec->getValueAsListOfDefs("MatchedItinClasses"); RecVec Matched = Rec->getValueAsListOfDefs("MatchedItinClasses");
if (!std::count(Matched.begin(), Matched.end(), ItinClassDef)) if (!llvm::is_contained(Matched, ItinClassDef))
continue; continue;
if (HasMatch) if (HasMatch)
PrintFatalError(Rec->getLoc(), "Duplicate itinerary class " PrintFatalError(Rec->getLoc(), "Duplicate itinerary class "
@ -1767,7 +1767,7 @@ void CodeGenSchedModels::inferFromRW(ArrayRef<unsigned> OperWrites,
LLVM_DEBUG(dbgs() << '\n'); LLVM_DEBUG(dbgs() << '\n');
LastTransitions = makePerProcessorTransitions( LastTransitions = makePerProcessorTransitions(
LastTransitions[0], llvm::count(ProcIndices, 0) LastTransitions[0], llvm::is_contained(ProcIndices, 0)
? ArrayRef<unsigned>(getAllProcIndices()) ? ArrayRef<unsigned>(getAllProcIndices())
: ProcIndices); : ProcIndices);
// Collect all PredTransitions for individual operands. // Collect all PredTransitions for individual operands.
@ -2046,7 +2046,7 @@ void CodeGenSchedModels::collectItinProcResources(Record *ItinClassDef) {
for (RecIter II = PM.ItinRWDefs.begin(), IE = PM.ItinRWDefs.end(); for (RecIter II = PM.ItinRWDefs.begin(), IE = PM.ItinRWDefs.end();
II != IE; ++II) { II != IE; ++II) {
RecVec Matched = (*II)->getValueAsListOfDefs("MatchedItinClasses"); RecVec Matched = (*II)->getValueAsListOfDefs("MatchedItinClasses");
if (!std::count(Matched.begin(), Matched.end(), ItinClassDef)) if (!llvm::is_contained(Matched, ItinClassDef))
continue; continue;
if (HasMatch) if (HasMatch)
PrintFatalError((*II)->getLoc(), "Duplicate itinerary class " PrintFatalError((*II)->getLoc(), "Duplicate itinerary class "

5
llvm/utils/TableGen/CodeGenTarget.cpp
View File

@ -356,10 +356,7 @@ CodeGenTarget::getSuperRegForSubReg(const ValueTypeByHwMode &ValueTy,
continue; continue;
// We have a class. Check if it supports this value type. // We have a class. Check if it supports this value type.
if (llvm::none_of(SubClassWithSubReg->VTs, if (!llvm::is_contained(SubClassWithSubReg->VTs, ValueTy))
[&ValueTy](const ValueTypeByHwMode &ClassVT) {
return ClassVT == ValueTy;
}))
continue; continue;
// We have a register class which supports both the value type and // We have a register class which supports both the value type and

5
llvm/utils/TableGen/RegisterBankEmitter.cpp
View File

@ -71,10 +71,7 @@ public:
/// Add a register class to the bank without duplicates. /// Add a register class to the bank without duplicates.
void addRegisterClass(const CodeGenRegisterClass *RC) { void addRegisterClass(const CodeGenRegisterClass *RC) {
if (std::find_if(RCs.begin(), RCs.end(), if (llvm::is_contained(RCs, RC))
[&RC](const CodeGenRegisterClass *X) {
return X == RC;
}) != RCs.end())
return; return;
// FIXME? We really want the register size rather than the spill size // FIXME? We really want the register size rather than the spill size