This is an archive of the discontinued LLVM Phabricator instance.

Differential D67724

[AArch64] Don't implicitly enable global isel on Darwin if code-model==large.
ClosedPublic

Authored by lhames on Sep 18 2019, 11:39 AM.

Details

Reviewers
paquette
Commits
rG366ab0d086a4: [AArch64] Don't implicitly enable global isel on Darwin if code-model==large.
rL372256: [AArch64] Don't implicitly enable global isel on Darwin if code-model==large.
Summary

AArch64 GlobalISel doesn't support MachO's large code model, so this patch
adds a check for that combination before implicitly enabling it.

Diff Detail

Event Timeline

lhames created this revision.Sep 18 2019, 11:39 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 18 2019, 11:39 AM
Herald added subscribers: ributzka, kristof.beyls. · View Herald Transcript
Harbormaster completed remote builds in B38266: Diff 220714.Sep 18 2019, 11:40 AM
paquette accepted this revision.Sep 18 2019, 12:53 PM

LGTM

This revision is now accepted and ready to land.Sep 18 2019, 12:53 PM
Closed by commit rL372256: [AArch64] Don't implicitly enable global isel on Darwin if code-model==large. (authored by lhames). · Explain WhySep 18 2019, 12:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Target/
AArch64/
6 lines
test/
CodeGen/
AArch64/
16 lines

Diff 220714

lib/Target/AArch64/AArch64TargetMachine.cpp

Show First 20 Lines • Show All 277 Lines • ▼ Show 20 Lines if (getMCAsmInfo()->usesWindowsCFI()) {
// exception-handling region (function, funclet, try block, etc.) // exception-handling region (function, funclet, try block, etc.)
// is a call. // is a call.
// //
// FIXME: We could elide the trap if the next instruction would be in // FIXME: We could elide the trap if the next instruction would be in
// the same region anyway. // the same region anyway.
this->Options.TrapUnreachable = true; this->Options.TrapUnreachable = true;
} }
// Enable GlobalISel at or below EnableGlobalISelAt0. // Enable GlobalISel at or below EnableGlobalISelAt0, unless this is
// MachO/CodeModel::Large, which GlobalISel does not support.
if (getOptLevel() <= EnableGlobalISelAtO && if (getOptLevel() <= EnableGlobalISelAtO &&
TT.getArch() != Triple::aarch64_32) { TT.getArch() != Triple::aarch64_32 &&
!(getCodeModel() == CodeModel::Large && TT.isOSBinFormatMachO())) {
setGlobalISel(true); setGlobalISel(true);
setGlobalISelAbort(GlobalISelAbortMode::Disable); setGlobalISelAbort(GlobalISelAbortMode::Disable);
} }
// AArch64 supports the MachineOutliner. // AArch64 supports the MachineOutliner.
setMachineOutliner(true); setMachineOutliner(true);
// AArch64 supports default outlining behaviour. // AArch64 supports default outlining behaviour.
▲ Show 20 Lines • Show All 328 Lines • Show Last 20 Lines

test/CodeGen/AArch64/arm64-code-model-large-darwin.ll

  • This file was added.
; Check that AArch64 is honoring code-model=large at -O0 and -O2.
;
; RUN: llc -mtriple=arm64-apple-darwin19 -code-model=large -O0 -o - %s | FileCheck %s
; RUN: llc -mtriple=arm64-apple-darwin19 -code-model=large -O2 -o - %s | FileCheck %s
; CHECK: adrp [[REG1:x[0-9]+]], _bar@GOTPAGE
; CHECK: ldr [[REG1]], {{\[}}[[REG1]], _bar@GOTPAGEOFF]
; CHECK: blr [[REG1]]
declare void @bar()
define void @foo() {
call void @bar()
ret void
}