Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-30 17:21:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[lld-macho] Support --thinlto-jobs

Browse Source 
The test is loosely based off LLD-ELF's `thinlto.ll`. However, I
found that test questionable because the the -save_temps behavior it
checks for is identical regardless of whether we are running in single-
or multi-threaded mode. I tried writing a test based on `--time-trace`
but couldn't get it to run deterministically... so I've opted to just
skip checking that behavior for now.

Reviewed By: #lld-macho, gkm

Differential Revision: https://reviews.llvm.org/D99356
This commit is contained in:
Jez Ng 2021-04-08 12:14:47 -04:00
parent 2690d4d45a
commit 050a7a27ca
5 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lld/MachO/Config.h
View File

@ -98,6 +98,7 @@ struct Configuration {
llvm::StringRef mapFile;
llvm::StringRef outputFile;
llvm::StringRef ltoObjPath;
llvm::StringRef thinLTOJobs;
bool demangle = false;
llvm::MachO::Target target;
PlatformInfo platformInfo;

6
lld/MachO/Driver.cpp
View File

@ -893,8 +893,12 @@ bool macho::link(ArrayRef<const char *> argsArr, bool canExitEarly,
error(arg->getSpelling() + ": expected a positive integer, but got '" +
arg->getValue() + "'");
parallel::strategy = hardware_concurrency(threads);
// FIXME: use this to configure ThinLTO concurrency too
config->thinLTOJobs = v;
}
if (auto *arg = args.getLastArg(OPT_thinlto_jobs_eq))
config->thinLTOJobs = arg->getValue();
if (!get_threadpool_strategy(config->thinLTOJobs))
error("--thinlto-jobs: invalid job count: " + config->thinLTOJobs);
config->entry = symtab->addUndefined(args.getLastArgValue(OPT_e, "_main"),
/*file=*/nullptr,

4
lld/MachO/LTO.cpp
View File

@ -43,8 +43,8 @@ static lto::Config createConfig() {
}
BitcodeCompiler::BitcodeCompiler() {
lto::ThinBackend backend =
lto::createInProcessThinBackend(heavyweight_hardware_concurrency());
lto::ThinBackend backend = lto::createInProcessThinBackend(
heavyweight_hardware_concurrency(config->thinLTOJobs));
ltoObj = std::make_unique<lto::LTO>(createConfig(), backend);
}

3
lld/MachO/Options.td
View File

@ -23,6 +23,9 @@ def color_diagnostics_eq: Joined<["--"], "color-diagnostics=">,
def threads_eq : Joined<["--"], "threads=">,
HelpText<"Number of threads. '1' disables multi-threading. By default all available hardware threads are used">,
Group<grp_lld>;
def thinlto_jobs_eq : Joined<["--"], "thinlto-jobs=">,
HelpText<"Number of ThinLTO jobs. Default to --threads=">,
Group<grp_lld>;
def reproduce: Separate<["--"], "reproduce">,
Group<grp_lld>;
def reproduce_eq: Joined<["--"], "reproduce=">,

38
lld/test/MachO/thinlto-jobs.ll Normal file
View File

@ -0,0 +1,38 @@
; REQUIRES: x86
; RUN: rm -rf %t; split-file %s %t
;; I'm not aware of a deterministic way to verify whether LTO is running in
;; single- or multi-threaded mode. So this test simply checks that we can parse
;; the --thinlto-jobs flag correctly, but doesn't verify its effect.
; RUN: opt -module-summary %t/f.s -o %t/f.o
; RUN: opt -module-summary %t/g.s -o %t/g.o
; RUN: %lld --time-trace --thinlto-jobs=1 -dylib %t/f.o %t/g.o -o %t/out
; RUN: %lld --time-trace --thinlto-jobs=2 -dylib %t/f.o %t/g.o -o %t/out
; RUN: %lld --thinlto-jobs=all -dylib %t/f.o %t/g.o -o /dev/null
;; Test with a bad value
; RUN: not %lld --thinlto-jobs=foo -dylib %t/f.o %t/g.o -o /dev/null 2>&1 | FileCheck %s
; CHECK: error: --thinlto-jobs: invalid job count: foo
;--- f.s
target triple = "x86_64-apple-darwin"
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
declare void @g(...)
define void @f() {
entry:
call void (...) @g()
ret void
}
;--- g.s
target triple = "x86_64-apple-darwin"
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
define void @g() {
entry:
ret void
}