[llvm] 3a1cb36 - Add DriverKit support
Egor Zhdan via llvm-commits
llvm-commits at lists.llvm.org
Tue Feb 22 05:43:00 PST 2022
Author: Egor Zhdan
Date: 2022-02-22T13:42:53Z
New Revision: 3a1cb362370d223e09899d234726e15b52327b0e
URL: https://github.com/llvm/llvm-project/commit/3a1cb362370d223e09899d234726e15b52327b0e
DIFF: https://github.com/llvm/llvm-project/commit/3a1cb362370d223e09899d234726e15b52327b0e.diff
LOG: Add DriverKit support
This patch is the first in a series of patches to upstream the support for Apple's DriverKit. Once complete, it will allow targeting DriverKit platform with Clang similarly to AppleClang.
This code was originally authored by JF Bastien.
Differential Revision: https://reviews.llvm.org/D118046
Added:
llvm/test/MC/MachO/driverkit-sdk-version.ll
Modified:
llvm/include/llvm/ADT/Triple.h
llvm/include/llvm/Support/VersionTuple.h
llvm/lib/MC/MCParser/DarwinAsmParser.cpp
llvm/lib/MC/MCStreamer.cpp
llvm/lib/Support/Triple.cpp
llvm/lib/Target/AArch64/AArch64Subtarget.cpp
llvm/lib/Target/ARM/ARMISelLowering.cpp
llvm/lib/Target/ARM/ARMSubtarget.h
llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
llvm/test/MC/MachO/AArch64/arm-darwin-version-min-load-command.s
llvm/test/MC/MachO/darwin-version-min-load-command.s
llvm/unittests/ADT/TripleTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
index fc8673e54b6c8..6cf90fd6eaeee 100644
--- a/llvm/include/llvm/ADT/Triple.h
+++ b/llvm/include/llvm/ADT/Triple.h
@@ -200,6 +200,7 @@ class Triple {
ELFIAMCU,
TvOS, // Apple tvOS
WatchOS, // Apple watchOS
+ DriverKit, // Apple DriverKit
Mesa3D,
Contiki,
AMDPAL, // AMD PAL Runtime
@@ -362,6 +363,9 @@ class Triple {
/// with WatchOS or generic triples.
VersionTuple getWatchOSVersion() const;
+ /// Parse the version number as with getOSVersion.
+ VersionTuple getDriverKitVersion() const;
+
/// @}
/// @name Direct Component Access
/// @{
@@ -464,11 +468,14 @@ class Triple {
return getSubArch() == Triple::ARMSubArch_v7k;
}
+ /// Is this an Apple DriverKit triple.
+ bool isDriverKit() const { return getOS() == Triple::DriverKit; }
+
bool isOSzOS() const { return getOS() == Triple::ZOS; }
/// Is this a "Darwin" OS (macOS, iOS, tvOS or watchOS).
bool isOSDarwin() const {
- return isMacOSX() || isiOS() || isWatchOS();
+ return isMacOSX() || isiOS() || isWatchOS() || isDriverKit();
}
bool isSimulatorEnvironment() const {
diff --git a/llvm/include/llvm/Support/VersionTuple.h b/llvm/include/llvm/Support/VersionTuple.h
index 1a1072d228f11..aa323fafca65a 100644
--- a/llvm/include/llvm/Support/VersionTuple.h
+++ b/llvm/include/llvm/Support/VersionTuple.h
@@ -97,6 +97,12 @@ class VersionTuple {
return *this;
}
+ /// Return a version tuple that contains a
diff erent major version but
+ /// everything else is the same.
+ VersionTuple withMajorReplaced(unsigned NewMajor) const {
+ return VersionTuple(NewMajor, Minor, Subminor, Build);
+ }
+
/// Return a version tuple that contains only components that are non-zero.
VersionTuple normalize() const {
VersionTuple Result = *this;
diff --git a/llvm/lib/MC/MCParser/DarwinAsmParser.cpp b/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
index 0d28a08a0e667..5274f30be7e8d 100644
--- a/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/DarwinAsmParser.cpp
@@ -1149,11 +1149,12 @@ static Triple::OSType getOSTypeFromPlatform(MachO::PlatformType Type) {
case MachO::PLATFORM_TVOS: return Triple::TvOS;
case MachO::PLATFORM_WATCHOS: return Triple::WatchOS;
case MachO::PLATFORM_BRIDGEOS: /* silence warning */ break;
+ case MachO::PLATFORM_DRIVERKIT:
+ return Triple::DriverKit;
case MachO::PLATFORM_MACCATALYST: return Triple::IOS;
case MachO::PLATFORM_IOSSIMULATOR: /* silence warning */ break;
case MachO::PLATFORM_TVOSSIMULATOR: /* silence warning */ break;
case MachO::PLATFORM_WATCHOSSIMULATOR: /* silence warning */ break;
- case MachO::PLATFORM_DRIVERKIT: /* silence warning */ break;
}
llvm_unreachable("Invalid mach-o platform type");
}
@@ -1172,6 +1173,7 @@ bool DarwinAsmParser::parseBuildVersion(StringRef Directive, SMLoc Loc) {
.Case("tvos", MachO::PLATFORM_TVOS)
.Case("watchos", MachO::PLATFORM_WATCHOS)
.Case("macCatalyst", MachO::PLATFORM_MACCATALYST)
+ .Case("driverkit", MachO::PLATFORM_DRIVERKIT)
.Default(0);
if (Platform == 0)
return Error(PlatformLoc, "unknown platform name");
diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp
index 93001a47af786..a42b4da8a19da 100644
--- a/llvm/lib/MC/MCStreamer.cpp
+++ b/llvm/lib/MC/MCStreamer.cpp
@@ -1286,6 +1286,9 @@ static VersionTuple getMachoBuildVersionSupportedOS(const Triple &Target) {
return VersionTuple(12);
case Triple::WatchOS:
return VersionTuple(5);
+ case Triple::DriverKit:
+ // DriverKit always uses the build version load command.
+ return VersionTuple();
default:
break;
}
@@ -1310,6 +1313,8 @@ getMachoBuildVersionPlatformType(const Triple &Target) {
case Triple::WatchOS:
return Target.isSimulatorEnvironment() ? MachO::PLATFORM_WATCHOSSIMULATOR
: MachO::PLATFORM_WATCHOS;
+ case Triple::DriverKit:
+ return MachO::PLATFORM_DRIVERKIT;
default:
break;
}
@@ -1339,6 +1344,9 @@ void MCStreamer::emitVersionForTarget(
case Triple::WatchOS:
Version = Target.getWatchOSVersion();
break;
+ case Triple::DriverKit:
+ Version = Target.getDriverKitVersion();
+ break;
default:
llvm_unreachable("unexpected OS type");
}
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index a80310b245ad7..978545a1ba144 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -208,6 +208,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
case Contiki: return "contiki";
case Darwin: return "darwin";
case DragonFly: return "dragonfly";
+ case DriverKit: return "driverkit";
case ELFIAMCU: return "elfiamcu";
case Emscripten: return "emscripten";
case FreeBSD: return "freebsd";
@@ -550,6 +551,7 @@ static Triple::OSType parseOS(StringRef OSName) {
.StartsWith("elfiamcu", Triple::ELFIAMCU)
.StartsWith("tvos", Triple::TvOS)
.StartsWith("watchos", Triple::WatchOS)
+ .StartsWith("driverkit", Triple::DriverKit)
.StartsWith("mesa3d", Triple::Mesa3D)
.StartsWith("contiki", Triple::Contiki)
.StartsWith("amdpal", Triple::AMDPAL)
@@ -1169,6 +1171,8 @@ bool Triple::getMacOSXVersion(VersionTuple &Version) const {
// IOS.
Version = VersionTuple(10, 4);
break;
+ case DriverKit:
+ llvm_unreachable("OSX version isn't relevant for DriverKit");
}
return true;
}
@@ -1193,6 +1197,8 @@ VersionTuple Triple::getiOSVersion() const {
}
case WatchOS:
llvm_unreachable("conflicting triple info");
+ case DriverKit:
+ llvm_unreachable("DriverKit doesn't have an iOS version");
}
}
@@ -1214,6 +1220,20 @@ VersionTuple Triple::getWatchOSVersion() const {
}
case IOS:
llvm_unreachable("conflicting triple info");
+ case DriverKit:
+ llvm_unreachable("DriverKit doesn't have a WatchOS version");
+ }
+}
+
+VersionTuple Triple::getDriverKitVersion() const {
+ switch (getOS()) {
+ default:
+ llvm_unreachable("unexpected OS for Darwin triple");
+ case DriverKit:
+ VersionTuple Version = getOSVersion();
+ if (Version.getMajor() == 0)
+ return Version.withMajorReplaced(19);
+ return Version;
}
}
@@ -1746,6 +1766,8 @@ VersionTuple Triple::getMinimumSupportedOSVersion() const {
if (isSimulatorEnvironment())
return VersionTuple(7, 0, 0);
break;
+ case Triple::DriverKit:
+ return VersionTuple(20, 0, 0);
default:
break;
}
@@ -1776,6 +1798,7 @@ StringRef Triple::getARMCPUForArch(StringRef MArch) const {
case llvm::Triple::MacOSX:
case llvm::Triple::TvOS:
case llvm::Triple::WatchOS:
+ case llvm::Triple::DriverKit:
if (MArch == "v7k")
return "cortex-a7";
break;
diff --git a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
index 8a7e20237271a..0c9253f202c6b 100644
--- a/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
+++ b/llvm/lib/Target/AArch64/AArch64Subtarget.cpp
@@ -352,6 +352,8 @@ bool AArch64Subtarget::supportsAddressTopByteIgnored() const {
if (!UseAddressTopByteIgnored)
return false;
+ if (TargetTriple.isDriverKit())
+ return true;
if (TargetTriple.isiOS()) {
return TargetTriple.getiOSVersion() >= VersionTuple(8);
}
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 93193e97820d8..c678901bb3280 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -481,7 +481,7 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM,
setBooleanVectorContents(ZeroOrNegativeOneBooleanContent);
if (!Subtarget->isTargetDarwin() && !Subtarget->isTargetIOS() &&
- !Subtarget->isTargetWatchOS()) {
+ !Subtarget->isTargetWatchOS() && !Subtarget->isTargetDriverKit()) {
bool IsHFTarget = TM.Options.FloatABIType == FloatABI::Hard;
for (int LCID = 0; LCID < RTLIB::UNKNOWN_LIBCALL; ++LCID)
setLibcallCallingConv(static_cast<RTLIB::Libcall>(LCID),
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.h b/llvm/lib/Target/ARM/ARMSubtarget.h
index c498d273429dc..bf4b213eac8d9 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.h
+++ b/llvm/lib/Target/ARM/ARMSubtarget.h
@@ -773,6 +773,7 @@ class ARMSubtarget : public ARMGenSubtargetInfo {
bool isTargetIOS() const { return TargetTriple.isiOS(); }
bool isTargetWatchOS() const { return TargetTriple.isWatchOS(); }
bool isTargetWatchABI() const { return TargetTriple.isWatchABI(); }
+ bool isTargetDriverKit() const { return TargetTriple.isDriverKit(); }
bool isTargetLinux() const { return TargetTriple.isOSLinux(); }
bool isTargetNaCl() const { return TargetTriple.isOSNaCl(); }
bool isTargetNetBSD() const { return TargetTriple.isOSNetBSD(); }
diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index a8d67c755799d..e111805895505 100644
--- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -465,7 +465,8 @@ struct ShadowMapping {
static ShadowMapping getShadowMapping(const Triple &TargetTriple, int LongSize,
bool IsKasan) {
bool IsAndroid = TargetTriple.isAndroid();
- bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS();
+ bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS() ||
+ TargetTriple.isDriverKit();
bool IsMacOS = TargetTriple.isMacOSX();
bool IsFreeBSD = TargetTriple.isOSFreeBSD();
bool IsNetBSD = TargetTriple.isOSNetBSD();
@@ -2125,6 +2126,8 @@ bool ModuleAddressSanitizer::ShouldUseMachOGlobalsSection() const {
return true;
if (TargetTriple.isWatchOS() && !TargetTriple.isOSVersionLT(2))
return true;
+ if (TargetTriple.isDriverKit())
+ return true;
return false;
}
diff --git a/llvm/test/MC/MachO/AArch64/arm-darwin-version-min-load-command.s b/llvm/test/MC/MachO/AArch64/arm-darwin-version-min-load-command.s
index 37b95b2bd6817..2d008a84570f9 100644
--- a/llvm/test/MC/MachO/AArch64/arm-darwin-version-min-load-command.s
+++ b/llvm/test/MC/MachO/AArch64/arm-darwin-version-min-load-command.s
@@ -18,6 +18,10 @@
// RUN: llvm-mc -triple arm64-apple-tvos10-simulator %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-BUILD-TVOSSIM2
// RUN: llvm-mc -triple arm64-apple-watchos3-simulator %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-BUILD-WATCHOSSIM2
+// RUN: llvm-mc -triple arm64-apple-driverkit19.0 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-DRIVERKIT-ARM64
+// RUN: llvm-mc -triple arm64e-apple-driverkit19.0 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-DRIVERKIT-ARM64
+// RUN: llvm-mc -triple arm64-apple-driverkit20.1 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-DRIVERKIT-ARM64_1
+
// CHECK-BUILD-IOS-ARM64E: cmd LC_BUILD_VERSION
// CHECK-BUILD-IOS-ARM64E-NEXT: cmdsize 24
// CHECK-BUILD-IOS-ARM64E-NEXT: platform ios
@@ -94,3 +98,17 @@
// CHECK-MACCATALYST-ARM64_1-NEXT: sdk n/a
// CHECK-MACCATALYST-ARM64_1-NEXT: minos 14.1
// CHECK-MACCATALYST-ARM64_1-NEXT: ntools 0
+
+// CHECK-DRIVERKIT-ARM64: cmd LC_BUILD_VERSION
+// CHECK-DRIVERKIT-ARM64-NEXT: cmdsize 24
+// CHECK-DRIVERKIT-ARM64-NEXT: platform driverkit
+// CHECK-DRIVERKIT-ARM64-NEXT: sdk n/a
+// CHECK-DRIVERKIT-ARM64-NEXT: minos 20.0
+// CHECK-DRIVERKIT-ARM64-NEXT: ntools 0
+
+// CHECK-DRIVERKIT-ARM64_1: cmd LC_BUILD_VERSION
+// CHECK-DRIVERKIT-ARM64_1-NEXT: cmdsize 24
+// CHECK-DRIVERKIT-ARM64_1-NEXT: platform driverkit
+// CHECK-DRIVERKIT-ARM64_1-NEXT: sdk n/a
+// CHECK-DRIVERKIT-ARM64_1-NEXT: minos 20.1
+// CHECK-DRIVERKIT-ARM64_1-NEXT: ntools 0
diff --git a/llvm/test/MC/MachO/darwin-version-min-load-command.s b/llvm/test/MC/MachO/darwin-version-min-load-command.s
index 6e1b4c20a6700..1a57dd6f7e2dd 100644
--- a/llvm/test/MC/MachO/darwin-version-min-load-command.s
+++ b/llvm/test/MC/MachO/darwin-version-min-load-command.s
@@ -27,6 +27,7 @@
// RUN: llvm-mc -triple x86_64-apple-watchos1.0.0 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-WATCHOS
// RUN: llvm-mc -triple x86_64-apple-tvos8.0.0 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-TVOS
+// RUN: llvm-mc -triple x86_64-apple-driverkit19.0 %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s --check-prefix=CHECK-DRIVERKIT
// CHECK-WATCHOS: Load command
// CHECK-WATCHOS: cmd LC_VERSION_MIN_WATCHOS
// CHECK-WATCHOS-NEXT: cmdsize 16
@@ -50,6 +51,13 @@
// CHECK-MACCATALYST-NEXT: minos 13.0
// CHECK-MACCATALYST-NEXT: ntools 0
+// CHECK-DRIVERKIT: cmd LC_BUILD_VERSION
+// CHECK-DRIVERKIT-NEXT: cmdsize 24
+// CHECK-DRIVERKIT-NEXT: platform driverkit
+// CHECK-DRIVERKIT-NEXT: sdk n/a
+// CHECK-DRIVERKIT-NEXT: minos 19.0
+// CHECK-DRIVERKIT-NEXT: ntools 0
+
// CHECK-BUILD-MACOS: cmd LC_BUILD_VERSION
// CHECK-BUILD-MACOS-NEXT: cmdsize 24
// CHECK-BUILD-MACOS-NEXT: platform macos
diff --git a/llvm/test/MC/MachO/driverkit-sdk-version.ll b/llvm/test/MC/MachO/driverkit-sdk-version.ll
new file mode 100644
index 0000000000000..ea36ae32ffec3
--- /dev/null
+++ b/llvm/test/MC/MachO/driverkit-sdk-version.ll
@@ -0,0 +1,18 @@
+; RUN: llc %s -filetype=obj -o - | llvm-objdump --macho --private-headers - | FileCheck %s
+; RUN: llc %s -filetype=asm -o - | FileCheck --check-prefix=ASM %s
+
+target triple = "x86_64-apple-driverkit19.0.0"
+
+define void @foo() {
+entry:
+ ret void
+}
+
+; CHECK: cmd LC_BUILD_VERSION
+; CHECK-NEXT: cmdsize 24
+; CHECK-NEXT: platform driverkit
+; CHECK-NEXT: sdk n/a
+; CHECK-NEXT: minos 19.0
+; CHECK-NEXT: ntools 0
+
+; ASM: .build_version driverkit, 19, 0
diff --git a/llvm/unittests/ADT/TripleTest.cpp b/llvm/unittests/ADT/TripleTest.cpp
index 18a9641492ad0..f4715e8558983 100644
--- a/llvm/unittests/ADT/TripleTest.cpp
+++ b/llvm/unittests/ADT/TripleTest.cpp
@@ -1434,6 +1434,23 @@ TEST(TripleTest, getOSVersion) {
EXPECT_TRUE(T.getEnvironment() == Triple::MacABI);
EXPECT_TRUE(T.isMacCatalystEnvironment());
EXPECT_FALSE(T.isSimulatorEnvironment());
+
+ T = Triple("x86_64-apple-driverkit20.1.0");
+ EXPECT_TRUE(T.isDriverKit());
+ EXPECT_TRUE(T.isOSDarwin());
+ EXPECT_FALSE(T.isMacOSX());
+ EXPECT_FALSE(T.isiOS());
+ Version = T.getDriverKitVersion();
+ EXPECT_EQ(VersionTuple(20, 1), Version);
+
+ T = Triple("x86_64-apple-driverkit20");
+ Version = T.getDriverKitVersion();
+ EXPECT_EQ(VersionTuple(20, 0), Version);
+
+ // DriverKit version should default to 19.0.
+ T = Triple("x86_64-apple-driverkit");
+ Version = T.getDriverKitVersion();
+ EXPECT_EQ(VersionTuple(19, 0), Version);
}
TEST(TripleTest, getEnvironmentVersion) {
More information about the llvm-commits
mailing list