Commit 20dfe051 authored by Craig Topper's avatar Craig Topper
Browse files

[RISCV] Move the $rs operand of PseudoStore from outs to ins. NFC 

This is the data to be stored so it should be an input.

To keep operand order similar between loads and stores, move the temp
register to the first dest operand of floating point loads. Rework
the assembler code accordingly.

This doesn't have any functional effect because this Pseudo is only
used by the assembler which doesn't use ins/outs.

Reviewed By: luismarques

Differential Revision: https://reviews.llvm.org/D107309
parent 2167e237

llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2339,10 +2339,10 @@ void RISCVAsmParser::emitLoadStoreSymbol(MCInst &Inst, unsigned Opcode, 
  //

  //   TmpLabel: AUIPC tmp, %pcrel_hi(symbol)

  //             [S|L]X    rd, %pcrel_lo(TmpLabel)(tmp)

  MCOperand DestReg = Inst.getOperand(0);

  unsigned DestRegOpIdx = HasTmpReg ? 1 : 0;

  MCOperand DestReg = Inst.getOperand(DestRegOpIdx);

  unsigned SymbolOpIdx = HasTmpReg ? 2 : 1;

  unsigned TmpRegOpIdx = HasTmpReg ? 1 : 0;

  MCOperand TmpReg = Inst.getOperand(TmpRegOpIdx);

  MCOperand TmpReg = Inst.getOperand(0);

  const MCExpr *Symbol = Inst.getOperand(SymbolOpIdx).getExpr();

  emitAuipcInstPair(DestReg, TmpReg, Symbol, RISCVMCExpr::VK_RISCV_PCREL_HI,

                    Opcode, IDLoc, Out);

llvm/lib/Target/RISCV/RISCVInstrFormats.td

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ class PseudoLoad<string opcodestr, RegisterClass rdty = GPR> 
}



class PseudoFloatLoad<string opcodestr, RegisterClass rdty = GPR>

    : Pseudo<(outs rdty:$rd, GPR:$tmp), (ins bare_symbol:$addr), [], opcodestr, "$rd, $addr, $tmp"> {

    : Pseudo<(outs GPR:$tmp, rdty:$rd), (ins bare_symbol:$addr), [], opcodestr, "$rd, $addr, $tmp"> {

  let hasSideEffects = 0;

  let mayLoad = 1;

  let mayStore = 0;
@@ -212,7 +212,7 @@ class PseudoFloatLoad<string opcodestr, RegisterClass rdty = GPR> 


// Pseudo store instructions.

class PseudoStore<string opcodestr, RegisterClass rsty = GPR>

    : Pseudo<(outs rsty:$rs, GPR:$tmp), (ins bare_symbol:$addr), [], opcodestr, "$rs, $addr, $tmp"> {

    : Pseudo<(outs GPR:$tmp), (ins rsty:$rs, bare_symbol:$addr), [], opcodestr, "$rs, $addr, $tmp"> {

  let hasSideEffects = 0;

  let mayLoad = 0;

  let mayStore = 1;