[Clang][AArch64][Darwin] Enable GlobalISel by default for Darwin ARM64 platforms.

Differential Revision: https://reviews.llvm.org/D137269
This commit is contained in:
Amara Emerson 2022-11-02 09:25:59 -07:00
parent 428ac8f3a0
commit f64802e8d3
3 changed files with 24 additions and 7 deletions

View File

@ -7209,15 +7209,29 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
if (SplitLTOUnit)
CmdArgs.push_back("-fsplit-lto-unit");
if (Arg *A = Args.getLastArg(options::OPT_fglobal_isel,
options::OPT_fno_global_isel)) {
A = Args.getLastArg(options::OPT_fglobal_isel, options::OPT_fno_global_isel);
// If a configuration is fully supported, we don't issue any warnings or
// remarks.
bool IsFullySupported = getToolChain().getTriple().isOSDarwin() &&
Triple.getArch() == llvm::Triple::aarch64;
if (IsFullySupported) {
if (A && A->getOption().matches(options::OPT_fno_global_isel)) {
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-global-isel=0");
} else {
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-global-isel=1");
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-global-isel-abort=0");
}
} else if (A) {
CmdArgs.push_back("-mllvm");
if (A->getOption().matches(options::OPT_fglobal_isel)) {
CmdArgs.push_back("-global-isel=1");
// GISel is on by default on AArch64 -O0, so don't bother adding
// the fallback remarks for it. Other combinations will add a warning of
// some kind.
// some kind, unless we're on Darwin.
bool IsArchSupported = Triple.getArch() == llvm::Triple::aarch64;
bool IsOptLevelSupported = false;

View File

@ -381,10 +381,11 @@ void darwin::Linker::AddLinkArgs(Compilation &C, const ArgList &Args,
D.Diag(diag::err_drv_bitcode_unsupported_on_toolchain);
}
// If GlobalISel is enabled, pass it through to LLVM.
if (Arg *A = Args.getLastArg(options::OPT_fglobal_isel,
options::OPT_fno_global_isel)) {
if (A->getOption().matches(options::OPT_fglobal_isel)) {
// GlobalISel is enabled by default on AArch64 Darwin.
if (getToolChain().getArch() == llvm::Triple::aarch64) {
Arg *A = Args.getLastArg(options::OPT_fglobal_isel,
options::OPT_fno_global_isel);
if (!A || !A->getOption().matches(options::OPT_fno_global_isel)) {
CmdArgs.push_back("-mllvm");
CmdArgs.push_back("-global-isel");
// Disable abort and fall back to SDAG silently.

View File

@ -6,6 +6,7 @@
// RUN: %clang -target aarch64 -fglobal-isel -S %s -### 2>&1 | FileCheck --check-prefix=ARM64-DEFAULT %s
// RUN: %clang -target aarch64 -fglobal-isel -S -O0 %s -### 2>&1 | FileCheck --check-prefix=ARM64-O0 %s
// RUN: %clang -target aarch64 -fglobal-isel -S -O2 %s -### 2>&1 | FileCheck --check-prefix=ARM64-O2 %s
// RUN: %clang -arch arm64 -fglobal-isel -S -O2 %s -### 2>&1 | FileCheck --check-prefixes=DARWIN-ARM64-O2,ENABLED %s
// RUN: %clang -target aarch64 -fglobal-isel -Wno-global-isel -S -O2 %s -### 2>&1 | FileCheck --check-prefix=ARM64-O2-NOWARN %s
// RUN: %clang -target x86_64 -fglobal-isel -S %s -### 2>&1 | FileCheck --check-prefix=X86_64 %s
@ -27,6 +28,7 @@
// ARM64-DEFAULT-NOT: warning: -fglobal-isel
// ARM64-DEFAULT-NOT: "-global-isel-abort=2"
// ARM64-O0-NOT: warning: -fglobal-isel
// DARWIN-ARM64-O2-NOT: warning: -fglobal-isel
// ARM64-O2: warning: -fglobal-isel support is incomplete for this architecture at the current optimization level
// ARM64-O2: "-mllvm" "-global-isel-abort=2"
// ARM64-O2-NOWARN-NOT: warning: -fglobal-isel