maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld-macho] Add support for --threads 

Code and test are largely identical to the LLD-ELF equivalents.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D99312
This commit is contained in:
Jez Ng 2021-03-25 14:39:45 -04:00
parent 4bcaafeb0e
commit 0113cf00b6
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/MachO/Driver.cpp
View File

@ -38,6 +38,7 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/Parallel.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/TarWriter.h"
#include "llvm/Support/TargetSelect.h"
@ -861,6 +862,16 @@ bool macho::link(ArrayRef<const char *> argsArr, bool canExitEarly,
depTracker =
make<DependencyTracker>(args.getLastArgValue(OPT_dependency_info, ""));
if (auto *arg = args.getLastArg(OPT_threads_eq)) {
StringRef v(arg->getValue());
unsigned threads = 0;
if (!llvm::to_integer(v, threads, 0) || threads == 0)
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->entry = symtab->addUndefined(args.getLastArgValue(OPT_e, "_main"),
/*file=*/nullptr,
/*isWeakRef=*/false);

3
lld/MachO/Options.td
View File

@ -20,6 +20,9 @@ def color_diagnostics_eq: Joined<["--"], "color-diagnostics=">,
HelpText<"Use colors in diagnostics (default: auto)">,
MetaVarName<"[auto,always,never]">,
Group<grp_lld>;
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 reproduce: Separate<["--"], "reproduce">,
Group<grp_lld>;
def reproduce_eq: Joined<["--"], "reproduce=">,

16
lld/test/MachO/threads.s Normal file
View File

@ -0,0 +1,16 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
## A positive integer is allowed.
# RUN: %lld --threads=1 %t.o -o /dev/null
# RUN: %lld --threads=2 %t.o -o /dev/null
# RUN: not %lld --threads=all %t.o -o /dev/null 2>&1 | FileCheck %s -DN=all
# RUN: not %lld --threads=0 %t.o -o /dev/null 2>&1 | FileCheck %s -DN=0
# RUN: not %lld --threads=-1 %t.o -o /dev/null 2>&1 | FileCheck %s -DN=-1
# CHECK: error: --threads=: expected a positive integer, but got '[[N]]'
.globl _main
_main:
ret