
This patch is the first step to extend the current multilib system to support the selection of library variants which do not correspond to existing command-line options. Proposal can be found in https://discourse.llvm.org/t/rfc-multilib-custom-flags/81058 The multilib mechanism supports libraries that target code generation or language options such as `--target`, `-mcpu`, `-mfpu`, `-mbranch-protection`. However, some library variants are particular to features that do not correspond to any command-line options. Examples include variants for multithreading and semihosting. This work introduces a way to instruct the multilib system to consider these features in library selection. This particular patch comprises a new section in `multilib.yaml` to declare flags for which no option exists. Henceforth this sort of flag will be called `custom flag` for clarity. The `multilib.yaml` file will have a new section called Flags which contains the declarations of the target’s custom flags: ```yaml Flags: - Name: multithreaded Values: - Name: no-multithreaded MacroDefines: [__SINGLE_THREAD__] - Name: multithreaded Default: no-multithreaded - Name: io Values: - Name: io-none - Name: io-semihosting MacroDefines: [SEMIHOSTING] - Name: io-linux-syscalls MacroDefines: [LINUX_SYSCALLS, HOSTED=1] Default: io-none ``` - Name: the name to categorize a flag. - Values: a list of possible values. - Default: it specifies which value this flag should take if not specified in the command-line invocation. It must be one value from the Values field. Each flag Value follows this description: - Name (required): the name of the custom flag value (string). This is the string to be used in `-fmultilib-flag=<string>`. - MacroDefines (optional): a list of strings to be used as macro definitions. Each string is fed into the driver as ``-D<string>``. A Default value is useful to save users from specifying custom flags that have a most commonly used value. The namespace of flag values is common across all flags. This means that flag values must be unique.
395 lines
13 KiB
C++
395 lines
13 KiB
C++
//===- Multilib.cpp - Multilib Implementation -----------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "clang/Driver/Multilib.h"
|
|
#include "clang/Basic/LLVM.h"
|
|
#include "clang/Driver/Driver.h"
|
|
#include "llvm/ADT/DenseSet.h"
|
|
#include "llvm/ADT/SmallSet.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/Compiler.h"
|
|
#include "llvm/Support/ErrorHandling.h"
|
|
#include "llvm/Support/Regex.h"
|
|
#include "llvm/Support/VersionTuple.h"
|
|
#include "llvm/Support/YAMLParser.h"
|
|
#include "llvm/Support/YAMLTraits.h"
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
#include <cassert>
|
|
#include <string>
|
|
|
|
using namespace clang;
|
|
using namespace driver;
|
|
using namespace llvm::sys;
|
|
|
|
Multilib::Multilib(StringRef GCCSuffix, StringRef OSSuffix,
|
|
StringRef IncludeSuffix, const flags_list &Flags,
|
|
StringRef ExclusiveGroup, std::optional<StringRef> Error)
|
|
: GCCSuffix(GCCSuffix), OSSuffix(OSSuffix), IncludeSuffix(IncludeSuffix),
|
|
Flags(Flags), ExclusiveGroup(ExclusiveGroup), Error(Error) {
|
|
assert(GCCSuffix.empty() ||
|
|
(StringRef(GCCSuffix).front() == '/' && GCCSuffix.size() > 1));
|
|
assert(OSSuffix.empty() ||
|
|
(StringRef(OSSuffix).front() == '/' && OSSuffix.size() > 1));
|
|
assert(IncludeSuffix.empty() ||
|
|
(StringRef(IncludeSuffix).front() == '/' && IncludeSuffix.size() > 1));
|
|
}
|
|
|
|
LLVM_DUMP_METHOD void Multilib::dump() const {
|
|
print(llvm::errs());
|
|
}
|
|
|
|
void Multilib::print(raw_ostream &OS) const {
|
|
if (GCCSuffix.empty())
|
|
OS << ".";
|
|
else {
|
|
OS << StringRef(GCCSuffix).drop_front();
|
|
}
|
|
OS << ";";
|
|
for (StringRef Flag : Flags) {
|
|
if (Flag.front() == '-')
|
|
OS << "@" << Flag.substr(1);
|
|
}
|
|
}
|
|
|
|
bool Multilib::operator==(const Multilib &Other) const {
|
|
// Check whether the flags sets match
|
|
// allowing for the match to be order invariant
|
|
llvm::StringSet<> MyFlags;
|
|
for (const auto &Flag : Flags)
|
|
MyFlags.insert(Flag);
|
|
|
|
for (const auto &Flag : Other.Flags)
|
|
if (!MyFlags.contains(Flag))
|
|
return false;
|
|
|
|
if (osSuffix() != Other.osSuffix())
|
|
return false;
|
|
|
|
if (gccSuffix() != Other.gccSuffix())
|
|
return false;
|
|
|
|
if (includeSuffix() != Other.includeSuffix())
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
raw_ostream &clang::driver::operator<<(raw_ostream &OS, const Multilib &M) {
|
|
M.print(OS);
|
|
return OS;
|
|
}
|
|
|
|
MultilibSet &MultilibSet::FilterOut(FilterCallback F) {
|
|
llvm::erase_if(Multilibs, F);
|
|
return *this;
|
|
}
|
|
|
|
void MultilibSet::push_back(const Multilib &M) { Multilibs.push_back(M); }
|
|
|
|
bool MultilibSet::select(const Driver &D, const Multilib::flags_list &Flags,
|
|
llvm::SmallVectorImpl<Multilib> &Selected) const {
|
|
llvm::StringSet<> FlagSet(expandFlags(Flags));
|
|
Selected.clear();
|
|
bool AnyErrors = false;
|
|
|
|
// Decide which multilibs we're going to select at all.
|
|
llvm::DenseSet<StringRef> ExclusiveGroupsSelected;
|
|
for (const Multilib &M : llvm::reverse(Multilibs)) {
|
|
// If this multilib doesn't match all our flags, don't select it.
|
|
if (!llvm::all_of(M.flags(), [&FlagSet](const std::string &F) {
|
|
return FlagSet.contains(F);
|
|
}))
|
|
continue;
|
|
|
|
const std::string &group = M.exclusiveGroup();
|
|
if (!group.empty()) {
|
|
// If this multilib has the same ExclusiveGroup as one we've already
|
|
// selected, skip it. We're iterating in reverse order, so the group
|
|
// member we've selected already is preferred.
|
|
//
|
|
// Otherwise, add the group name to the set of groups we've already
|
|
// selected a member of.
|
|
auto [It, Inserted] = ExclusiveGroupsSelected.insert(group);
|
|
if (!Inserted)
|
|
continue;
|
|
}
|
|
|
|
// If this multilib is actually a placeholder containing an error message
|
|
// written by the multilib.yaml author, then set a flag that will cause a
|
|
// failure return. Our caller will display the error message.
|
|
if (M.isError())
|
|
AnyErrors = true;
|
|
|
|
// Select this multilib.
|
|
Selected.push_back(M);
|
|
}
|
|
|
|
// We iterated in reverse order, so now put Selected back the right way
|
|
// round.
|
|
std::reverse(Selected.begin(), Selected.end());
|
|
|
|
return !AnyErrors && !Selected.empty();
|
|
}
|
|
|
|
llvm::StringSet<>
|
|
MultilibSet::expandFlags(const Multilib::flags_list &InFlags) const {
|
|
llvm::StringSet<> Result;
|
|
for (const auto &F : InFlags)
|
|
Result.insert(F);
|
|
for (const FlagMatcher &M : FlagMatchers) {
|
|
std::string RegexString(M.Match);
|
|
|
|
// Make the regular expression match the whole string.
|
|
if (!StringRef(M.Match).starts_with("^"))
|
|
RegexString.insert(RegexString.begin(), '^');
|
|
if (!StringRef(M.Match).ends_with("$"))
|
|
RegexString.push_back('$');
|
|
|
|
const llvm::Regex Regex(RegexString);
|
|
assert(Regex.isValid());
|
|
if (llvm::any_of(InFlags,
|
|
[&Regex](StringRef F) { return Regex.match(F); })) {
|
|
Result.insert(M.Flags.begin(), M.Flags.end());
|
|
}
|
|
}
|
|
return Result;
|
|
}
|
|
|
|
namespace {
|
|
|
|
// When updating this also update MULTILIB_VERSION in MultilibTest.cpp
|
|
static const VersionTuple MultilibVersionCurrent(1, 0);
|
|
|
|
struct MultilibSerialization {
|
|
std::string Dir; // if this record successfully selects a library dir
|
|
std::string Error; // if this record reports a fatal error message
|
|
std::vector<std::string> Flags;
|
|
std::string Group;
|
|
};
|
|
|
|
enum class MultilibGroupType {
|
|
/*
|
|
* The only group type currently supported is 'Exclusive', which indicates a
|
|
* group of multilibs of which at most one may be selected.
|
|
*/
|
|
Exclusive,
|
|
|
|
/*
|
|
* Future possibility: a second group type indicating a set of library
|
|
* directories that are mutually _dependent_ rather than mutually exclusive:
|
|
* if you include one you must include them all.
|
|
*
|
|
* It might also be useful to allow groups to be members of other groups, so
|
|
* that a mutually exclusive group could contain a mutually dependent set of
|
|
* library directories, or vice versa.
|
|
*
|
|
* These additional features would need changes in the implementation, but
|
|
* the YAML schema is set up so they can be added without requiring changes
|
|
* in existing users' multilib.yaml files.
|
|
*/
|
|
};
|
|
|
|
struct MultilibGroupSerialization {
|
|
std::string Name;
|
|
MultilibGroupType Type;
|
|
};
|
|
|
|
struct MultilibSetSerialization {
|
|
llvm::VersionTuple MultilibVersion;
|
|
SmallVector<MultilibGroupSerialization> Groups;
|
|
SmallVector<MultilibSerialization> Multilibs;
|
|
SmallVector<MultilibSet::FlagMatcher> FlagMatchers;
|
|
SmallVector<custom_flag::DeclarationPtr> CustomFlagDeclarations;
|
|
};
|
|
|
|
} // end anonymous namespace
|
|
|
|
LLVM_YAML_IS_SEQUENCE_VECTOR(MultilibSerialization)
|
|
LLVM_YAML_IS_SEQUENCE_VECTOR(MultilibGroupSerialization)
|
|
LLVM_YAML_IS_SEQUENCE_VECTOR(MultilibSet::FlagMatcher)
|
|
LLVM_YAML_IS_SEQUENCE_VECTOR(custom_flag::ValueDetail)
|
|
LLVM_YAML_IS_SEQUENCE_VECTOR(custom_flag::DeclarationPtr)
|
|
|
|
template <> struct llvm::yaml::MappingTraits<MultilibSerialization> {
|
|
static void mapping(llvm::yaml::IO &io, MultilibSerialization &V) {
|
|
io.mapOptional("Dir", V.Dir);
|
|
io.mapOptional("Error", V.Error);
|
|
io.mapRequired("Flags", V.Flags);
|
|
io.mapOptional("Group", V.Group);
|
|
}
|
|
static std::string validate(IO &io, MultilibSerialization &V) {
|
|
if (V.Dir.empty() && V.Error.empty())
|
|
return "one of the 'Dir' and 'Error' keys must be specified";
|
|
if (!V.Dir.empty() && !V.Error.empty())
|
|
return "the 'Dir' and 'Error' keys may not both be specified";
|
|
if (StringRef(V.Dir).starts_with("/"))
|
|
return "paths must be relative but \"" + V.Dir + "\" starts with \"/\"";
|
|
return std::string{};
|
|
}
|
|
};
|
|
|
|
template <> struct llvm::yaml::ScalarEnumerationTraits<MultilibGroupType> {
|
|
static void enumeration(IO &io, MultilibGroupType &Val) {
|
|
io.enumCase(Val, "Exclusive", MultilibGroupType::Exclusive);
|
|
}
|
|
};
|
|
|
|
template <> struct llvm::yaml::MappingTraits<MultilibGroupSerialization> {
|
|
static void mapping(llvm::yaml::IO &io, MultilibGroupSerialization &V) {
|
|
io.mapRequired("Name", V.Name);
|
|
io.mapRequired("Type", V.Type);
|
|
}
|
|
};
|
|
|
|
template <> struct llvm::yaml::MappingTraits<MultilibSet::FlagMatcher> {
|
|
static void mapping(llvm::yaml::IO &io, MultilibSet::FlagMatcher &M) {
|
|
io.mapRequired("Match", M.Match);
|
|
io.mapRequired("Flags", M.Flags);
|
|
}
|
|
static std::string validate(IO &io, MultilibSet::FlagMatcher &M) {
|
|
llvm::Regex Regex(M.Match);
|
|
std::string RegexError;
|
|
if (!Regex.isValid(RegexError))
|
|
return RegexError;
|
|
if (M.Flags.empty())
|
|
return "value required for 'Flags'";
|
|
return std::string{};
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct llvm::yaml::MappingContextTraits<custom_flag::ValueDetail,
|
|
llvm::SmallSet<std::string, 32>> {
|
|
static void mapping(llvm::yaml::IO &io, custom_flag::ValueDetail &V,
|
|
llvm::SmallSet<std::string, 32> &) {
|
|
io.mapRequired("Name", V.Name);
|
|
io.mapOptional("MacroDefines", V.MacroDefines);
|
|
}
|
|
static std::string validate(IO &io, custom_flag::ValueDetail &V,
|
|
llvm::SmallSet<std::string, 32> &NameSet) {
|
|
if (V.Name.empty())
|
|
return "custom flag value requires a name";
|
|
if (!NameSet.insert(V.Name).second)
|
|
return "duplicate custom flag value name: \"" + V.Name + "\"";
|
|
return {};
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct llvm::yaml::MappingContextTraits<custom_flag::DeclarationPtr,
|
|
llvm::SmallSet<std::string, 32>> {
|
|
static void mapping(llvm::yaml::IO &io, custom_flag::DeclarationPtr &V,
|
|
llvm::SmallSet<std::string, 32> &NameSet) {
|
|
assert(!V);
|
|
V = std::make_shared<custom_flag::Declaration>();
|
|
io.mapRequired("Name", V->Name);
|
|
io.mapRequired("Values", V->ValueList, NameSet);
|
|
std::string DefaultValueName;
|
|
io.mapRequired("Default", DefaultValueName);
|
|
|
|
for (auto [Idx, Value] : llvm::enumerate(V->ValueList)) {
|
|
Value.Decl = V;
|
|
if (Value.Name == DefaultValueName) {
|
|
assert(!V->DefaultValueIdx);
|
|
V->DefaultValueIdx = Idx;
|
|
}
|
|
}
|
|
}
|
|
static std::string validate(IO &io, custom_flag::DeclarationPtr &V,
|
|
llvm::SmallSet<std::string, 32> &) {
|
|
if (V->Name.empty())
|
|
return "custom flag requires a name";
|
|
if (V->ValueList.empty())
|
|
return "custom flag must have at least one value";
|
|
if (!V->DefaultValueIdx)
|
|
return "custom flag must have a default value";
|
|
return {};
|
|
}
|
|
};
|
|
|
|
template <> struct llvm::yaml::MappingTraits<MultilibSetSerialization> {
|
|
static void mapping(llvm::yaml::IO &io, MultilibSetSerialization &M) {
|
|
io.mapRequired("MultilibVersion", M.MultilibVersion);
|
|
io.mapRequired("Variants", M.Multilibs);
|
|
io.mapOptional("Groups", M.Groups);
|
|
llvm::SmallSet<std::string, 32> NameSet;
|
|
io.mapOptionalWithContext("Flags", M.CustomFlagDeclarations, NameSet);
|
|
io.mapOptional("Mappings", M.FlagMatchers);
|
|
}
|
|
static std::string validate(IO &io, MultilibSetSerialization &M) {
|
|
if (M.MultilibVersion.empty())
|
|
return "missing required key 'MultilibVersion'";
|
|
if (M.MultilibVersion.getMajor() != MultilibVersionCurrent.getMajor())
|
|
return "multilib version " + M.MultilibVersion.getAsString() +
|
|
" is unsupported";
|
|
if (M.MultilibVersion.getMinor() > MultilibVersionCurrent.getMinor())
|
|
return "multilib version " + M.MultilibVersion.getAsString() +
|
|
" is unsupported";
|
|
for (const MultilibSerialization &Lib : M.Multilibs) {
|
|
if (!Lib.Group.empty()) {
|
|
bool Found = false;
|
|
for (const MultilibGroupSerialization &Group : M.Groups)
|
|
if (Group.Name == Lib.Group) {
|
|
Found = true;
|
|
break;
|
|
}
|
|
if (!Found)
|
|
return "multilib \"" + Lib.Dir +
|
|
"\" specifies undefined group name \"" + Lib.Group + "\"";
|
|
}
|
|
}
|
|
return std::string{};
|
|
}
|
|
};
|
|
|
|
llvm::ErrorOr<MultilibSet>
|
|
MultilibSet::parseYaml(llvm::MemoryBufferRef Input,
|
|
llvm::SourceMgr::DiagHandlerTy DiagHandler,
|
|
void *DiagHandlerCtxt) {
|
|
MultilibSetSerialization MS;
|
|
llvm::yaml::Input YamlInput(Input, nullptr, DiagHandler, DiagHandlerCtxt);
|
|
YamlInput >> MS;
|
|
if (YamlInput.error())
|
|
return YamlInput.error();
|
|
|
|
multilib_list Multilibs;
|
|
Multilibs.reserve(MS.Multilibs.size());
|
|
for (const auto &M : MS.Multilibs) {
|
|
if (!M.Error.empty()) {
|
|
Multilibs.emplace_back("", "", "", M.Flags, M.Group, M.Error);
|
|
} else {
|
|
std::string Dir;
|
|
if (M.Dir != ".")
|
|
Dir = "/" + M.Dir;
|
|
// We transfer M.Group straight into the ExclusiveGroup parameter for the
|
|
// Multilib constructor. If we later support more than one type of group,
|
|
// we'll have to look up the group name in MS.Groups, check its type, and
|
|
// decide what to do here.
|
|
Multilibs.emplace_back(Dir, Dir, Dir, M.Flags, M.Group);
|
|
}
|
|
}
|
|
|
|
return MultilibSet(std::move(Multilibs), std::move(MS.FlagMatchers),
|
|
std::move(MS.CustomFlagDeclarations));
|
|
}
|
|
|
|
LLVM_DUMP_METHOD void MultilibSet::dump() const {
|
|
print(llvm::errs());
|
|
}
|
|
|
|
void MultilibSet::print(raw_ostream &OS) const {
|
|
for (const auto &M : *this)
|
|
OS << M << "\n";
|
|
}
|
|
|
|
raw_ostream &clang::driver::operator<<(raw_ostream &OS, const MultilibSet &MS) {
|
|
MS.print(OS);
|
|
return OS;
|
|
}
|