[Xtensa] Fix MOVSP pseudo operation.

Author: andreisfr

llvm/lib/Target/Xtensa/XtensaISelLowering.cpp

@@ -900,7 +900,6 @@ SDValue XtensaTargetLowering::LowerSTACKRESTORE(SDValue Op,
 
   if (Subtarget.isWindowedABI()) {
     return DAG.getNode(XtensaISD::MOVSP, SDLoc(Op), MVT::Other, Chain,
-                       DAG.getRegister(Xtensa::SP, NewSP.getValueType()),
                        NewSP);
   }
 
@@ -947,7 +946,7 @@ SDValue XtensaTargetLowering::LowerDYNAMIC_STACKALLOC(SDValue Op,
   SDValue NewSP = DAG.getNode(ISD::SUB, DL, VT, SP, SizeRoundUp); // Value
   if (Subtarget.isWindowedABI()) {
     Chain = DAG.getNode(XtensaISD::MOVSP, SDLoc(Op), MVT::Other, SP.getValue(1),
-                        DAG.getRegister(SPReg, NewSP.getValueType()), NewSP);
+                        NewSP);
   } else {
     Chain = DAG.getCopyToReg(SP.getValue(1), DL, SPReg, NewSP); // Output chain
   }
@@ -1390,10 +1389,9 @@ MachineBasicBlock *XtensaTargetLowering::EmitInstrWithCustomInserter(
     return MBB;
   }
   case Xtensa::MOVSP_P: {
-    MachineOperand SP = MI.getOperand(0);
-    MachineOperand NewSP = MI.getOperand(1);
+    MachineOperand &NewSP = MI.getOperand(0);
 
-    BuildMI(*MBB, MI, DL, TII.get(Xtensa::MOVSP), SP.getReg())
+    BuildMI(*MBB, MI, DL, TII.get(Xtensa::MOVSP), Xtensa::SP)
         .addReg(NewSP.getReg());
     MI.eraseFromParent();
 

llvm/lib/Target/Xtensa/XtensaInstrInfo.td

@@ -725,9 +725,9 @@ def MOVSP : RRR_Inst<0x00, 0x00, 0x00, (outs AR:$t), (ins AR:$s),
 
 // Use this pseudo operation instead of getCopyToReg function to
 // update SP register.
-let usesCustomInserter = 1, Predicates = [HasWindowed] in {
-  def MOVSP_P : Pseudo<(outs), (ins AR:$t, AR:$s),
-                      "!movsp_p\t$t, $s", [(Xtensa_movsp AR:$t, AR:$s)]>;
+let usesCustomInserter = 1, Defs = [SP], Predicates = [HasWindowed] in {
+  def MOVSP_P : Pseudo<(outs), (ins AR:$s),
+                      "!movsp_p\tsp, $s", [(Xtensa_movsp AR:$s)]>;
 }
 
 let isReturn = 1, isTerminator = 1,

llvm/lib/Target/Xtensa/XtensaOperators.td

@@ -31,7 +31,7 @@ def SDT_XtensaSRC                 : SDTypeProfile<1, 3, [SDTCisVT<0, i32>, SDTCi
 def SDT_XtensaEXTUI               : SDTypeProfile<1, 3, [SDTCisVT<0, i32>, SDTCisVT<1, i32>,
                                                          SDTCisVT<2, i32>, SDTCisVT<3, i32>]>;
 
-def SDT_XtensaMOVSP               : SDTypeProfile<0, 2, [SDTCisSameAs<0, 1>, SDTCisVT<0, i32>]>;
+def SDT_XtensaMOVSP               : SDTypeProfile<0, 1, [SDTCisVT<0, i32>]>;
 
 //===----------------------------------------------------------------------===//
 // Node definitions