[m88k] Handle G_FRAME_INDEX in .td file

Uses the new TableGen construct to move this lowering to the target description.
redstar · Apr 30, 2024 · 7eaee03 · 7eaee03
1 parent c282a74
commit 7eaee03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/llvm/lib/Target/M88k/GISel/M88kInstructionSelector.cpp b/llvm/lib/Target/M88k/GISel/M88kInstructionSelector.cpp
@@ -110,8 +110,6 @@ class M88kInstructionSelector : public InstructionSelector {
   ComplexRendererFns selectAddrRegScaled(MachineOperand &Root) const;
 #endif
 
-  bool selectFrameIndex(MachineInstr &I, MachineBasicBlock &MBB,
-                        MachineRegisterInfo &MRI) const;
   bool selectVaStart(MachineInstr &I, MachineBasicBlock &MBB,
                      MachineRegisterInfo &MRI) const;
   bool selectGlobalValue(MachineInstr &I, MachineBasicBlock &MBB,
@@ -465,16 +463,6 @@ M88kInstructionSelector::selectAddrRegScaled(MachineOperand &Root) const {
 }
 #endif
 
-bool M88kInstructionSelector::selectFrameIndex(MachineInstr &I,
-                                               MachineBasicBlock &MBB,
-                                               MachineRegisterInfo &MRI) const {
-  assert(I.getOpcode() == TargetOpcode::G_FRAME_INDEX && "Unexpected G code");
-
-  I.setDesc(TII.get(M88k::ADDri));
-  I.addOperand(MachineOperand::CreateImm(0));
-  return constrainSelectedInstRegOperands(I, MRI, TII, TRI, RBI);
-}
-
 bool M88kInstructionSelector::selectVaStart(MachineInstr &I,
                                                MachineBasicBlock &MBB,
                                                MachineRegisterInfo &MRI) const {
@@ -1323,8 +1311,6 @@ bool M88kInstructionSelector::select(MachineInstr &I) {
     return selectGlobalValue(I, MBB, MRI);
   case TargetOpcode::G_PTRMASK:
     return selectPtrMask(I, MBB, MRI);
-  case TargetOpcode::G_FRAME_INDEX:
-    return selectFrameIndex(I, MBB, MRI);
   case TargetOpcode::G_VASTART:
     return selectVaStart(I, MBB, MRI);
   case TargetOpcode::G_SEXT_INREG:

diff --git a/llvm/lib/Target/M88k/M88kInstrInfo.td b/llvm/lib/Target/M88k/M88kInstrInfo.td
@@ -466,6 +466,8 @@ def : Pat<(ptradd GPROpnd:$rs1, uimm16:$imm),
 def : Pat<(ptradd GPROpnd:$rs1, GPROpnd:$rs2),
           (ADDUrr GPROpnd:$rs1, GPROpnd:$rs2)>;
 
+def : Pat<(p0 frameindex:$fi), (ADDri tframeindex:$fi, 0)>;
+
 // ---------------------------------------------------------------------------//
 // Materialize immediates & constants.
 // ---------------------------------------------------------------------------//

diff --git a/llvm/test/CodeGen/M88k/vararg.ll b/llvm/test/CodeGen/M88k/vararg.ll
@@ -25,8 +25,7 @@ define i32 @sum(i32 noundef %num_args, ...) {
 ; CHECK-NEXT:    st %r3, %r2, 0
 ; CHECK-NEXT:    add %r3, %r31, 56
 ; CHECK-NEXT:    st %r3, %r2, 4
-; CHECK-NEXT:    add %r3, %r31, 24
-; CHECK-NEXT:    st %r3, %r2, 8
+; CHECK-NEXT:    st %r10, %r2, 8
 ; CHECK-NEXT:    ld %r2, %r31, 16
 ; CHECK-NEXT:    addu %r31, %r31, 56
 ; CHECK-NEXT:    jmp %r1