[llvm] 4e3eebc - [tools, utils] Use StringRef::contains (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 22 17:22:28 PDT 2021
Author: Kazu Hirata
Date: 2021-10-22T17:22:13-07:00
New Revision: 4e3eebc6bd326441c11f5ecd71284d42157c302d
URL: https://github.com/llvm/llvm-project/commit/4e3eebc6bd326441c11f5ecd71284d42157c302d
DIFF: https://github.com/llvm/llvm-project/commit/4e3eebc6bd326441c11f5ecd71284d42157c302d.diff
LOG: [tools, utils] Use StringRef::contains (NFC)
Added:
Modified:
llvm/tools/llvm-cov/CoverageFilters.cpp
llvm/tools/llvm-profdata/llvm-profdata.cpp
llvm/tools/llvm-profgen/PerfReader.cpp
llvm/tools/llvm-profgen/ProfileGenerator.cpp
llvm/utils/TableGen/AsmMatcherEmitter.cpp
llvm/utils/TableGen/X86FoldTablesEmitter.cpp
llvm/utils/TableGen/X86RecognizableInstr.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-cov/CoverageFilters.cpp b/llvm/tools/llvm-cov/CoverageFilters.cpp
index da3b5214eec4c..fac7518d7da29 100644
--- a/llvm/tools/llvm-cov/CoverageFilters.cpp
+++ b/llvm/tools/llvm-cov/CoverageFilters.cpp
@@ -21,7 +21,7 @@ bool NameCoverageFilter::matches(
const coverage::CoverageMapping &,
const coverage::FunctionRecord &Function) const {
StringRef FuncName = Function.Name;
- return FuncName.find(Name) != StringRef::npos;
+ return FuncName.contains(Name);
}
bool NameRegexCoverageFilter::matches(
diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp
index 7d53b05457db3..8994b566862b1 100644
--- a/llvm/tools/llvm-profdata/llvm-profdata.cpp
+++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp
@@ -836,7 +836,7 @@ static void parseInputFilenamesFile(MemoryBuffer *Buffer,
if (SanitizedEntry.startswith("#"))
continue;
// If there's no comma, it's an unweighted profile.
- else if (SanitizedEntry.find(',') == StringRef::npos)
+ else if (!SanitizedEntry.contains(','))
addWeightedInput(WFV, {std::string(SanitizedEntry), 1});
else
addWeightedInput(WFV, parseWeightedFile(SanitizedEntry));
@@ -2108,9 +2108,8 @@ static int showInstrProfile(const std::string &Filename, bool ShowCounts,
if (FuncIsCS != ShowCS)
continue;
}
- bool Show =
- ShowAllFunctions || (!ShowFunction.empty() &&
- Func.Name.find(ShowFunction) != Func.Name.npos);
+ bool Show = ShowAllFunctions ||
+ (!ShowFunction.empty() && Func.Name.contains(ShowFunction));
bool doTextFormatDump = (Show && TextFormat);
diff --git a/llvm/tools/llvm-profgen/PerfReader.cpp b/llvm/tools/llvm-profgen/PerfReader.cpp
index 3ed696646c4b5..8224c085d6071 100644
--- a/llvm/tools/llvm-profgen/PerfReader.cpp
+++ b/llvm/tools/llvm-profgen/PerfReader.cpp
@@ -449,7 +449,7 @@ bool PerfReaderBase::extractLBRStack(TraceStream &TraceIt,
// Skip the leading instruction pointer.
size_t Index = 0;
uint64_t LeadingAddr;
- if (!Records.empty() && Records[0].find('/') == StringRef::npos) {
+ if (!Records.empty() && !Records[0].contains('/')) {
if (Records[0].getAsInteger(16, LeadingAddr)) {
WarnInvalidLBR(TraceIt);
TraceIt.advance();
@@ -862,7 +862,7 @@ bool PerfReaderBase::isLBRSample(StringRef Line) {
Line.trim().split(Records, " ", 2, false);
if (Records.size() < 2)
return false;
- if (Records[1].startswith("0x") && Records[1].find('/') != StringRef::npos)
+ if (Records[1].startswith("0x") && Records[1].contains('/'))
return true;
return false;
}
@@ -877,7 +877,7 @@ bool PerfReaderBase::isMMap2Event(StringRef Line) {
// PERF_RECORD_MMAP2 does not appear at the beginning of the line
// for ` perf script --show-mmap-events -i ...`
- return Line.find("PERF_RECORD_MMAP2") != StringRef::npos;
+ return Line.contains("PERF_RECORD_MMAP2");
}
// The raw hybird sample is like
diff --git a/llvm/tools/llvm-profgen/ProfileGenerator.cpp b/llvm/tools/llvm-profgen/ProfileGenerator.cpp
index e98554aa67136..6b0a64cf23afb 100644
--- a/llvm/tools/llvm-profgen/ProfileGenerator.cpp
+++ b/llvm/tools/llvm-profgen/ProfileGenerator.cpp
@@ -403,8 +403,7 @@ void ProfileGenerator::populateBodySamplesForAllFunctions(
static bool isOutlinedFunction(StringRef CalleeName) {
// Check whether it's from hot-cold func split or coro split.
- return CalleeName.find(".resume") != StringRef::npos ||
- CalleeName.find(".cold") != StringRef::npos;
+ return CalleeName.contains(".resume") || CalleeName.contains(".cold");
}
StringRef ProfileGeneratorBase::getCalleeNameForOffset(uint64_t TargetOffset) {
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index d7b0c6db3e1f0..9c1d1a4b64aad 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -1071,7 +1071,7 @@ bool MatchableInfo::validate(StringRef CommentDelimiter, bool IsAlias) const {
// Remove comments from the asm string. We know that the asmstring only
// has one line.
if (!CommentDelimiter.empty() &&
- StringRef(AsmString).find(CommentDelimiter) != StringRef::npos)
+ StringRef(AsmString).contains(CommentDelimiter))
PrintFatalError(TheDef->getLoc(),
"asmstring for instruction has comment character in it, "
"mark it isCodeGenOnly");
@@ -1086,7 +1086,7 @@ bool MatchableInfo::validate(StringRef CommentDelimiter, bool IsAlias) const {
std::set<std::string> OperandNames;
for (const AsmOperand &Op : AsmOperands) {
StringRef Tok = Op.Token;
- if (Tok[0] == '$' && Tok.find(':') != StringRef::npos)
+ if (Tok[0] == '$' && Tok.contains(':'))
PrintFatalError(TheDef->getLoc(),
"matchable with operand modifier '" + Tok +
"' not supported by asm matcher. Mark isCodeGenOnly!");
diff --git a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
index 85d9262151134..0a8d0750cf13f 100644
--- a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
+++ b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
@@ -79,13 +79,13 @@ const ManualMapEntry ManualMapSet[] = {
static bool isExplicitAlign(const CodeGenInstruction *Inst) {
return any_of(ExplicitAlign, [Inst](const char *InstStr) {
- return Inst->TheDef->getName().find(InstStr) != StringRef::npos;
+ return Inst->TheDef->getName().contains(InstStr);
});
}
static bool isExplicitUnalign(const CodeGenInstruction *Inst) {
return any_of(ExplicitUnalign, [Inst](const char *InstStr) {
- return Inst->TheDef->getName().find(InstStr) != StringRef::npos;
+ return Inst->TheDef->getName().contains(InstStr);
});
}
@@ -278,7 +278,7 @@ static inline bool hasMemoryFormat(const Record *Inst) {
}
static inline bool isNOREXRegClass(const Record *Op) {
- return Op->getName().find("_NOREX") != StringRef::npos;
+ return Op->getName().contains("_NOREX");
}
static inline bool isRegisterOperand(const Record *Rec) {
diff --git a/llvm/utils/TableGen/X86RecognizableInstr.cpp b/llvm/utils/TableGen/X86RecognizableInstr.cpp
index 1a918c03aa6b2..a9b3841559654 100644
--- a/llvm/utils/TableGen/X86RecognizableInstr.cpp
+++ b/llvm/utils/TableGen/X86RecognizableInstr.cpp
@@ -109,12 +109,12 @@ RecognizableInstr::RecognizableInstr(DisassemblerTables &tables,
// FIXME: Is there some better way to check for In64BitMode?
std::vector<Record*> Predicates = Rec->getValueAsListOfDefs("Predicates");
for (unsigned i = 0, e = Predicates.size(); i != e; ++i) {
- if (Predicates[i]->getName().find("Not64Bit") != Name.npos ||
- Predicates[i]->getName().find("In32Bit") != Name.npos) {
+ if (Predicates[i]->getName().contains("Not64Bit") ||
+ Predicates[i]->getName().contains("In32Bit")) {
Is32Bit = true;
break;
}
- if (Predicates[i]->getName().find("In64Bit") != Name.npos) {
+ if (Predicates[i]->getName().contains("In64Bit")) {
Is64Bit = true;
break;
}
More information about the llvm-commits
mailing list