shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Store OptTable::Info::Name as a StringRef

Browse Source 
This is a recommit of 8ae18303f97d5dcfaecc90b4d87effb2011ed82e,
with a few cleanups.

This avoids implicit conversion to StringRef at several points, which in
turns avoid redundant calls to strlen.

As a side effect, this greatly simplifies the implementation of
StrCmpOptionNameIgnoreCase.

It also eventually gives a consistent, humble speedup in compilation
time (timing updated since original commit).

https://llvm-compile-time-tracker.com/compare.php?from=76fcfea283472a80356d87c89270b0e2d106b54c&to=b70eb1f347f22fe4d2977360c4ed701eabc43994&stat=instructions:u

Differential Revision: https://reviews.llvm.org/D139274
This commit is contained in:
serge-sans-paille 2022-12-04 09:33:14 +01:00
parent 7d40baa82b
commit bdfa3100dc
No known key found for this signature in database
GPG Key ID: 7B24DA8C9551659F
6 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/ToolChains/Gnu.cpp
View File

@ -331,8 +331,8 @@ static bool getStaticPIE(const ArgList &Args, const ToolChain &TC) {
if (HasStaticPIE && Args.hasArg(options::OPT_nopie)) {
const Driver &D = TC.getDriver();
const llvm::opt::OptTable &Opts = D.getOpts();
const char *StaticPIEName = Opts.getOptionName(options::OPT_static_pie);
const char *NoPIEName = Opts.getOptionName(options::OPT_nopie);
StringRef StaticPIEName = Opts.getOptionName(options::OPT_static_pie);
StringRef NoPIEName = Opts.getOptionName(options::OPT_nopie);
D.Diag(diag::err_drv_cannot_mix_options) << StaticPIEName << NoPIEName;
}
return HasStaticPIE;

2
lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
View File

@ -1055,7 +1055,7 @@ void PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
// Only add the version-min options if we got a version from somewhere
if (!version.empty() && sdk_type != XcodeSDK::Type::Linux) {
#define OPTION(PREFIX, NAME, VAR, ...) \
const char *opt_##VAR = NAME; \
llvm::StringRef opt_##VAR = NAME; \
(void)opt_##VAR;
#include "clang/Driver/Options.inc"
#undef OPTION

8
llvm/include/llvm/Option/OptTable.h
View File

@ -44,7 +44,7 @@ public:
/// A null terminated array of prefix strings to apply to name while
/// matching.
const char *const *Prefixes;
const char *Name;
StringRef Name;
const char *HelpText;
const char *MetaVar;
unsigned ID;
@ -102,9 +102,7 @@ public:
const Option getOption(OptSpecifier Opt) const;
/// Lookup the name of the given option.
const char *getOptionName(OptSpecifier id) const {
return getInfo(id).Name;
}
StringRef getOptionName(OptSpecifier id) const { return getInfo(id).Name; }
/// Get the kind of the given option.
unsigned getOptionKind(OptSpecifier id) const {
@ -184,7 +182,7 @@ public:
/// takes
///
/// \return true in success, and false in fail.
bool addValues(const char *Option, const char *Values);
bool addValues(StringRef Option, const char *Values);
/// Parse a single argument; returning the new argument and
/// updating Index.

50
llvm/lib/Option/OptTable.cpp
View File

@ -36,31 +36,23 @@ namespace opt {
// Ordering on Info. The ordering is *almost* case-insensitive lexicographic,
// with an exception. '\0' comes at the end of the alphabet instead of the
// beginning (thus options precede any other options which prefix them).
static int StrCmpOptionNameIgnoreCase(const char *A, const char *B) {
const char *X = A, *Y = B;
char a = tolower(*A), b = tolower(*B);
while (a == b) {
if (a == '\0')
return 0;
static int StrCmpOptionNameIgnoreCase(StringRef A, StringRef B) {
size_t MinSize = std::min(A.size(), B.size());
if (int Res = A.substr(0, MinSize).compare_insensitive(B.substr(0, MinSize)))
return Res;
a = tolower(*++X);
b = tolower(*++Y);
}
if (A.size() == B.size())
return 0;
if (a == '\0') // A is a prefix of B.
return 1;
if (b == '\0') // B is a prefix of A.
return -1;
// Otherwise lexicographic.
return (a < b) ? -1 : 1;
return (A.size() == MinSize) ? 1 /* A is a prefix of B. */
: -1 /* B is a prefix of A */;
}
#ifndef NDEBUG
static int StrCmpOptionName(const char *A, const char *B) {
static int StrCmpOptionName(StringRef A, StringRef B) {
if (int N = StrCmpOptionNameIgnoreCase(A, B))
return N;
return strcmp(A, B);
return A.compare(B);
}
static inline bool operator<(const OptTable::Info &A, const OptTable::Info &B) {
@ -86,7 +78,7 @@ static inline bool operator<(const OptTable::Info &A, const OptTable::Info &B) {
#endif
// Support lower_bound between info and an option name.
static inline bool operator<(const OptTable::Info &I, const char *Name) {
static inline bool operator<(const OptTable::Info &I, StringRef Name) {
return StrCmpOptionNameIgnoreCase(I.Name, Name) < 0;
}
@ -186,7 +178,7 @@ static unsigned matchOption(const OptTable::Info *I, StringRef Str,
bool Matched = IgnoreCase ? Rest.startswith_insensitive(I->Name)
: Rest.startswith(I->Name);
if (Matched)
return Prefix.size() + StringRef(I->Name).size();
return Prefix.size() + I->Name.size();
}
}
return 0;
@ -321,7 +313,7 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString,
return BestDistance;
}
bool OptTable::addValues(const char *Option, const char *Values) {
bool OptTable::addValues(StringRef Option, const char *Values) {
for (size_t I = FirstSearchableIndex, E = OptionInfos.size(); I < E; I++) {
Info &In = OptionInfos[I];
if (optionMatches(In, Option)) {
@ -347,8 +339,8 @@ std::unique_ptr<Arg> OptTable::parseOneArgGrouped(InputArgList &Args,
const Info *End = OptionInfos.data() + OptionInfos.size();
StringRef Name = Str.ltrim(PrefixChars);
const Info *Start = std::lower_bound(
OptionInfos.data() + FirstSearchableIndex, End, Name.data());
const Info *Start =
std::lower_bound(OptionInfos.data() + FirstSearchableIndex, End, Name);
const Info *Fallback = nullptr;
unsigned Prev = Index;
@ -403,19 +395,19 @@ std::unique_ptr<Arg> OptTable::ParseOneArg(const ArgList &Args, unsigned &Index,
unsigned FlagsToInclude,
unsigned FlagsToExclude) const {
unsigned Prev = Index;
const char *Str = Args.getArgString(Index);
StringRef Str = Args.getArgString(Index);
// Anything that doesn't start with PrefixesUnion is an input, as is '-'
// itself.
if (isInput(PrefixesUnion, Str))
return std::make_unique<Arg>(getOption(InputOptionID), Str, Index++, Str);
return std::make_unique<Arg>(getOption(InputOptionID), Str, Index++, Str.data());
const Info *Start = OptionInfos.data() + FirstSearchableIndex;
const Info *End = OptionInfos.data() + OptionInfos.size();
StringRef Name = StringRef(Str).ltrim(PrefixChars);
StringRef Name = Str.ltrim(PrefixChars);
// Search for the first next option which could be a prefix.
Start = std::lower_bound(Start, End, Name.data());
Start = std::lower_bound(Start, End, Name);
// Options are stored in sorted order, with '\0' at the end of the
// alphabet. Since the only options which can accept a string must
@ -455,9 +447,9 @@ std::unique_ptr<Arg> OptTable::ParseOneArg(const ArgList &Args, unsigned &Index,
// If we failed to find an option and this arg started with /, then it's
// probably an input path.
if (Str[0] == '/')
return std::make_unique<Arg>(getOption(InputOptionID), Str, Index++, Str);
return std::make_unique<Arg>(getOption(InputOptionID), Str, Index++, Str.data());
return std::make_unique<Arg>(getOption(UnknownOptionID), Str, Index++, Str);
return std::make_unique<Arg>(getOption(UnknownOptionID), Str, Index++, Str.data());
}
InputArgList OptTable::ParseArgs(ArrayRef<const char *> ArgArr,

11
llvm/unittests/Option/OptionMarshallingTest.cpp
View File

@ -6,10 +6,11 @@
//
//===----------------------------------------------------------------------===//
#include "llvm/ADT/StringRef.h"
#include "gtest/gtest.h"
struct OptionWithMarshallingInfo {
const char *Name;
llvm::StringRef Name;
const char *KeyPath;
const char *ImpliedCheck;
const char *ImpliedValue;
@ -27,10 +28,10 @@ static const OptionWithMarshallingInfo MarshallingTable[] = {
};
TEST(OptionMarshalling, EmittedOrderSameAsDefinitionOrder) {
ASSERT_STREQ(MarshallingTable[0].Name, "marshalled-flag-d");
ASSERT_STREQ(MarshallingTable[1].Name, "marshalled-flag-c");
ASSERT_STREQ(MarshallingTable[2].Name, "marshalled-flag-b");
ASSERT_STREQ(MarshallingTable[3].Name, "marshalled-flag-a");
ASSERT_STREQ(MarshallingTable[0].Name.data(), "marshalled-flag-d");
ASSERT_STREQ(MarshallingTable[1].Name.data(), "marshalled-flag-c");
ASSERT_STREQ(MarshallingTable[2].Name.data(), "marshalled-flag-b");
ASSERT_STREQ(MarshallingTable[3].Name.data(), "marshalled-flag-a");
}
TEST(OptionMarshalling, EmittedSpecifiedKeyPath) {

4
llvm/utils/TableGen/OptParserEmitter.cpp
View File

@ -54,9 +54,9 @@ static std::string getOptionSpelling(const Record &R) {
static void emitNameUsingSpelling(raw_ostream &OS, const Record &R) {
size_t PrefixLength;
OS << "&";
OS << "llvm::StringRef(&";
write_cstring(OS, StringRef(getOptionSpelling(R, PrefixLength)));
OS << "[" << PrefixLength << "]";
OS << "[" << PrefixLength << "], " << R.getValueAsString("Name").size() << ")";
}
class MarshallingInfo {