From 744b3a5acdbd4d0fac9c6a7c9ad702502cc3cc37 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Sun, 11 Jul 2010 17:01:17 +0000 Subject: [PATCH] Remove TargetInstrInfo::copyRegToReg entirely. Targets must now implement TargetInstrInfo::copyPhysReg instead. There is no longer a default implementation forwarding to copyRegToReg. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108095 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/WritingAnLLVMBackend.html | 3 ++- include/llvm/Target/TargetInstrInfo.h | 20 +++----------------- include/llvm/Target/TargetOpcodes.h | 3 +-- lib/CodeGen/TargetInstrInfoImpl.cpp | 17 ----------------- test/CodeGen/Blackfin/cmp64.ll | 4 ++-- test/TableGen/TargetInstrInfo.td | 3 +-- 6 files changed, 9 insertions(+), 41 deletions(-) diff --git a/docs/WritingAnLLVMBackend.html b/docs/WritingAnLLVMBackend.html index d909a1a3fb7..077dea0ed62 100644 --- a/docs/WritingAnLLVMBackend.html +++ b/docs/WritingAnLLVMBackend.html @@ -1310,7 +1310,8 @@ implementation in SparcInstrInfo.cpp: a direct store to a stack slot, return the register number of the destination and the FrameIndex of the stack slot. -
  • copyRegToReg — Copy values between a pair of registers.
    • +
  • copyPhysReg — Copy values between a pair of physical + registers.
  • storeRegToStackSlot — Store a register value to a stack slot.
    • diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h index 6a4573b4fde..6e699143205 100644 --- a/include/llvm/Target/TargetInstrInfo.h +++ b/include/llvm/Target/TargetInstrInfo.h @@ -357,7 +357,9 @@ public: virtual void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI, DebugLoc DL, unsigned DestReg, unsigned SrcReg, - bool KillSrc) const =0; + bool KillSrc) const { + assert(0 && "Target didn't implement TargetInstrInfo::copyPhysReg!"); + } /// storeRegToStackSlot - Store the specified register of the given register /// class to the specified stack frame index. The store instruction is to be @@ -648,22 +650,6 @@ public: virtual ScheduleHazardRecognizer * CreateTargetPostRAHazardRecognizer(const InstrItineraryData&) const; - virtual void copyPhysReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, DebugLoc DL, - unsigned DestReg, unsigned SrcReg, - bool KillSrc) const; - /// copyRegToReg - Legacy hook going away soon. Targets should implement - /// copyPhysReg instead. - virtual bool copyRegToReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - unsigned DestReg, unsigned SrcReg, - const TargetRegisterClass *DestRC, - const TargetRegisterClass *SrcRC, - DebugLoc DL) const { - assert(0 && "Target didn't implement TargetInstrInfo::copyPhysReg!"); - return false; - } - }; } // End llvm namespace diff --git a/include/llvm/Target/TargetOpcodes.h b/include/llvm/Target/TargetOpcodes.h index e710c702194..cb772ecd77d 100644 --- a/include/llvm/Target/TargetOpcodes.h +++ b/include/llvm/Target/TargetOpcodes.h @@ -62,8 +62,7 @@ namespace TargetOpcode { /// used between instruction selection and MachineInstr creation, before /// virtual registers have been created for all the instructions, and it's /// only needed in cases where the register classes implied by the - /// instructions are insufficient. The actual MachineInstrs to perform - /// the copy are emitted with the TargetInstrInfo::copyRegToReg hook. + /// instructions are insufficient. It is emitted as a COPY MachineInstr. COPY_TO_REGCLASS = 10, /// DBG_VALUE - a mapping of the llvm.dbg.value intrinsic diff --git a/lib/CodeGen/TargetInstrInfoImpl.cpp b/lib/CodeGen/TargetInstrInfoImpl.cpp index 56cb4b19b8c..5b1d5a62ffb 100644 --- a/lib/CodeGen/TargetInstrInfoImpl.cpp +++ b/lib/CodeGen/TargetInstrInfoImpl.cpp @@ -438,20 +438,3 @@ ScheduleHazardRecognizer *TargetInstrInfoImpl:: CreateTargetPostRAHazardRecognizer(const InstrItineraryData &II) const { return (ScheduleHazardRecognizer *)new PostRAHazardRecognizer(II); } - -// Default implementation of copyPhysReg using copyRegToReg. -void TargetInstrInfoImpl::copyPhysReg(MachineBasicBlock &MBB, - MachineBasicBlock::iterator MI, - DebugLoc DL, - unsigned DestReg, unsigned SrcReg, - bool KillSrc) const { - assert(TargetRegisterInfo::isPhysicalRegister(DestReg)); - assert(TargetRegisterInfo::isPhysicalRegister(SrcReg)); - const TargetRegisterInfo *TRI = MBB.getParent()->getTarget().getRegisterInfo(); - const TargetRegisterClass *DRC = TRI->getPhysicalRegisterRegClass(DestReg); - const TargetRegisterClass *SRC = TRI->getPhysicalRegisterRegClass(SrcReg); - if (!copyRegToReg(MBB, MI, DestReg, SrcReg, DRC, SRC, DL)) - llvm_unreachable("Cannot emit physreg copy instruction"); - if (KillSrc) - llvm::prior(MI)->addRegisterKilled(SrcReg, TRI, true); -} diff --git a/test/CodeGen/Blackfin/cmp64.ll b/test/CodeGen/Blackfin/cmp64.ll index ef5bf45861d..6c4f9c5bd7f 100644 --- a/test/CodeGen/Blackfin/cmp64.ll +++ b/test/CodeGen/Blackfin/cmp64.ll @@ -1,8 +1,8 @@ ; RUN: llc < %s -march=bfin ; This test tries to use a JustCC register as a data operand for MOVEcc. It -; calls copyRegToReg(JustCC -> DP), failing because JustCC can only be copied to -; D. The proper solution would be to restrict the virtual register to D only. +; copies (JustCC -> DP), failing because JustCC can only be copied to D. +; The proper solution would be to restrict the virtual register to D only. define i32 @main() { entry: diff --git a/test/TableGen/TargetInstrInfo.td b/test/TableGen/TargetInstrInfo.td index 2871eb81df9..146ef6fd768 100644 --- a/test/TableGen/TargetInstrInfo.td +++ b/test/TableGen/TargetInstrInfo.td @@ -83,8 +83,7 @@ class Inst opcode, // the pattern. // 6. Address expressions should become first-class entities. -// Simple copy instruction. isMoveInstr could easily be inferred from this, -// as could TargetRegisterInfo::copyRegToReg. +// Simple copy instruction. def MOV8rr : Inst<(ops R8:$dst, R8:$src), "mov $dst, $src", 0x88, MRMDestReg, [(set R8:$dst, R8:$src)]>; -- 2.34.1