Skip to content

Commit f77c948

Browse files
ahmedbougachaahmedbougacha
committed
[Triple][MachO] Define "arm64e", an AArch64 subarch for Pointer Auth.
This also teaches MachO writers/readers about the MachO cpu subtype, beyond the minimal subtype reader support present at the moment. This also defines a preprocessor macro to allow users to distinguish __arm64__ from __arm64e__. arm64e defaults to an "apple-a12" CPU, which supports v8.3a, allowing pointer-authentication codegen. It also currently defaults to ios14 and macos11. Differential Revision: https://reviews.llvm.org/D87095
1 parent 45ec3a3 commit f77c948

File tree

25 files changed

+192
-15
lines changed

25 files changed

+192
-15
lines changed

‎clang/lib/Basic/Targets/AArch64.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,9 @@ void DarwinAArch64TargetInfo::getOSDefines(const LangOptions &Opts,
874874
Builder.defineMacro("__arm64", "1");
875875
Builder.defineMacro("__arm64__", "1");
876876

877+
if (Triple.isArm64e())
878+
Builder.defineMacro("__arm64e__", "1");
879+
877880
getDarwinDefines(Builder, Opts, Triple, PlatformName, PlatformMinVersion);
878881
}
879882

‎clang/lib/Driver/ToolChain.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,11 @@ StringRef ToolChain::getDefaultUniversalArchName() const {
232232
// the same as the ones that appear in the triple. Roughly speaking, this is
233233
// an inverse of the darwin::getArchTypeForDarwinArchName() function.
234234
switch (Triple.getArch()) {
235-
case llvm::Triple::aarch64:
235+
case llvm::Triple::aarch64: {
236+
if (getTriple().isArm64e())
237+
return "arm64e";
236238
return "arm64";
239+
}
237240
case llvm::Triple::aarch64_32:
238241
return "arm64_32";
239242
case llvm::Triple::ppc:
@@ -706,6 +709,9 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args,
706709
if (!Triple.isOSBinFormatMachO())
707710
return getTripleString();
708711

712+
if (Triple.isArm64e())
713+
return getTripleString();
714+
709715
// FIXME: older versions of ld64 expect the "arm64" component in the actual
710716
// triple string and query it to determine whether an LTO file can be
711717
// handled. Remove this when we don't care any more.

‎clang/lib/Driver/ToolChains/Arch/AArch64.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ std::string aarch64::getAArch64TargetCPU(const ArgList &Args,
4040
// Handle CPU name is 'native'.
4141
if (CPU == "native")
4242
return std::string(llvm::sys::getHostCPUName());
43-
else if (CPU.size())
43+
44+
// arm64e requires v8.3a and only runs on apple-a12 and later CPUs.
45+
if (Triple.isArm64e())
46+
return "apple-a12";
47+
48+
if (CPU.size())
4449
return CPU;
4550

4651
if (Triple.isTargetMachineMac() &&

‎clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "Darwin.h"
10+
#include "Arch/AArch64.h"
1011
#include "Arch/ARM.h"
1112
#include "CommonArgs.h"
1213
#include "clang/Basic/AlignedAllocation.h"
@@ -58,7 +59,7 @@ llvm::Triple::ArchType darwin::getArchTypeForMachOArchName(StringRef Str) {
5859
.Cases("arm", "armv4t", "armv5", "armv6", "armv6m", llvm::Triple::arm)
5960
.Cases("armv7", "armv7em", "armv7k", "armv7m", llvm::Triple::arm)
6061
.Cases("armv7s", "xscale", llvm::Triple::arm)
61-
.Case("arm64", llvm::Triple::aarch64)
62+
.Cases("arm64", "arm64e", llvm::Triple::aarch64)
6263
.Case("arm64_32", llvm::Triple::aarch64_32)
6364
.Case("r600", llvm::Triple::r600)
6465
.Case("amdgcn", llvm::Triple::amdgcn)
@@ -74,7 +75,7 @@ void darwin::setTripleTypeForMachOArchName(llvm::Triple &T, StringRef Str) {
7475
llvm::ARM::ArchKind ArchKind = llvm::ARM::parseArch(Str);
7576
T.setArch(Arch);
7677

77-
if (Str == "x86_64h")
78+
if (Str == "x86_64h" || Str == "arm64e")
7879
T.setArchName(Str);
7980
else if (ArchKind == llvm::ARM::ArchKind::ARMV6M ||
8081
ArchKind == llvm::ARM::ArchKind::ARMV7M ||
@@ -899,8 +900,11 @@ StringRef MachO::getMachOArchName(const ArgList &Args) const {
899900
case llvm::Triple::aarch64_32:
900901
return "arm64_32";
901902

902-
case llvm::Triple::aarch64:
903+
case llvm::Triple::aarch64: {
904+
if (getTriple().isArm64e())
905+
return "arm64e";
903906
return "arm64";
907+
}
904908

905909
case llvm::Triple::thumb:
906910
case llvm::Triple::arm:
@@ -1011,6 +1015,9 @@ void DarwinClang::AddLinkARCArgs(const ArgList &Args,
10111015
return;
10121016
if (isTargetAppleSiliconMac())
10131017
return;
1018+
// ARC runtime is supported everywhere on arm64e.
1019+
if (getTriple().isArm64e())
1020+
return;
10141021

10151022
ObjCRuntime runtime = getDefaultObjCRuntime(/*nonfragile*/ true);
10161023

@@ -1711,7 +1718,7 @@ inferDeploymentTargetFromArch(DerivedArgList &Args, const Darwin &Toolchain,
17111718
llvm::Triple::OSType OSTy = llvm::Triple::UnknownOS;
17121719

17131720
StringRef MachOArchName = Toolchain.getMachOArchName(Args);
1714-
if (MachOArchName == "arm64") {
1721+
if (MachOArchName == "arm64" || MachOArchName == "arm64e") {
17151722
#if __arm64__
17161723
// A clang running on an Apple Silicon mac defaults
17171724
// to building for mac when building for arm64 rather than

‎clang/test/Driver/aarch64-cpus.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
// ARM64-DARWIN: "-cc1"{{.*}} "-triple" "arm64{{.*}}" "-target-cpu" "apple-a7"
2727
// ARM64-DARWIN-SAME: "-target-feature" "+aes"
2828

29+
// RUN: %clang -target arm64-apple-darwin -arch arm64e -### -c %s 2>&1 | FileCheck -check-prefix=ARM64E-DARWIN %s
30+
// ARM64E-DARWIN: "-cc1"{{.*}} "-triple" "arm64e{{.*}}" "-target-cpu" "apple-a12"
31+
2932
// RUN: %clang -target arm64-apple-darwin -arch arm64_32 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64_32-DARWIN %s
3033
// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "aarch64_32{{.*}}" "-target-cpu" "apple-s4"
3134

‎clang/test/Driver/arclite-link.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616

1717
// CHECK-UNUSED-NOT: warning: argument unused during compilation: '-fobjc-link-runtime'
1818

19+
// RUN: %clang -### -target arm64e-apple-ios8 -fobjc-link-runtime %t.o 2>&1 | FileCheck -check-prefix=CHECK-ARCLITE-ARM64E %s
20+
// CHECK-ARCLITE-ARM64E-NOT: libarclite
21+
1922
// RUN: %clang -### -target arm64-apple-macos10.8 -fobjc-link-runtime %t.o 2>&1 | FileCheck -check-prefix=CHECK-ARCLITE-ARM-MAC %s
2023
// CHECK-ARCLITE-ARM-MAC-NOT: libarclite

‎clang/test/Driver/target-triple-deployment.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// RUN: %clang -target armv7-apple-ios5.0 -mlinker-version=400 -### %t.o 2>> %t.log
1010
// RUN: %clang -target armv7-apple-ios7.0 -mlinker-version=400 -### %t.o 2>> %t.log
1111
// RUN: %clang -target arm64-apple-ios -mlinker-version=400 -### %t.o 2>> %t.log
12+
// RUN: %clang -target arm64e-apple-ios13.0 -mlinker-version=400 -### %t.o 2>> %t.log
13+
// RUN: %clang -target arm64e-apple-ios14.1 -mlinker-version=400 -### %t.o 2>> %t.log
1214
//
1315
// RUN: FileCheck %s < %t.log
1416

@@ -39,3 +41,9 @@
3941
// CHECK: {{ld(.exe)?"}}
4042
// CHECK: -iphoneos_version_min
4143
// CHECK: 7.0.0
44+
// CHECK: {{ld(.exe)?"}}
45+
// CHECK: -iphoneos_version_min
46+
// CHECK: 14.0.0
47+
// CHECK: {{ld(.exe)?"}}
48+
// CHECK: -iphoneos_version_min
49+
// CHECK: 14.1.0

‎clang/test/Preprocessor/arm64e.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm64e-apple-ios < /dev/null | FileCheck %s
2+
3+
// CHECK: #define __ARM64_ARCH_8__ 1
4+
// CHECK: #define __arm64__ 1
5+
// CHECK: #define __arm64e__ 1

‎llvm/include/llvm/ADT/Triple.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ class Triple {
129129
ARMSubArch_v5te,
130130
ARMSubArch_v4t,
131131

132+
AArch64SubArch_arm64e,
133+
132134
KalimbaSubArch_v3,
133135
KalimbaSubArch_v4,
134136
KalimbaSubArch_v5,
@@ -777,6 +779,12 @@ class Triple {
777779
return getArch() == Triple::csky;
778780
}
779781

782+
/// Tests whether the target is the Apple "arm64e" AArch64 subarch.
783+
bool isArm64e() const {
784+
return getArch() == Triple::aarch64 &&
785+
getSubArch() == Triple::AArch64SubArch_arm64e;
786+
}
787+
780788
/// Tests whether the target supports comdat
781789
bool supportsCOMDAT() const {
782790
return !(isOSBinFormatMachO() || isOSBinFormatXCOFF());

‎llvm/lib/BinaryFormat/MachO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static MachO::CPUSubTypeARM64 getARM64SubType(const Triple &T) {
5858
assert(T.isAArch64());
5959
if (T.isArch32Bit())
6060
return (MachO::CPUSubTypeARM64)MachO::CPU_SUBTYPE_ARM64_32_V8;
61-
if (T.getArchName() == "arm64e")
61+
if (T.isArm64e())
6262
return MachO::CPU_SUBTYPE_ARM64E;
6363

6464
return MachO::CPU_SUBTYPE_ARM64_ALL;

0 commit comments

Comments
 (0)