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

[Lang Hames via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL372256: [AArch64] Don't implicitly enable global isel on Darwin if code-model==large. (authored by lhames, committed by ).

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67724/new/

https://reviews.llvm.org/D67724

Files:
  llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
  llvm/trunk/test/CodeGen/AArch64/arm64-code-model-large-darwin.ll


Index: llvm/trunk/test/CodeGen/AArch64/arm64-code-model-large-darwin.ll
===================================================================
--- llvm/trunk/test/CodeGen/AArch64/arm64-code-model-large-darwin.ll
+++ llvm/trunk/test/CodeGen/AArch64/arm64-code-model-large-darwin.ll
@@ -0,0 +1,16 @@
+; 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 at GOTPAGE
+; CHECK: ldr     [[REG1]], {{\[}}[[REG1]], _bar at GOTPAGEOFF]
+; CHECK: blr     [[REG1]]
+
+declare void @bar()
+
+define void @foo() {
+  call void @bar()
+  ret void
+}
+
Index: llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
===================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -283,9 +283,11 @@
     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 &&
-      TT.getArch() != Triple::aarch64_32) {
+      TT.getArch() != Triple::aarch64_32 &&
+      !(getCodeModel() == CodeModel::Large && TT.isOSBinFormatMachO())) {
     setGlobalISel(true);
     setGlobalISelAbort(GlobalISelAbortMode::Disable);
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67724.220733.patch
Type: text/x-patch
Size: 1573 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190918/cc413462/attachment.bin>