RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 19:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Reland: [TII] Use optional destination and source pair as a return value; NFC

Browse Source 
Refactor usage of isCopyInstrImpl, isCopyInstr and isAddImmediate methods
to return optional machine operand pair of destination and source
registers.

Patch by Nikola Prica

Differential Revision: https://reviews.llvm.org/D69622
This commit is contained in:
Djordje Todorovic 2019-11-08 11:19:58 +01:00
parent bc6bcea218
commit 28aab49c05
13 changed files with 104 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
include/llvm/CodeGen/TargetInstrInfo.h
View File

@ -64,6 +64,14 @@ template <class T> class SmallVectorImpl;
using ParamLoadedValue = std::pair<MachineOperand, DIExpression*>;
struct DestSourcePair {
const MachineOperand *Destination;
const MachineOperand *Source;
DestSourcePair(const MachineOperand &Dest, const MachineOperand &Src)
: Destination(&Dest), Source(&Src) {}
};
//---------------------------------------------------------------------------
///
/// TargetInstrInfo - Interface to description of machine instruction set
@ -918,41 +926,36 @@ public:
}
protected:
/// Target-dependent implemenation for IsCopyInstr.
/// Target-dependent implementation for IsCopyInstr.
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
virtual bool isCopyInstrImpl(const MachineInstr &MI,
const MachineOperand *&Source,
const MachineOperand *&Destination) const {
return false;
/// value from one register to another register return destination and source
/// registers as machine operands.
virtual Optional<DestSourcePair>
isCopyInstrImpl(const MachineInstr &MI) const {
return None;
}
public:
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
/// For COPY-instruction the method naturally returns true, for all other
/// instructions the method calls target-dependent implementation.
bool isCopyInstr(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const {
/// value from one register to another register return destination and source
/// registers as machine operands.
/// For COPY-instruction the method naturally returns destination and source
/// registers as machine operands, for all other instructions the method calls
/// target-dependent implementation.
Optional<DestSourcePair> isCopyInstr(const MachineInstr &MI) const {
if (MI.isCopy()) {
Destination = &MI.getOperand(0);
Source = &MI.getOperand(1);
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
}
return isCopyInstrImpl(MI, Source, Destination);
return isCopyInstrImpl(MI);
}
/// If the specific machine instruction is an instruction that adds an
/// immediate value to its \c Source operand and stores it in \c Destination,
/// return true along with \c Destination and \c Source machine operand to
/// which \c Offset has been added.
virtual bool isAddImmediate(const MachineInstr &MI,
const MachineOperand *&Destination,
const MachineOperand *&Source,
int64_t &Offset) const {
return false;
/// immediate value to its source operand and stores it in destination,
/// return destination and source registers as machine operands along with
/// \c Offset which has been added.
virtual Optional<DestSourcePair> isAddImmediate(const MachineInstr &MI,
int64_t &Offset) const {
return None;
}
/// Store the specified register of the given register class to the specified

10
lib/CodeGen/LiveDebugValues.cpp
View File

@ -997,10 +997,14 @@ void LiveDebugValues::transferRegisterCopy(MachineInstr &MI,
OpenRangesSet &OpenRanges,
VarLocMap &VarLocIDs,
TransferMap &Transfers) {
const MachineOperand *SrcRegOp, *DestRegOp;
if (!TII->isCopyInstr(MI, SrcRegOp, DestRegOp) || !SrcRegOp->isKill() ||
!DestRegOp->isDef())
auto DestSrc = TII->isCopyInstr(MI);
if (!DestSrc)
return;
const MachineOperand *DestRegOp = DestSrc->Destination;
const MachineOperand *SrcRegOp = DestSrc->Source;
if (!SrcRegOp->isKill() || !DestRegOp->isDef())
return;
auto isCalleeSavedReg = [&](unsigned Reg) {

9
lib/CodeGen/TargetInstrInfo.cpp
View File

@ -1124,14 +1124,13 @@ Optional<ParamLoadedValue>
TargetInstrInfo::describeLoadedValue(const MachineInstr &MI) const {
const MachineFunction *MF = MI.getMF();
DIExpression *Expr = DIExpression::get(MF->getFunction().getContext(), {});
const MachineOperand *SrcRegOp, *DestRegOp;
int64_t Offset;
if (isCopyInstr(MI, SrcRegOp, DestRegOp)) {
return ParamLoadedValue(*SrcRegOp, Expr);
} else if (isAddImmediate(MI, DestRegOp, SrcRegOp, Offset)) {
if (auto DestSrc = isCopyInstr(MI)) {
return ParamLoadedValue(*DestSrc->Source, Expr);
} else if (auto DestSrc = isAddImmediate(MI, Offset)) {
Expr = DIExpression::prepend(Expr, DIExpression::ApplyOffset, Offset);
return ParamLoadedValue(*SrcRegOp, Expr);
return ParamLoadedValue(*DestSrc->Source, Expr);
}
return None;

30
lib/Target/AArch64/AArch64InstrInfo.cpp
View File

@ -5702,39 +5702,33 @@ bool AArch64InstrInfo::shouldOutlineFromFunctionByDefault(
return MF.getFunction().hasMinSize();
}
bool AArch64InstrInfo::isCopyInstrImpl(
const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const {
Optional<DestSourcePair>
AArch64InstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
// AArch64::ORRWrs and AArch64::ORRXrs with WZR/XZR reg
// and zero immediate operands used as an alias for mov instruction.
if (MI.getOpcode() == AArch64::ORRWrs &&
MI.getOperand(1).getReg() == AArch64::WZR &&
MI.getOperand(3).getImm() == 0x0) {
Destination = &MI.getOperand(0);
Source = &MI.getOperand(2);
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(2)};
}
if (MI.getOpcode() == AArch64::ORRXrs &&
MI.getOperand(1).getReg() == AArch64::XZR &&
MI.getOperand(3).getImm() == 0x0) {
Destination = &MI.getOperand(0);
Source = &MI.getOperand(2);
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(2)};
}
return false;
return None;
}
bool AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
const MachineOperand *&Destination,
const MachineOperand *&Source,
int64_t &Offset) const {
Optional<DestSourcePair>
AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
int64_t &Offset) const {
int Sign = 1;
switch (MI.getOpcode()) {
default:
return false;
return None;
case AArch64::SUBWri:
case AArch64::SUBXri:
case AArch64::SUBSWri:
@ -5748,16 +5742,14 @@ bool AArch64InstrInfo::isAddImmediate(const MachineInstr &MI,
// TODO: Third operand can be global address (usually some string).
if (!MI.getOperand(0).isReg() || !MI.getOperand(1).isReg() ||
!MI.getOperand(2).isImm())
return false;
Source = &MI.getOperand(1);
return None;
Offset = MI.getOperand(2).getImm() * Sign;
int Shift = MI.getOperand(3).getImm();
assert((Shift == 0 || Shift == 12) && "Shift can be either 0 or 12");
Offset = Offset << Shift;
}
}
Destination = &MI.getOperand(0);
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
}
Optional<ParamLoadedValue>

16
lib/Target/AArch64/AArch64InstrInfo.h
View File

@ -265,10 +265,8 @@ public:
/// on Windows.
static bool isSEHInstruction(const MachineInstr &MI);
bool isAddImmediate(const MachineInstr &MI,
const MachineOperand *&Destination,
const MachineOperand *&Source,
int64_t &Offset) const override;
Optional<DestSourcePair> isAddImmediate(const MachineInstr &MI,
int64_t &Offset) const override;
Optional<ParamLoadedValue>
describeLoadedValue(const MachineInstr &MI) const override;
@ -277,11 +275,11 @@ public:
#include "AArch64GenInstrInfo.inc"
protected:
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
bool isCopyInstrImpl(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const override;
/// If the specific machine instruction is an instruction that moves/copies
/// value from one register to another register return destination and source
/// registers as machine operands.
Optional<DestSourcePair>
isCopyInstrImpl(const MachineInstr &MI) const override;
private:
/// Sets the offsets on outlined instructions in \p MBB which use SP

26
lib/Target/ARM/ARMBaseInstrInfo.cpp
View File

@ -993,9 +993,8 @@ void ARMBaseInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
Mov->addRegisterKilled(SrcReg, TRI);
}
bool ARMBaseInstrInfo::isCopyInstrImpl(const MachineInstr &MI,
const MachineOperand *&Src,
const MachineOperand *&Dest) const {
Optional<DestSourcePair>
ARMBaseInstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
// VMOVRRD is also a copy instruction but it requires
// special way of handling. It is more complex copy version
// and since that we are not considering it. For recognition
@ -1006,10 +1005,8 @@ bool ARMBaseInstrInfo::isCopyInstrImpl(const MachineInstr &MI,
if (!MI.isMoveReg() ||
(MI.getOpcode() == ARM::VORRq &&
MI.getOperand(1).getReg() != MI.getOperand(2).getReg()))
return false;
Dest = &MI.getOperand(0);
Src = &MI.getOperand(1);
return true;
return None;
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
}
const MachineInstrBuilder &
@ -5350,10 +5347,9 @@ ARMBaseInstrInfo::getSerializableBitmaskMachineOperandTargetFlags() const {
return makeArrayRef(TargetFlags);
}
bool ARMBaseInstrInfo::isAddImmediate(const MachineInstr &MI,
const MachineOperand *&Destination,
const MachineOperand *&Source,
int64_t &Offset) const {
Optional<DestSourcePair>
ARMBaseInstrInfo::isAddImmediate(const MachineInstr &MI,
int64_t &Offset) const {
int Sign = 1;
unsigned Opcode = MI.getOpcode();
@ -5361,19 +5357,17 @@ bool ARMBaseInstrInfo::isAddImmediate(const MachineInstr &MI,
if (Opcode == ARM::SUBri)
Sign = -1;
else if (Opcode != ARM::ADDri)
return false;
return None;
// TODO: Third operand can be global address (usually some string). Since
// strings can be relocated we cannot calculate their offsets for
// now.
if (!MI.getOperand(0).isReg() || !MI.getOperand(1).isReg() ||
!MI.getOperand(2).isImm())
return false;
return None;
Destination = &MI.getOperand(0);
Source = &MI.getOperand(1);
Offset = MI.getOperand(2).getImm() * Sign;
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
}
bool llvm::registerDefinedBetween(unsigned Reg,

17
lib/Target/ARM/ARMBaseInstrInfo.h
View File

@ -99,12 +99,11 @@ protected:
MachineInstr *commuteInstructionImpl(MachineInstr &MI, bool NewMI,
unsigned OpIdx1,
unsigned OpIdx2) const override;
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
bool isCopyInstrImpl(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const override;
/// If the specific machine instruction is an instruction that moves/copies
/// value from one register to another register return destination and source
/// registers as machine operands.
Optional<DestSourcePair>
isCopyInstrImpl(const MachineInstr &MI) const override;
public:
// Return whether the target has an explicit NOP encoding.
@ -456,10 +455,8 @@ public:
return MI.getOperand(3).getReg();
}
bool isAddImmediate(const MachineInstr &MI,
const MachineOperand *&Destination,
const MachineOperand *&Source,
int64_t &Offset) const override;
Optional<DestSourcePair> isAddImmediate(const MachineInstr &MI,
int64_t &Offset) const override;
};
/// Get the operands corresponding to the given \p Pred value. By default, the

14
lib/Target/Mips/Mips16InstrInfo.cpp
View File

@ -96,15 +96,11 @@ void Mips16InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
MIB.addReg(SrcReg, getKillRegState(KillSrc));
}
bool Mips16InstrInfo::isCopyInstrImpl(const MachineInstr &MI,
const MachineOperand *&Src,
const MachineOperand *&Dest) const {
if (MI.isMoveReg()) {
Dest = &MI.getOperand(0);
Src = &MI.getOperand(1);
return true;
}
return false;
Optional<DestSourcePair>
Mips16InstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
if (MI.isMoveReg())
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
return None;
}
void Mips16InstrInfo::storeRegToStack(MachineBasicBlock &MBB,

7
lib/Target/Mips/Mips16InstrInfo.h
View File

@ -104,10 +104,9 @@ public:
protected:
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
bool isCopyInstrImpl(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const override;
/// value from one register to another register return destination and source
/// registers as machine operands.
Optional<DestSourcePair> isCopyInstrImpl(const MachineInstr &MI) const override;
private:
unsigned getAnalyzableBrOpc(unsigned Opc) const override;

23
lib/Target/Mips/MipsSEInstrInfo.cpp
View File

@ -221,29 +221,24 @@ static bool isReadOrWriteToDSPReg(const MachineInstr &MI, bool &isWrite) {
/// We check for the common case of 'or', as it's MIPS' preferred instruction
/// for GPRs but we have to check the operands to ensure that is the case.
/// Other move instructions for MIPS are directly identifiable.
bool MipsSEInstrInfo::isCopyInstrImpl(const MachineInstr &MI,
const MachineOperand *&Src,
const MachineOperand *&Dest) const {
Optional<DestSourcePair>
MipsSEInstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
bool isDSPControlWrite = false;
// Condition is made to match the creation of WRDSP/RDDSP copy instruction
// from copyPhysReg function.
if (isReadOrWriteToDSPReg(MI, isDSPControlWrite)) {
if (!MI.getOperand(1).isImm() || MI.getOperand(1).getImm() != (1<<4))
return false;
if (!MI.getOperand(1).isImm() || MI.getOperand(1).getImm() != (1 << 4))
return None;
else if (isDSPControlWrite) {
Src = &MI.getOperand(0);
Dest = &MI.getOperand(2);
return DestSourcePair{MI.getOperand(2), MI.getOperand(0)};
} else {
Dest = &MI.getOperand(0);
Src = &MI.getOperand(2);
return DestSourcePair{MI.getOperand(0), MI.getOperand(2)};
}
return true;
} else if (MI.isMoveReg() || isORCopyInst(MI)) {
Dest = &MI.getOperand(0);
Src = &MI.getOperand(1);
return true;
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
}
return false;
return None;
}
void MipsSEInstrInfo::

8
lib/Target/Mips/MipsSEInstrInfo.h
View File

@ -77,10 +77,10 @@ public:
protected:
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
bool isCopyInstrImpl(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const override;
/// value from one register to another register return destination and source
/// registers as machine operands.
Optional<DestSourcePair>
isCopyInstrImpl(const MachineInstr &MI) const override;
private:
unsigned getAnalyzableBrOpc(unsigned Opc) const override;

14
lib/Target/X86/X86InstrInfo.cpp
View File

@ -3046,15 +3046,11 @@ void X86InstrInfo::copyPhysReg(MachineBasicBlock &MBB,
report_fatal_error("Cannot emit physreg copy instruction");
}
bool X86InstrInfo::isCopyInstrImpl(const MachineInstr &MI,
const MachineOperand *&Src,
const MachineOperand *&Dest) const {
if (MI.isMoveReg()) {
Dest = &MI.getOperand(0);
Src = &MI.getOperand(1);
return true;
}
return false;
Optional<DestSourcePair>
X86InstrInfo::isCopyInstrImpl(const MachineInstr &MI) const {
if (MI.isMoveReg())
return DestSourcePair{MI.getOperand(0), MI.getOperand(1)};
return None;
}
static unsigned getLoadStoreRegOpcode(unsigned Reg,

8
lib/Target/X86/X86InstrInfo.h
View File

@ -542,10 +542,10 @@ protected:
unsigned CommuteOpIdx2) const override;
/// If the specific machine instruction is a instruction that moves/copies
/// value from one register to another register return true along with
/// @Source machine operand and @Destination machine operand.
bool isCopyInstrImpl(const MachineInstr &MI, const MachineOperand *&Source,
const MachineOperand *&Destination) const override;
/// value from one register to another register return destination and source
/// registers as machine operands.
Optional<DestSourcePair>
isCopyInstrImpl(const MachineInstr &MI) const override;
private:
/// This is a helper for convertToThreeAddress for 8 and 16-bit instructions.