Revert "HHVM calling conventions."

[Amir]

Summary

This reverts commit cce239c45d6ef3865a017b5b3f935964e0348734.

HHVM calling conventions are unused. Remove them by partially reverting the commit.

[Amir]

Addressed CodeGen/X86/statepoint-fastregalloc.mir test failure

[Amir]

Rebase

[MatzeB]

Makes sense to me to drop this and I like the simplification.

There is a chance that an out-of-tree target is overriding the getStackAlignmentSkew callback, but given that is at least pretty unlikely it's probably good to try to remove first and possibly bringing it back if there really was a user...

Added one nitpick but otherwise seems good to go.

llvm/include/llvm/IR/CallingConv.h

174–177

Maybe rename to make it more explicit this is gone now?

[MatzeB]

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

24 ↗

(On Diff #495649)

I guess this comment needs to be adapted or removed?

[Amir]

Rename CallingConv enum items

[Amir]

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

24 ↗

(On Diff #495649)

If I only replace the register name, would it still make sense? I'm removing csr_64_hhvm and apparently it has an effect on statepoint operands.

[maksfb]

For all I know, HHVM is not using it. Looks good on my end. Thanks.

[Amir]

Rename the register in statepoint-fastregalloc.mir test

[MatzeB]

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

24 ↗

(On Diff #495649)

This feels like they just choose the HHVM convention to show the concept. This feels like they just choose it because HHVM convention only had a single callee-saved register to choose from to make the test more stable. But at a first glance feels fine to switch to any other callee saved reg of the default calling convention instead...
You should subscribe the original author(s) of the test to this diff in case they have a comment.

[Amir]

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

24 ↗

(On Diff #495649)

Thanks!

@dantrushin – does this change look good to you?

[MatzeB]

LGTM

[MatzeB]

Please note build failures in the CI and fix before landing.

[Amir]

Rename calling convention enum members elsewhere

[Amir]

Update mlir LLVMEnums

[dantrushin]

llvm/test/CodeGen/X86/statepoint-fastregalloc.mir

24 ↗

(On Diff #495649)

Could you please replace csr_hhvm with csr_64_cxx_tls_darwin_pe instead? And register will change to $rbp.

[Amir]

Update test

llvm/include/llvm/CodeGen/TargetFrameLowering.h

public:
   Align getTransientStackAlign() const { return TransientStackAlignment; }
 
   /// isStackRealignable - This method returns whether the stack can be
   /// realigned.
   bool isStackRealignable() const {
     return StackRealignable;
   }
 
-  /// Return the skew that has to be applied to stack alignment under
-  /// certain conditions (e.g. stack was adjusted before function \p MF
-  /// was called).
-  virtual unsigned getStackAlignmentSkew(const MachineFunction &MF) const;
-
   /// This method returns whether or not it is safe for an object with the
   /// given stack id to be bundled into the local area.
   virtual bool isStackIdSafeForLocalArea(unsigned StackId) const {
     return true;
   }
 
   /// getOffsetOfLocalArea - This method returns the offset of the local area
   /// from the stack pointer on entrance to a function.

llvm/include/llvm/IR/CallingConv.h

enum {
     /// On AArch64, this is identical to the normal C (AAPCS) calling
     /// convention for normal functions, but floats are passed in integer
     /// registers to variadic functions.
     Win64 = 79,
 
     /// MSVC calling convention that passes vectors and vector aggregates
     /// in SSE registers.
     X86_VectorCall = 80,
 
-    /// Calling convention used by HipHop Virtual Machine (HHVM) to
-    /// perform calls to and from translation cache, and for calling PHP
-    /// functions.
-    /// HHVM calling convention supports tail/sibling call elimination.
+    /// Placeholders for HHVM calling conventions (deprecated, removed).
     HHVM = 81,
-
-    /// HHVM calling convention for invoking C/C++ helpers.
     HHVM_C = 82,
 
     /// X86_INTR - x86 hardware interrupt context. Callee may take one or two
     /// parameters, where the 1st represents a pointer to hardware context frame
     /// and the 2nd represents hardware error code, the presence of the later
     /// depends on the interrupt vector taken. Valid for both 32- and 64-bit
     /// subtargets.
     X86_INTR = 83,
 

llvm/lib/CodeGen/PrologEpilogInserter.cpp

if (!CSI.empty()) {
         insertCSRRestores(*RestoreBlock, CSI);
     }
   }
 }
 
 /// AdjustStackOffset - Helper function used to adjust the stack frame offset.
 static inline void AdjustStackOffset(MachineFrameInfo &MFI, int FrameIdx,
                                      bool StackGrowsDown, int64_t &Offset,
-                                     Align &MaxAlign, unsigned Skew) {
+                                     Align &MaxAlign) {
   // If the stack grows down, add the object size to find the lowest address.
   if (StackGrowsDown)
     Offset += MFI.getObjectSize(FrameIdx);
 
   Align Alignment = MFI.getObjectAlign(FrameIdx);
 
   // If the alignment of this object is greater than that of the stack, then
   // increase the stack alignment to match.
   MaxAlign = std::max(MaxAlign, Alignment);
 
   // Adjust to alignment boundary.
-  Offset = alignTo(Offset, Alignment, Skew);
+  Offset = alignTo(Offset, Alignment);
 
   if (StackGrowsDown) {
     LLVM_DEBUG(dbgs() << "alloc FI(" << FrameIdx << ") at SP[" << -Offset
                       << "]\n");
     MFI.setObjectOffset(FrameIdx, -Offset); // Set the computed offset
   } else {
     LLVM_DEBUG(dbgs() << "alloc FI(" << FrameIdx << ") at SP[" << Offset
                       << "]\n");
static inline bool scavengeStackSlot(MachineFrameInfo &MFI, int FrameIdx,
   return true;
 }
 
 /// AssignProtectedObjSet - Helper function to assign large stack objects (i.e.,
 /// those required to be close to the Stack Protector) to stack offsets.
 static void AssignProtectedObjSet(const StackObjSet &UnassignedObjs,
                                   SmallSet<int, 16> &ProtectedObjs,
                                   MachineFrameInfo &MFI, bool StackGrowsDown,
-                                  int64_t &Offset, Align &MaxAlign,
-                                  unsigned Skew) {
+                                  int64_t &Offset, Align &MaxAlign) {
 
   for (int i : UnassignedObjs) {
-    AdjustStackOffset(MFI, i, StackGrowsDown, Offset, MaxAlign, Skew);
+    AdjustStackOffset(MFI, i, StackGrowsDown, Offset, MaxAlign);
     ProtectedObjs.insert(i);
   }
 }
 
 /// calculateFrameObjectOffsets - Calculate actual frame offsets for all of the
 /// abstract stack objects.
 void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
   const TargetFrameLowering &TFI = *MF.getSubtarget().getFrameLowering();
void PEI::calculateFrameObjectOffsets(MachineFunction &MF) {
   // of stack growth -- so it's always nonnegative.
   int LocalAreaOffset = TFI.getOffsetOfLocalArea();
   if (StackGrowsDown)
     LocalAreaOffset = -LocalAreaOffset;
   assert(LocalAreaOffset >= 0
          && "Local area offset should be in direction of stack growth");
   int64_t Offset = LocalAreaOffset;
 
-  // Skew to be applied to alignment.
-  unsigned Skew = TFI.getStackAlignmentSkew(MF);
-
 #ifdef EXPENSIVE_CHECKS
   for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i)
     if (!MFI.isDeadObjectIndex(i) &&
         MFI.getStackID(i) == TargetStackID::Default)
       assert(MFI.getObjectAlign(i) <= MFI.getMaxAlign() &&
              "MaxAlignment is invalid");
 #endif
 
for (unsigned i = 0; i <= MaxCSFrameIndex - MinCSFrameIndex; ++i) {
       // Only allocate objects on the default stack.
       if (MFI.getStackID(FrameIndex) != TargetStackID::Default)
         continue;
 
       // TODO: should this just be if (MFI.isDeadObjectIndex(FrameIndex))
       if (!StackGrowsDown && MFI.isDeadObjectIndex(FrameIndex))
         continue;
 
-      AdjustStackOffset(MFI, FrameIndex, StackGrowsDown, Offset, MaxAlign,
-                        Skew);
+      AdjustStackOffset(MFI, FrameIndex, StackGrowsDown, Offset, MaxAlign);
     }
   }
 
   assert(MaxAlign == MFI.getMaxAlign() &&
          "MFI.getMaxAlign should already account for all callee-saved "
          "registers without a fixed stack slot");
 
   // FixedCSEnd is the stack offset to the end of the fixed and callee-save
   // stack area.
   int64_t FixedCSEnd = Offset;
 
   // Make sure the special register scavenging spill slot is closest to the
   // incoming stack pointer if a frame pointer is required and is closer
   // to the incoming rather than the final stack pointer.
   const TargetRegisterInfo *RegInfo = MF.getSubtarget().getRegisterInfo();
   bool EarlyScavengingSlots = TFI.allocateScavengingFrameIndexesNearIncomingSP(MF);
   if (RS && EarlyScavengingSlots) {
     SmallVector<int, 2> SFIs;
     RS->getScavengingFrameIndices(SFIs);
     for (int SFI : SFIs)
-      AdjustStackOffset(MFI, SFI, StackGrowsDown, Offset, MaxAlign, Skew);
+      AdjustStackOffset(MFI, SFI, StackGrowsDown, Offset, MaxAlign);
   }
 
   // FIXME: Once this is working, then enable flag will change to a target
   // check for whether the frame is large enough to want to use virtual
   // frame index registers. Functions which don't want/need this optimization
   // will continue to use the existing code path.
   if (MFI.getUseLocalStackAllocationBlock()) {
     Align Alignment = MFI.getLocalFrameMaxAlign();
 
     // Adjust to alignment boundary.
-    Offset = alignTo(Offset, Alignment, Skew);
+    Offset = alignTo(Offset, Alignment);
 
     LLVM_DEBUG(dbgs() << "Local frame base offset: " << Offset << "\n");
 
     // Resolve offsets for objects in the local block.
     for (unsigned i = 0, e = MFI.getLocalFrameObjectCount(); i != e; ++i) {
       std::pair<int, int64_t> Entry = MFI.getLocalFrameObjectMap(i);
       int64_t FIOffset = (StackGrowsDown ? -Offset : Offset) + Entry.second;
       LLVM_DEBUG(dbgs() << "alloc FI(" << Entry.first << ") at SP[" << FIOffset
if (MFI.getStackID(StackProtectorFI) != TargetStackID::Default) {
       // target to set the stack offset.
       assert(MFI.getObjectOffset(StackProtectorFI) != 0 &&
              "Offset of stack protector on non-default stack expected to be "
              "already set.");
       assert(!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex()) &&
              "Stack protector on non-default stack expected to not be "
              "pre-allocated by LocalStackSlotPass.");
     } else if (!MFI.getUseLocalStackAllocationBlock()) {
-      AdjustStackOffset(MFI, StackProtectorFI, StackGrowsDown, Offset, MaxAlign,
-                        Skew);
+      AdjustStackOffset(MFI, StackProtectorFI, StackGrowsDown, Offset,
+                        MaxAlign);
     } else if (!MFI.isObjectPreAllocated(MFI.getStackProtectorIndex())) {
       llvm_unreachable(
           "Stack protector not pre-allocated by LocalStackSlotPass.");
     }
 
     // Assign large stack objects first.
     for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) {
       if (MFI.isObjectPreAllocated(i) && MFI.getUseLocalStackAllocationBlock())
if (MFI.hasStackProtectorIndex()) {
     // of them, we may end up messing up the expected order of the objects.
     if (MFI.getUseLocalStackAllocationBlock() &&
         !(LargeArrayObjs.empty() && SmallArrayObjs.empty() &&
           AddrOfObjs.empty()))
       llvm_unreachable("Found protected stack objects not pre-allocated by "
                        "LocalStackSlotPass.");
 
     AssignProtectedObjSet(LargeArrayObjs, ProtectedObjs, MFI, StackGrowsDown,
-                          Offset, MaxAlign, Skew);
+                          Offset, MaxAlign);
     AssignProtectedObjSet(SmallArrayObjs, ProtectedObjs, MFI, StackGrowsDown,
-                          Offset, MaxAlign, Skew);
+                          Offset, MaxAlign);
     AssignProtectedObjSet(AddrOfObjs, ProtectedObjs, MFI, StackGrowsDown,
-                          Offset, MaxAlign, Skew);
+                          Offset, MaxAlign);
   }
 
   SmallVector<int, 8> ObjectsToAllocate;
 
   // Then prepare to assign frame offsets to stack objects that are not used to
   // spill callee saved registers.
   for (unsigned i = 0, e = MFI.getObjectIndexEnd(); i != e; ++i) {
     if (MFI.isObjectPreAllocated(i) && MFI.getUseLocalStackAllocationBlock())
if (!scavengeStackSlot(MFI, Object, StackGrowsDown, MaxAlign,
       AdjustStackOffset(MFI, Object, StackGrowsDown, Offset, MaxAlign, Skew);
 
   // Make sure the special register scavenging spill slot is closest to the
   // stack pointer.
   if (RS && !EarlyScavengingSlots) {
     SmallVector<int, 2> SFIs;
     RS->getScavengingFrameIndices(SFIs);
     for (int SFI : SFIs)
-      AdjustStackOffset(MFI, SFI, StackGrowsDown, Offset, MaxAlign, Skew);
+      AdjustStackOffset(MFI, SFI, StackGrowsDown, Offset, MaxAlign);
   }
 
   if (!TFI.targetHandlesStackFrameRounding()) {
     // If we have reserved argument space for call sites in the function
     // immediately on entry to the current function, count it as part of the
     // overall stack size.
     if (MFI.adjustsStack() && TFI.hasReservedCallFrame(MF))
       Offset += MFI.getMaxCallFrameSize();
if (MFI.adjustsStack() || MFI.hasVarSizedObjects() ||
       StackAlign = TFI.getStackAlign();
     else
       StackAlign = TFI.getTransientStackAlign();
 
     // If the frame pointer is eliminated, all frame offsets will be relative to
     // SP not FP. Align to MaxAlign so this works.
     StackAlign = std::max(StackAlign, MaxAlign);
     int64_t OffsetBeforeAlignment = Offset;
-    Offset = alignTo(Offset, StackAlign, Skew);
+    Offset = alignTo(Offset, StackAlign);
 
     // If we have increased the offset to fulfill the alignment constrants,
     // then the scavenging spill slots may become harder to reach from the
     // stack pointer, float them so they stay close.
     if (StackGrowsDown && OffsetBeforeAlignment != Offset && RS &&
         !EarlyScavengingSlots) {
       SmallVector<int, 2> SFIs;
       RS->getScavengingFrameIndices(SFIs);

llvm/lib/CodeGen/TargetFrameLoweringImpl.cpp

 
 #include "llvm/ADT/BitVector.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/TargetFrameLowering.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/IR/CallingConv.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 
void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF,
   const MachineRegisterInfo &MRI = MF.getRegInfo();
   for (unsigned i = 0; CSRegs[i]; ++i) {
     unsigned Reg = CSRegs[i];
     if (CallsUnwindInit || MRI.isPhysRegModified(Reg))
       SavedRegs.set(Reg);
   }
 }
 
-unsigned TargetFrameLowering::getStackAlignmentSkew(
-    const MachineFunction &MF) const {
-  // When HHVM function is called, the stack is skewed as the return address
-  // is removed from the stack before we enter the function.
-  if (LLVM_UNLIKELY(MF.getFunction().getCallingConv() == CallingConv::HHVM))
-    return MF.getTarget().getAllocaPointerSize();
-
-  return 0;
-}
-
 bool TargetFrameLowering::allocateScavengingFrameIndexesNearIncomingSP(
   const MachineFunction &MF) const {
   if (!hasFP(MF))
     return false;
 
   const TargetRegisterInfo *RegInfo = MF.getSubtarget().getRegisterInfo();
   return RegInfo->useFPForScavengingIndex(MF) &&
          !RegInfo->hasStackRealignment(MF);

llvm/lib/Target/X86/X86CallingConv.td

 //
 // This calling convention is currently only supported by the stackmap and
 // patchpoint intrinsics. All other uses will result in an assert on Debug
 // builds. On Release builds we fallback to the X86 C calling convention.
 def RetCC_X86_64_AnyReg : CallingConv<[
   CCCustom<"CC_X86_AnyReg_Error">
 ]>;
 
-// X86-64 HHVM return-value convention.
-def RetCC_X86_64_HHVM: CallingConv<[
-  // Promote all types to i64
-  CCIfType<[i8, i16, i32], CCPromoteToType<i64>>,
-
-  // Return: could return in any GP register save RSP and R12.
-  CCIfType<[i64], CCAssignToReg<[RBX, RBP, RDI, RSI, RDX, RCX, R8, R9,
-                                 RAX, R10, R11, R13, R14, R15]>>
-]>;
-
 
 defm X86_32_RegCall :
    X86_RegCall_base<RC_X86_32_RegCall>;
 defm X86_Win64_RegCall :
      X86_RegCall_base<RC_X86_64_RegCall_Win>;
 defm X86_SysV64_RegCall :
      X86_RegCall_base<RC_X86_64_RegCall_SysV>;
 
def RetCC_X86_64 : CallingConv<[
 
   // Handle explicit CC selection
   CCIfCC<"CallingConv::Win64", CCDelegateTo<RetCC_X86_Win64_C>>,
   CCIfCC<"CallingConv::X86_64_SysV", CCDelegateTo<RetCC_X86_64_C>>,
 
   // Handle Vectorcall CC
   CCIfCC<"CallingConv::X86_VectorCall", CCDelegateTo<RetCC_X86_64_Vectorcall>>,
 
-  // Handle HHVM calls.
-  CCIfCC<"CallingConv::HHVM", CCDelegateTo<RetCC_X86_64_HHVM>>,
-
   CCIfCC<"CallingConv::X86_RegCall",
           CCIfSubtarget<"isTargetWin64()",
                         CCDelegateTo<RetCC_X86_Win64_RegCall>>>,
   CCIfCC<"CallingConv::X86_RegCall", CCDelegateTo<RetCC_X86_SysV64_RegCall>>,
           
   // Mingw64 and native Win64 use Win64 CC
   CCIfSubtarget<"isTargetWin64()", CCDelegateTo<RetCC_X86_Win64_C>>,
 
def CC_X86_64_C : CallingConv<[
   CCIfType<[v32i8, v16i16, v8i32, v4i64, v16f16, v8f32, v4f64],
            CCAssignToStack<32, 32>>,
 
   // 512-bit vectors get 64-byte stack slots that are 64-byte aligned.
   CCIfType<[v64i8, v32i16, v16i32, v8i64, v32f16, v16f32, v8f64],
            CCAssignToStack<64, 64>>
 ]>;
 
-// Calling convention for X86-64 HHVM.
-def CC_X86_64_HHVM : CallingConv<[
-  // Use all/any GP registers for args, except RSP.
-  CCIfType<[i64], CCAssignToReg<[RBX, R12, RBP, R15,
-                                 RDI, RSI, RDX, RCX, R8, R9,
-                                 RAX, R10, R11, R13, R14]>>
-]>;
-
-// Calling convention for helper functions in HHVM.
-def CC_X86_64_HHVM_C : CallingConv<[
-  // Pass the first argument in RBP.
-  CCIfType<[i64], CCAssignToReg<[RBP]>>,
-
-  // Otherwise it's the same as the regular C calling convention.
-  CCDelegateTo<CC_X86_64_C>
-]>;
-
 // Calling convention used on Win64
 def CC_X86_Win64_C : CallingConv<[
   // FIXME: Handle varargs.
 
   // Byval aggregates are passed by pointer
   CCIfByVal<CCPassIndirect<i64>>,
 
   // Promote i1/v1i1 arguments to i8.

 def CC_X86_64 : CallingConv<[
   CCIfCC<"CallingConv::GHC", CCDelegateTo<CC_X86_64_GHC>>,
   CCIfCC<"CallingConv::HiPE", CCDelegateTo<CC_X86_64_HiPE>>,
   CCIfCC<"CallingConv::WebKit_JS", CCDelegateTo<CC_X86_64_WebKit_JS>>,
   CCIfCC<"CallingConv::AnyReg", CCDelegateTo<CC_X86_64_AnyReg>>,
   CCIfCC<"CallingConv::Win64", CCDelegateTo<CC_X86_Win64_C>>,
   CCIfCC<"CallingConv::X86_64_SysV", CCDelegateTo<CC_X86_64_C>>,
   CCIfCC<"CallingConv::X86_VectorCall", CCDelegateTo<CC_X86_Win64_VectorCall>>,
-  CCIfCC<"CallingConv::HHVM", CCDelegateTo<CC_X86_64_HHVM>>,
-  CCIfCC<"CallingConv::HHVM_C", CCDelegateTo<CC_X86_64_HHVM_C>>,
   CCIfCC<"CallingConv::X86_RegCall",
     CCIfSubtarget<"isTargetWin64()", CCDelegateTo<CC_X86_Win64_RegCall>>>,
   CCIfCC<"CallingConv::X86_RegCall", CCDelegateTo<CC_X86_SysV64_RegCall>>,
   CCIfCC<"CallingConv::X86_INTR", CCCustom<"CC_X86_Intr">>,
 
   // Mingw64 and native Win64 use Win64 CC
   CCIfSubtarget<"isTargetWin64()", CCDelegateTo<CC_X86_Win64_C>>,
 

 //Standard C + YMM 8-15
 def CSR_64_Intel_OCL_BI_AVX    : CalleeSavedRegs<(add CSR_64,
                                                   (sequence "YMM%u", 8, 15))>;
 
 def CSR_64_Intel_OCL_BI_AVX512 : CalleeSavedRegs<(add RBX, RSI, R14, R15,
                                                   (sequence "ZMM%u", 16, 31),
                                                   K4, K5, K6, K7)>;
 
-// Only R12 is preserved for PHP calls in HHVM.
-def CSR_64_HHVM : CalleeSavedRegs<(add R12)>;
-
 // Register calling convention preserves few GPR and XMM8-15
 def CSR_32_RegCall_NoSSE : CalleeSavedRegs<(add ESI, EDI, EBX, EBP)>;
 def CSR_32_RegCall       : CalleeSavedRegs<(add CSR_32_RegCall_NoSSE,
                                            (sequence "XMM%u", 4, 7))>;
 def CSR_Win32_CFGuard_Check_NoSSE : CalleeSavedRegs<(add CSR_32_RegCall_NoSSE, ECX)>;
 def CSR_Win32_CFGuard_Check       : CalleeSavedRegs<(add CSR_32_RegCall, ECX)>;
 def CSR_Win64_RegCall_NoSSE : CalleeSavedRegs<(add RBX, RBP,
                                               (sequence "R%u", 10, 15))>;
 def CSR_Win64_RegCall       : CalleeSavedRegs<(add CSR_Win64_RegCall_NoSSE,                                  
                                               (sequence "XMM%u", 8, 15))>;
 def CSR_SysV64_RegCall_NoSSE : CalleeSavedRegs<(add RBX, RBP,
                                                (sequence "R%u", 12, 15))>;
 def CSR_SysV64_RegCall       : CalleeSavedRegs<(add CSR_SysV64_RegCall_NoSSE,               
                                                (sequence "XMM%u", 8, 15))>;

llvm/lib/Target/X86/X86ISelLowering.cpp

return DAG.getMemcpy(
       /*isVolatile*/ false, /*AlwaysInline=*/true,
       /*isTailCall*/ false, MachinePointerInfo(), MachinePointerInfo());
 }
 
 /// Return true if the calling convention is one that we can guarantee TCO for.
 static bool canGuaranteeTCO(CallingConv::ID CC) {
   return (CC == CallingConv::Fast || CC == CallingConv::GHC ||
           CC == CallingConv::X86_RegCall || CC == CallingConv::HiPE ||
-          CC == CallingConv::HHVM || CC == CallingConv::Tail ||
-          CC == CallingConv::SwiftTail);
+          CC == CallingConv::Tail || CC == CallingConv::SwiftTail);
 }
 
 /// Return true if we might ever do TCO for calls with this calling convention.
 static bool mayTailCallThisCC(CallingConv::ID CC) {
   switch (CC) {
   // C calling conventions:
   case CallingConv::C:
   case CallingConv::Win64:

llvm/lib/Target/X86/X86RegisterInfo.cpp

case CallingConv::Intel_OCL_BI: {
     if (HasAVX && IsWin64)
       return CSR_Win64_Intel_OCL_BI_AVX_SaveList;
     if (HasAVX && Is64Bit)
       return CSR_64_Intel_OCL_BI_AVX_SaveList;
     if (!HasAVX && !IsWin64 && Is64Bit)
       return CSR_64_Intel_OCL_BI_SaveList;
     break;
   }
-  case CallingConv::HHVM:
-    return CSR_64_HHVM_SaveList;
   case CallingConv::X86_RegCall:
     if (Is64Bit) {
       if (IsWin64) {
         return (HasSSE ? CSR_Win64_RegCall_SaveList :
                          CSR_Win64_RegCall_NoSSE_SaveList);
       } else {
         return (HasSSE ? CSR_SysV64_RegCall_SaveList :
                          CSR_SysV64_RegCall_NoSSE_SaveList);
case CallingConv::Intel_OCL_BI: {
     if (HasAVX && IsWin64)
       return CSR_Win64_Intel_OCL_BI_AVX_RegMask;
     if (HasAVX && Is64Bit)
       return CSR_64_Intel_OCL_BI_AVX_RegMask;
     if (!HasAVX && !IsWin64 && Is64Bit)
       return CSR_64_Intel_OCL_BI_RegMask;
     break;
   }
-  case CallingConv::HHVM:
-    return CSR_64_HHVM_RegMask;
   case CallingConv::X86_RegCall:
     if (Is64Bit) {
       if (IsWin64) {
         return (HasSSE ? CSR_Win64_RegCall_RegMask :
                          CSR_Win64_RegCall_NoSSE_RegMask);
       } else {
         return (HasSSE ? CSR_SysV64_RegCall_RegMask :
                          CSR_SysV64_RegCall_NoSSE_RegMask);

llvm/test/CodeGen/X86/hhvm-cc.ll

-; RUN: llc < %s | FileCheck %s
-
-target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
-
-declare hhvmcc i64 @bar(i64, i64, i64) nounwind
-
-; Simply check we can modify %rbx and %rbp before returning via call to bar.
-define hhvmcc i64 @foo(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  foo:
-; CHECK-DAG:    movl $1, %ebx
-; CHECK-DAG:    movl $3, %ebp
-; CHECK:        jmp bar
-  %ret = musttail call hhvmcc i64 @bar(i64 1, i64 %b, i64 3)
-  ret i64 %ret
-}
-
-; Check that we can read and modify %rbx returned from PHP function.
-define hhvmcc i64 @mod_return(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  mod_return:
-; CHECK-NEXT:   {{^#.*}}
-; CHECK-NEXT:   callq bar
-; CHECK-NEXT:   incq %rbx
-  %tmp = call hhvmcc i64 @bar(i64 %a, i64 %b, i64 %c)
-  %retval = add i64 %tmp, 1
-  ret i64 %retval
-}
-
-%rettype = type { i64, i64, i64, i64, i64, i64, i64,
-                  i64, i64, i64, i64, i64, i64, i64
-}
-
-; Check that we can return up to 14 64-bit args in registers.
-define hhvmcc %rettype @return_all(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  return_all:
-; CHECK-DAG:    movl $1, %ebx
-; CHECK-DAG:    movl $2, %ebp
-; CHECK-DAG:    movl $3, %edi
-; CHECK-DAG:    movl $4, %esi
-; CHECK-DAG:    movl $5, %edx
-; CHECK-DAG:    movl $6, %ecx
-; CHECK-DAG:    movl $7, %r8
-; CHECK-DAG:    movl $8, %r9
-; CHECK-DAG:    movl $9, %eax
-; CHECK-DAG:    movl $10, %r10
-; CHECK-DAG:    movl $11, %r11
-; CHECK-DAG:    movl $12, %r13
-; CHECK-DAG:    movl $13, %r14
-; CHECK-DAG:    movl $14, %r15
-; CHECK:        retq
-  %r1 = insertvalue %rettype zeroinitializer, i64 1, 0
-  %r2 = insertvalue %rettype %r1, i64 2, 1
-  %r3 = insertvalue %rettype %r2, i64 3, 2
-  %r4 = insertvalue %rettype %r3, i64 4, 3
-  %r5 = insertvalue %rettype %r4, i64 5, 4
-  %r6 = insertvalue %rettype %r5, i64 6, 5
-  %r7 = insertvalue %rettype %r6, i64 7, 6
-  %r8 = insertvalue %rettype %r7, i64 8, 7
-  %r9 = insertvalue %rettype %r8, i64 9, 8
-  %r10 = insertvalue %rettype %r9, i64 10, 9
-  %r11 = insertvalue %rettype %r10, i64 11, 10
-  %r12 = insertvalue %rettype %r11, i64 12, 11
-  %r13 = insertvalue %rettype %r12, i64 13, 12
-  %r14 = insertvalue %rettype %r13, i64 14, 13
-  ret %rettype %r14
-}
-
-declare hhvmcc void @return_all_tc(i64, i64, i64, i64, i64, i64, i64, i64,
-                                 i64, i64, i64, i64, i64, i64, i64)
-
-; Check that we can return up to 14 64-bit args in registers via tail call.
-define hhvmcc void @test_return_all_tc(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_return_all_tc:
-; CHECK-NEXT:   {{^#.*}}
-; CHECK-DAG:    movl $1, %ebx
-; CHECK-DAG:    movl $3, %ebp
-; CHECK-DAG:    movl $4, %r15
-; CHECK-DAG:    movl $5, %edi
-; CHECK-DAG:    movl $6, %esi
-; CHECK-DAG:    movl $7, %edx
-; CHECK-DAG:    movl $8, %ecx
-; CHECK-DAG:    movl $9, %r8
-; CHECK-DAG:    movl $10, %r9
-; CHECK-DAG:    movl $11, %eax
-; CHECK-DAG:    movl $12, %r10
-; CHECK-DAG:    movl $13, %r11
-; CHECK-DAG:    movl $14, %r13
-; CHECK-DAG:    movl $15, %r14
-; CHECK:        jmp  return_all_tc
-  tail call hhvmcc void @return_all_tc(
-    i64 1, i64 %b, i64 3, i64 4, i64 5, i64 6, i64 7,
-    i64 8, i64 9, i64 10, i64 11, i64 12, i64 13, i64 14, i64 15)
-  ret void
-}
-
-declare hhvmcc {i64, i64} @php_short(i64, i64, i64, i64)
-
-define hhvmcc i64 @test_php_short(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_php_short:
-; CHECK-NEXT:   {{^#.*}}
-; CHECK-NEXT:   movl $42, %r15
-; CHECK-NEXT:   callq php_short
-; CHECK-NEXT:   leaq (%rbp,%r12), %rbx
-; CHECK-NEXT:   retq
-  %pair = call hhvmcc {i64, i64} @php_short(i64 %a, i64 %b, i64 %c, i64 42)
-  %fp = extractvalue {i64, i64} %pair, 1
-  %rv = add i64 %fp, %b
-  ret i64 %rv
-}
-
-declare hhvmcc %rettype @php_all(i64, i64, i64, i64, i64, i64, i64,
-                                 i64, i64, i64, i64, i64, i64, i64, i64)
-
-; Check that we can pass 15 arguments in registers.
-; Also check that %r12 (2nd arg) is not spilled.
-define hhvmcc i64 @test_php_all(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_php_all:
-; CHECK-NEXT:   {{^#.*}}
-; CHECK-NOT:    sub
-; CHECK-NOT:    sub
-; CHECK-DAG:    movl $1, %ebx
-; CHECK-DAG:    movl $3, %ebp
-; CHECK-DAG:    movl $4, %r15
-; CHECK-DAG:    movl $5, %edi
-; CHECK-DAG:    movl $6, %esi
-; CHECK-DAG:    movl $7, %edx
-; CHECK-DAG:    movl $8, %ecx
-; CHECK-DAG:    movl $9, %r8
-; CHECK-DAG:    movl $10, %r9
-; CHECK-DAG:    movl $11, %eax
-; CHECK-DAG:    movl $12, %r10
-; CHECK-DAG:    movl $13, %r11
-; CHECK-DAG:    movl $14, %r13
-; CHECK-DAG:    movl $15, %r14
-; CHECK:        callq php_all
-  %pair = call hhvmcc %rettype @php_all(
-    i64 1, i64 %b, i64 3, i64 4, i64 5, i64 6, i64 7,
-    i64 8, i64 9, i64 10, i64 11, i64 12, i64 13, i64 14, i64 15)
-  %fp = extractvalue %rettype %pair, 1
-  %rv = add i64 %fp, %b
-  ret i64 %rv
-}
-
-declare hhvmcc void @svcreq(i64, i64, i64, i64, i64, i64, i64, i64, i64, i64,
-                             i64, i64)
-
-define hhvmcc void @test_svcreq(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_svcreq:
-; CHECK-DAG:    movl $42, %r10
-; CHECK-DAG:    movl $1, %edi
-; CHECK-DAG:    movl $2, %esi
-; CHECK-DAG:    movl $3, %edx
-; CHECK-DAG:    movl $4, %ecx
-; CHECK-DAG:    movl $5, %r8
-; CHECK-DAG:    movl $6, %r9
-; CHECK:        jmp svcreq
-  tail call hhvmcc void @svcreq(i64 %a, i64 %b, i64 %c, i64 undef, i64 1,
-                                i64 2, i64 3, i64 4, i64 5, i64 6, i64 undef,
-                                i64 42)
-  ret void
-}
-
-declare hhvm_ccc void @helper_short(i64, i64, i64, i64, i64, i64, i64)
-
-; Pass all arguments in registers and check that we don't adjust stack
-; for the call.
-define hhvmcc void @test_helper_short(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_helper_short:
-; CHECK-NOT:    push
-; CHECK-NOT:    sub
-; CHECK-DAG:    movl $1, %edi
-; CHECK-DAG:    movl $2, %esi
-; CHECK-DAG:    movl $3, %edx
-; CHECK-DAG:    movl $4, %ecx
-; CHECK-DAG:    movl $5, %r8
-; CHECK-DAG:    movl $6, %r9
-; CHECK:        callq helper_short
-  call hhvm_ccc void @helper_short(i64 %c, i64 1, i64 2, i64 3, i64 4,
-                                   i64 5, i64 6)
-  ret void
-}
-
-declare hhvm_ccc void @helper(i64, i64, i64, i64, i64, i64, i64, i64, i64, i64)
-
-define hhvmcc void @test_helper(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_helper:
-; CHECK-DAG:    movl $1, %edi
-; CHECK-DAG:    movl $2, %esi
-; CHECK-DAG:    movl $3, %edx
-; CHECK-DAG:    movl $4, %ecx
-; CHECK-DAG:    movl $5, %r8
-; CHECK-DAG:    movl $6, %r9
-; CHECK:        callq helper
-  call hhvm_ccc void @helper(i64 %c, i64 1, i64 2, i64 3, i64 4, i64 5, i64 6,
-                             i64 7, i64 8, i64 9)
-  ret void
-}
-
-; When we enter function with HHVM calling convention, the stack is aligned
-; at 16 bytes. This means we align objects on the stack differently and
-; adjust the stack differently for calls.
-declare hhvm_ccc void @stack_helper(i64, i64, i64)
-declare hhvm_ccc void @stack_helper2(<2 x double>, i64)
-
-define hhvmcc void @test_stack_helper(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_stack_helper:
-; CHECK-NOT:    push
-; CHECK:        subq $32, %rsp
-; CHECK:        movaps  16(%rsp), %xmm0
-; CHECK:        callq stack_helper2
-  %t1 = alloca <2 x double>, align 16
-  %t2 = alloca i64, align 8
-  %t3 = alloca i64, align 8
-  %load3 = load i64, i64 *%t3
-  call hhvm_ccc void @stack_helper(i64 %c, i64 %load3, i64 42)
-  %load = load <2 x double>, <2 x double> *%t1
-  %load2 = load i64, i64 *%t2
-  call hhvm_ccc void @stack_helper2(<2 x double> %load, i64 %load2)
-  ret void
-}
-
-; Check that we are not adjusting the stack before calling the helper.
-define hhvmcc void @test_stack_helper2(i64 %a, i64 %b, i64 %c) nounwind {
-entry:
-; CHECK-LABEL:  test_stack_helper2:
-; CHECK-NOT:    push
-; CHECK-NOT:    subq
-  call hhvm_ccc void @stack_helper(i64 %c, i64 7, i64 42)
-  ret void
-}
-

llvm/test/Feature/callingconventions.ll

 
 declare ghccc void @ghc_callee()
 
 define void @ghc_caller() {
   call ghccc void @ghc_callee()
   ret void
 }
 
-declare hhvm_ccc void @hhvm_c_callee()
-
-define hhvmcc void @hhvm_caller() {
-  call hhvm_ccc void @hhvm_c_callee()
-  ret void
-}
-
 declare i32 @__gxx_personality_v0(...)