diff --git a/llvm/include/llvm/CodeGen/CommandFlags.h b/llvm/include/llvm/CodeGen/CommandFlags.h --- a/llvm/include/llvm/CodeGen/CommandFlags.h +++ b/llvm/include/llvm/CodeGen/CommandFlags.h @@ -74,6 +74,8 @@ llvm::FPOpFusion::FPOpFusionMode getFuseFPOps(); +SwiftAsyncFramePointerMode getSwiftAsyncFramePointer(); + bool getDontPlaceZerosInBSS(); bool getEnableGuaranteedTailCallOpt(); diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h --- a/llvm/include/llvm/Target/TargetOptions.h +++ b/llvm/include/llvm/Target/TargetOptions.h @@ -110,6 +110,17 @@ DisableWithDiag // Disable the abort but emit a diagnostic on failure. }; + /// Indicates when and how the Swift async frame pointer bit should be set. + enum class SwiftAsyncFramePointerMode { + /// Determine whether to set the bit statically or dynamically based + /// on the deployment target. + DeploymentBased, + /// Always set the bit. + Always, + /// Never set the bit. + Never, + }; + class TargetOptions { public: TargetOptions() @@ -219,6 +230,11 @@ /// selection fails to lower/select an instruction. GlobalISelAbortMode GlobalISelAbort = GlobalISelAbortMode::Enable; + /// Control when and how the Swift async frame pointer bit should + /// be set. + SwiftAsyncFramePointerMode SwiftAsyncFramePointer = + SwiftAsyncFramePointerMode::DeploymentBased; + /// UseInitArray - Use .init_array instead of .ctors for static /// constructors. unsigned UseInitArray : 1; diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp --- a/llvm/lib/CodeGen/CommandFlags.cpp +++ b/llvm/lib/CodeGen/CommandFlags.cpp @@ -65,6 +65,7 @@ CGOPT(bool, EnableHonorSignDependentRoundingFPMath) CGOPT(FloatABI::ABIType, FloatABIForCalls) CGOPT(FPOpFusion::FPOpFusionMode, FuseFPOps) +CGOPT(SwiftAsyncFramePointerMode, SwiftAsyncFramePointer) CGOPT(bool, DontPlaceZerosInBSS) CGOPT(bool, EnableGuaranteedTailCallOpt) CGOPT(bool, DisableTailCalls) @@ -278,6 +279,18 @@ "Only fuse FP ops when the result won't be affected."))); CGBINDOPT(FuseFPOps); + static cl::opt SwiftAsyncFramePointer( + "swift-async-fp", + cl::desc("Determine when the Swift async frame pointer should be set"), + cl::init(SwiftAsyncFramePointerMode::DeploymentBased), + cl::values(clEnumValN(SwiftAsyncFramePointerMode::DeploymentBased, "auto", + "Determine based on deployment target"), + clEnumValN(SwiftAsyncFramePointerMode::Always, "always", + "Always set the bit"), + clEnumValN(SwiftAsyncFramePointerMode::Never, "never", + "Never set the bit"))); + CGBINDOPT(SwiftAsyncFramePointer); + static cl::opt DontPlaceZerosInBSS( "nozero-initialized-in-bss", cl::desc("Don't place zero-initialized symbols into bss section"), @@ -539,7 +552,7 @@ Options.ThreadModel = getThreadModel(); Options.EABIVersion = getEABIVersion(); Options.DebuggerTuning = getDebuggerTuningOpt(); - + Options.SwiftAsyncFramePointer = getSwiftAsyncFramePointer(); return Options; } diff --git a/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp --- a/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp +++ b/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp @@ -1158,22 +1158,32 @@ // ORR is sufficient, it is assumed a Swift kernel would initialize the TBI // bits so that is still true. if (HasFP && AFI->hasSwiftAsyncContext()) { - if (Subtarget.swiftAsyncContextIsDynamicallySet()) { - // The special symbol below is absolute and has a *value* that can be - // combined with the frame pointer to signal an extended frame. - BuildMI(MBB, MBBI, DL, TII->get(AArch64::LOADgot), AArch64::X16) - .addExternalSymbol("swift_async_extendedFramePointerFlags", - AArch64II::MO_GOT); - BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXrs), AArch64::FP) - .addUse(AArch64::FP) - .addUse(AArch64::X16) - .addImm(Subtarget.isTargetILP32() ? 32 : 0); - } else { + switch (MF.getTarget().Options.SwiftAsyncFramePointer) { + case SwiftAsyncFramePointerMode::DeploymentBased: + if (Subtarget.swiftAsyncContextIsDynamicallySet()) { + // The special symbol below is absolute and has a *value* that can be + // combined with the frame pointer to signal an extended frame. + BuildMI(MBB, MBBI, DL, TII->get(AArch64::LOADgot), AArch64::X16) + .addExternalSymbol("swift_async_extendedFramePointerFlags", + AArch64II::MO_GOT); + BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXrs), AArch64::FP) + .addUse(AArch64::FP) + .addUse(AArch64::X16) + .addImm(Subtarget.isTargetILP32() ? 32 : 0); + break; + } + LLVM_FALLTHROUGH; + + case SwiftAsyncFramePointerMode::Always: // ORR x29, x29, #0x1000_0000_0000_0000 BuildMI(MBB, MBBI, DL, TII->get(AArch64::ORRXri), AArch64::FP) .addUse(AArch64::FP) .addImm(0x1100) .setMIFlag(MachineInstr::FrameSetup); + break; + + case SwiftAsyncFramePointerMode::Never: + break; } } diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -1364,22 +1364,32 @@ unsigned StackProbeSize = STI.getTargetLowering()->getStackProbeSize(MF); if (HasFP && X86FI->hasSwiftAsyncContext()) { - if (STI.swiftAsyncContextIsDynamicallySet()) { - // The special symbol below is absolute and has a *value* suitable to be - // combined with the frame pointer directly. - BuildMI(MBB, MBBI, DL, TII.get(X86::OR64rm), MachineFramePtr) - .addUse(MachineFramePtr) - .addUse(X86::RIP) - .addImm(1) - .addUse(X86::NoRegister) - .addExternalSymbol("swift_async_extendedFramePointerFlags", - X86II::MO_GOTPCREL) - .addUse(X86::NoRegister); - } else { + switch (MF.getTarget().Options.SwiftAsyncFramePointer) { + case SwiftAsyncFramePointerMode::DeploymentBased: + if (STI.swiftAsyncContextIsDynamicallySet()) { + // The special symbol below is absolute and has a *value* suitable to be + // combined with the frame pointer directly. + BuildMI(MBB, MBBI, DL, TII.get(X86::OR64rm), MachineFramePtr) + .addUse(MachineFramePtr) + .addUse(X86::RIP) + .addImm(1) + .addUse(X86::NoRegister) + .addExternalSymbol("swift_async_extendedFramePointerFlags", + X86II::MO_GOTPCREL) + .addUse(X86::NoRegister); + break; + } + LLVM_FALLTHROUGH; + + case SwiftAsyncFramePointerMode::Always: BuildMI(MBB, MBBI, DL, TII.get(X86::BTS64ri8), MachineFramePtr) .addUse(MachineFramePtr) .addImm(60) .setMIFlag(MachineInstr::FrameSetup); + break; + + case SwiftAsyncFramePointerMode::Never: + break; } } diff --git a/llvm/test/CodeGen/AArch64/swift-dynamic-async-frame.ll b/llvm/test/CodeGen/AArch64/swift-dynamic-async-frame.ll --- a/llvm/test/CodeGen/AArch64/swift-dynamic-async-frame.ll +++ b/llvm/test/CodeGen/AArch64/swift-dynamic-async-frame.ll @@ -1,5 +1,8 @@ ; RUN: llc -mtriple arm64-apple-ios15.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC +; RUN: llc -mtriple arm64-apple-ios15.0.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-STATIC +; RUN: llc -mtriple arm64-apple-ios14.9.0 -swift-async-fp=always %s -o - | FileCheck %s --check-prefix=CHECK-STATIC ; RUN: llc -mtriple arm64-apple-ios14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC +; RUN: llc -mtriple arm64-apple-ios14.9.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC ; RUN: llc -mtriple arm64-apple-tvos15.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC ; RUN: llc -mtriple arm64-apple-tvos14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC ; RUN: llc -mtriple arm64-apple-macosx12.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC diff --git a/llvm/test/CodeGen/X86/swift-dynamic-async-frame.ll b/llvm/test/CodeGen/X86/swift-dynamic-async-frame.ll --- a/llvm/test/CodeGen/X86/swift-dynamic-async-frame.ll +++ b/llvm/test/CodeGen/X86/swift-dynamic-async-frame.ll @@ -1,5 +1,9 @@ ; RUN: llc -mtriple x86_64-apple-macosx12.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC +; RUN: llc -mtriple x86_64-apple-macosx12.0.0 -swift-async-fp=always %s -o - | FileCheck %s --check-prefix=CHECK-STATIC +; RUN: llc -mtriple x86_64-apple-macosx12.0.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-STATIC +; RUN: llc -mtriple x86_64-apple-macosx11.9.0 -swift-async-fp=always %s -o - | FileCheck %s --check-prefix=CHECK-STATIC ; RUN: llc -mtriple x86_64-apple-macosx11.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC +; RUN: llc -mtriple x86_64-apple-macosx11.9.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC ; CHECK-STATIC-LABEL: foo: ; CHECK-STATIC: btsq $60, %rbp