diff options
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.h | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsRegisterInfo.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Mips/maxcallframesize.ll | 17 |
4 files changed, 1 insertions, 27 deletions
diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp index 427866d2bb0..ba05b0f48df 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.cpp +++ b/llvm/lib/Target/Mips/MipsISelLowering.cpp @@ -108,11 +108,6 @@ static bool isShiftedMask(uint64_t I, uint64_t &Pos, uint64_t &Size) { return true; } -void MipsTargetLowering::finalizeLowering(MachineFunction &MF) const { - MF.getFrameInfo().computeMaxCallFrameSize(MF); - TargetLoweringBase::finalizeLowering(MF); -} - // The MIPS MSA ABI passes vector arguments in the integer register set. // The number of integer registers used is dependant on the ABI used. MVT MipsTargetLowering::getRegisterTypeForCallingConv(MVT VT) const { diff --git a/llvm/lib/Target/Mips/MipsISelLowering.h b/llvm/lib/Target/Mips/MipsISelLowering.h index 80dfada2924..ce4f0376ca9 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.h +++ b/llvm/lib/Target/Mips/MipsISelLowering.h @@ -370,8 +370,6 @@ class TargetRegisterClass; bool isJumpTableRelative() const override { return getTargetMachine().isPositionIndependent(); } - - void finalizeLowering(MachineFunction &MF) const override; protected: SDValue getGlobalReg(SelectionDAG &DAG, EVT Ty) const; diff --git a/llvm/lib/Target/Mips/MipsRegisterInfo.cpp b/llvm/lib/Target/Mips/MipsRegisterInfo.cpp index 1f09ff1a6df..0e0d82270c8 100644 --- a/llvm/lib/Target/Mips/MipsRegisterInfo.cpp +++ b/llvm/lib/Target/Mips/MipsRegisterInfo.cpp @@ -74,9 +74,7 @@ MipsRegisterInfo::getRegPressureLimit(const TargetRegisterClass *RC, case Mips::GPR64RegClassID: case Mips::DSPRRegClassID: { const TargetFrameLowering *TFI = MF.getSubtarget().getFrameLowering(); - bool HasFP = MF.getFrameInfo().isMaxCallFrameSizeComputed() - ? TFI->hasFP(MF) : true; - return 28 - HasFP; + return 28 - TFI->hasFP(MF); } case Mips::FGR32RegClassID: return 32; diff --git a/llvm/test/CodeGen/Mips/maxcallframesize.ll b/llvm/test/CodeGen/Mips/maxcallframesize.ll deleted file mode 100644 index a980467eb29..00000000000 --- a/llvm/test/CodeGen/Mips/maxcallframesize.ll +++ /dev/null @@ -1,17 +0,0 @@ -; RUN: llc < %s -mtriple=mips-unknown-linux -stop-before=prologepilog | FileCheck %s - -; Test that maxCallFrameSize is being computed early on. - -@glob = external global i32* - -declare void @bar(i32*, [20000 x i8]* byval) - -define void @foo([20000 x i8]* %addr) { - %tmp = alloca [4 x i32], align 32 - %tmp0 = getelementptr [4 x i32], [4 x i32]* %tmp, i32 0, i32 0 - call void @bar(i32* %tmp0, [20000 x i8]* byval %addr) - ret void -} - -; CHECK: adjustsStack: true -; CHECK: maxCallFrameSize: 20008 |
