dtcxzyw created this revision.
dtcxzyw added reviewers: MaskRay, jrtc27, kito-cheng, craig.topper.
dtcxzyw added projects: lld, clang.
Herald added subscribers: jobnoorman, VincentWu, vkmr, luismarques,
sameer.abuasal, s.egerton, Jim, benna, psnobl, PkmX, rogfer01, shiva0217,
simoncook, arichardson, emaste.
Herald added a project: All.
dtcxzyw requested review of this revision.
Herald added subscribers: llvm-commits, cfe-commits, wangpc, eopXD.
Herald added a project: LLVM.
When building applications with LTO/ThinLTO, lld and llvmgold emit wrong
`.riscv.attributes` sections due to the lack of sub-target features
(`codegen::getMAttrs()` returns empty).
This patch adds a new plugin option `mattr` for lld and llvmgold, to get right
module-level sub-target features for temporary ELF objects generated from llvm
bitcode.
I think it is a better solution than merging func-level sub-target features
like D142191 <https://reviews.llvm.org/D142191>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D155326
Files:
clang/lib/Driver/ToolChains/Arch/CSKY.cpp
clang/lib/Driver/ToolChains/Arch/CSKY.h
clang/lib/Driver/ToolChains/CommonArgs.cpp
lld/ELF/Driver.cpp
lld/ELF/Options.td
llvm/tools/gold/gold-plugin.cpp
Index: llvm/tools/gold/gold-plugin.cpp
===================================================================
--- llvm/tools/gold/gold-plugin.cpp
+++ llvm/tools/gold/gold-plugin.cpp
@@ -33,6 +33,7 @@
#include "llvm/Support/Threading.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/TargetParser/Host.h"
+#include "llvm/TargetParser/SubtargetFeature.h"
#include <list>
#include <map>
#include <plugin-api.h>
@@ -152,6 +153,7 @@
static std::string extra_library_path;
static std::string triple;
static std::string mcpu;
+ static std::string mattr;
// When the thinlto plugin option is specified, only read the function
// the information from intermediate files and write a combined
// global index for the ThinLTO backends.
@@ -228,6 +230,8 @@
if (opt.consume_front("mcpu=")) {
mcpu = std::string(opt);
+ } else if (opt.consume_front("mattr=")) {
+ mattr = std::string(opt);
} else if (opt.consume_front("extra-library-path=")) {
extra_library_path = std::string(opt);
} else if (opt.consume_front("mtriple=")) {
@@ -875,7 +879,8 @@
if (!codegen::getExplicitDataSections())
Conf.Options.DataSections = SplitSections;
- Conf.MAttrs = codegen::getMAttrs();
+ SubtargetFeatures Features(options::mattr);
+ Conf.MAttrs = Features.getFeatures();
Conf.RelocModel = RelocationModel;
Conf.CodeModel = codegen::getExplicitCodeModel();
std::optional<CodeGenOpt::Level> CGOptLevelOrNone =
Index: lld/ELF/Options.td
===================================================================
--- lld/ELF/Options.td
+++ lld/ELF/Options.td
@@ -656,6 +656,7 @@
def: J<"plugin-opt=jobs=">, Alias<thinlto_jobs_eq>, HelpText<"Alias for --thinlto-jobs=">;
def: J<"plugin-opt=lto-partitions=">, Alias<lto_partitions>, HelpText<"Alias for --lto-partitions">;
def plugin_opt_mcpu_eq: J<"plugin-opt=mcpu=">;
+def plugin_opt_mattr_eq: J<"plugin-opt=mattr=">;
def: F<"plugin-opt=cs-profile-generate">,
Alias<lto_cs_profile_generate>, HelpText<"Alias for --lto-cs-profile-generate">;
def: J<"plugin-opt=cs-profile-path=">,
Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -1467,6 +1467,10 @@
parseClangOption(saver().save("-mcpu=" + StringRef(arg->getValue())),
arg->getSpelling());
+ if (auto *arg = args.getLastArg(OPT_plugin_opt_mattr_eq))
+ parseClangOption(saver().save("-mattr=" + StringRef(arg->getValue())),
+ arg->getSpelling());
+
for (opt::Arg *arg : args.filtered(OPT_plugin_opt_eq_minus))
parseClangOption(std::string("-") + arg->getValue(), arg->getSpelling());
Index: clang/lib/Driver/ToolChains/CommonArgs.cpp
===================================================================
--- clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -62,6 +62,7 @@
#include "llvm/Support/VirtualFileSystem.h"
#include "llvm/Support/YAMLParser.h"
#include "llvm/TargetParser/Host.h"
+#include "llvm/TargetParser/SubtargetFeature.h"
#include "llvm/TargetParser/TargetParser.h"
#include <optional>
@@ -485,10 +486,10 @@
options::OPT_m_wasm_Features_Group);
}
-void tools::getTargetFeatures(const Driver &D, const llvm::Triple &Triple,
- const ArgList &Args, ArgStringList &CmdArgs,
- bool ForAS, bool IsAux) {
- std::vector<StringRef> Features;
+static void collectTargetFeatures(const Driver &D, const llvm::Triple &Triple,
+ const ArgList &Args,
+ std::vector<StringRef> &Features,
+ bool ForAS) {
switch (Triple.getArch()) {
default:
break;
@@ -556,13 +557,20 @@
ve::getVETargetFeatures(D, Args, Features);
break;
case llvm::Triple::csky:
- csky::getCSKYTargetFeatures(D, Triple, Args, CmdArgs, Features);
+ csky::getCSKYTargetFeatures(D, Triple, Args, Features);
break;
case llvm::Triple::loongarch32:
case llvm::Triple::loongarch64:
loongarch::getLoongArchTargetFeatures(D, Triple, Args, Features);
break;
}
+}
+
+void tools::getTargetFeatures(const Driver &D, const llvm::Triple &Triple,
+ const ArgList &Args, ArgStringList &CmdArgs,
+ bool ForAS, bool IsAux) {
+ std::vector<StringRef> Features;
+ collectTargetFeatures(D, Triple, Args, Features, ForAS);
for (auto Feature : unifyTargetFeatures(Features)) {
CmdArgs.push_back(IsAux ? "-aux-target-feature" : "-target-feature");
@@ -639,6 +647,17 @@
CmdArgs.push_back(
Args.MakeArgString(Twine(PluginOptPrefix) + ExtraDash + "mcpu=" + CPU));
+ std::vector<StringRef> Features;
+ collectTargetFeatures(D, ToolChain.getTriple(), Args, Features,
+ /*ForAS*/ false);
+ if (!Features.empty()) {
+ llvm::SubtargetFeatures FeatureStr;
+ for (auto Feature : unifyTargetFeatures(Features))
+ FeatureStr.AddFeature(Feature);
+ CmdArgs.push_back(Args.MakeArgString(Twine(PluginOptPrefix) + ExtraDash +
+ "mattr=" + FeatureStr.getString()));
+ }
+
if (Arg *A = Args.getLastArg(options::OPT_O_Group)) {
// The optimization level matches
// CompilerInvocation.cpp:getOptimizationLevel().
Index: clang/lib/Driver/ToolChains/Arch/CSKY.h
===================================================================
--- clang/lib/Driver/ToolChains/Arch/CSKY.h
+++ clang/lib/Driver/ToolChains/Arch/CSKY.h
@@ -32,7 +32,6 @@
void getCSKYTargetFeatures(const Driver &D, const llvm::Triple &Triple,
const llvm::opt::ArgList &Args,
- llvm::opt::ArgStringList &CmdArgs,
std::vector<llvm::StringRef> &Features);
std::optional<llvm::StringRef> getCSKYArchName(const Driver &D,
Index: clang/lib/Driver/ToolChains/Arch/CSKY.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Arch/CSKY.cpp
+++ clang/lib/Driver/ToolChains/Arch/CSKY.cpp
@@ -116,7 +116,7 @@
}
void csky::getCSKYTargetFeatures(const Driver &D, const llvm::Triple &Triple,
- const ArgList &Args, ArgStringList &CmdArgs,
+ const ArgList &Args,
std::vector<llvm::StringRef> &Features) {
llvm::StringRef archName;
llvm::StringRef cpuName;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
