Skip to content

Commit c27768a

Browse files
committed
[Xtensa] Change using of Frame Pointer.
Do not use Frame Pointer by default. Also improve storing function argument from a7 register to a8 register. Corrected funnel shift test. Closes llvm#19
1 parent 52b0eea commit c27768a

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ static bool useFramePointerForTargetByDefault(const ArgList &Args,
539539
case llvm::Triple::riscv64:
540540
case llvm::Triple::amdgcn:
541541
case llvm::Triple::r600:
542+
case llvm::Triple::xtensa:
542543
return !areOptimizationsEnabled(Args);
543544
default:
544545
break;

llvm/lib/Target/Xtensa/XtensaFrameLowering.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "XtensaFrameLowering.h"
1616
#include "XtensaInstrInfo.h"
17+
#include "XtensaMachineFunctionInfo.h"
1718
#include "XtensaSubtarget.h"
1819
#include "llvm/CodeGen/MachineInstrBuilder.h"
1920
#include "llvm/CodeGen/MachineModuleInfo.h"
@@ -99,6 +100,7 @@ void XtensaFrameLowering::emitPrologue(MachineFunction &MF,
99100
unsigned FP = RegInfo->getFrameRegister(MF);
100101
MachineModuleInfo &MMI = MF.getMMI();
101102
const MCRegisterInfo *MRI = MMI.getContext().getRegisterInfo();
103+
XtensaFunctionInfo *XtensaFI = MF.getInfo<XtensaFunctionInfo>();
102104

103105
// First, compute final stack size.
104106
uint64_t StackSize = MFI.getStackSize();
@@ -132,9 +134,11 @@ void XtensaFrameLowering::emitPrologue(MachineFunction &MF,
132134

133135
// Store FP register in A8, because FP may be used to pass function
134136
// arguments
135-
BuildMI(MBB, MBBI, dl, TII.get(Xtensa::OR), Xtensa::A8)
136-
.addReg(FP)
137-
.addReg(FP);
137+
if (XtensaFI->isSaveFrameRegister()) {
138+
BuildMI(MBB, MBBI, dl, TII.get(Xtensa::OR), Xtensa::A8)
139+
.addReg(FP)
140+
.addReg(FP);
141+
}
138142

139143
// if framepointer enabled, set it to point to the stack pointer.
140144
if (hasFP(MF)) {

llvm/lib/Target/Xtensa/XtensaISelLowering.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ SDValue XtensaTargetLowering::LowerFormalArguments(
778778
// so load argument from A8
779779
if (Subtarget.isWinABI() && (VA.getLocReg() == FrameReg)) {
780780
Reg = MF.addLiveIn(Xtensa::A8, RC);
781+
XtensaFI->setSaveFrameRegister();
781782
} else {
782783
Reg = MF.addLiveIn(VA.getLocReg(), RC);
783784
}
@@ -872,6 +873,7 @@ SDValue XtensaTargetLowering::LowerFormalArguments(
872873
// so load argument from A8
873874
if (ArgRegs[I] == FrameReg) {
874875
RegInfo.addLiveIn(Xtensa::A8, Reg);
876+
XtensaFI->setSaveFrameRegister();
875877
} else {
876878
RegInfo.addLiveIn(ArgRegs[I], Reg);
877879
}

llvm/lib/Target/Xtensa/XtensaMachineFunctionInfo.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class XtensaFunctionInfo : public MachineFunctionInfo {
2727
unsigned VarArgsFirstGPR;
2828
int VarArgsStackOffset;
2929
unsigned VarArgsFrameIndex;
30+
bool SaveFrameRegister = false;
3031

3132
public:
3233
explicit XtensaFunctionInfo(MachineFunction &MF)
@@ -45,6 +46,9 @@ class XtensaFunctionInfo : public MachineFunctionInfo {
4546
unsigned getVarArgsFrameIndex() const { return VarArgsFrameIndex; }
4647
void setVarArgsFrameIndex(unsigned FI) { VarArgsFrameIndex = FI; }
4748

49+
bool isSaveFrameRegister() const { return SaveFrameRegister; }
50+
void setSaveFrameRegister() { SaveFrameRegister = true; }
51+
4852
// TODO: large frame size definition should be specified more precisely
4953
bool isLargeFrame() {
5054
return (MF.getFrameInfo().estimateStackSize(MF) > 512) ? true : false;

0 commit comments

Comments
 (0)