forked from OSchip/llvm-project
Revert for: [AMDGPU]: PHI Elimination hooks added for custom COPY insertion.
llvm-svn: 371873
This commit is contained in:
Alexander Timofeev
parent
713da8db39
commit
9ff70132bf
|
|
@ -22,7 +22,6 @@
|
|||
#include "llvm/CodeGen/MachineCombinerPattern.h"
|
||||
#include "llvm/CodeGen/MachineFunction.h"
|
||||
#include "llvm/CodeGen/MachineInstr.h"
|
||||
#include "llvm/CodeGen/MachineInstrBuilder.h"
|
||||
#include "llvm/CodeGen/MachineLoopInfo.h"
|
||||
#include "llvm/CodeGen/MachineOperand.h"
|
||||
#include "llvm/CodeGen/MachineOutliner.h"
|
||||
|
|
@ -1639,28 +1638,6 @@ public:
|
|||
return false;
|
||||
}
|
||||
|
||||
/// During PHI eleimination lets target to make necessary checks and
|
||||
/// insert the copy to the PHI destination register in a target specific
|
||||
/// manner.
|
||||
virtual MachineInstr *createPHIDestinationCopy(
|
||||
MachineBasicBlock &MBB, MachineBasicBlock::iterator InsPt,
|
||||
const DebugLoc &DL, Register Src, Register Dst) const {
|
||||
return BuildMI(MBB, InsPt, DL, get(TargetOpcode::COPY), Dst)
|
||||
.addReg(Src);
|
||||
}
|
||||
|
||||
/// During PHI eleimination lets target to make necessary checks and
|
||||
/// insert the copy to the PHI destination register in a target specific
|
||||
/// manner.
|
||||
virtual MachineInstr *createPHISourceCopy(MachineBasicBlock &MBB,
|
||||
MachineBasicBlock::iterator InsPt,
|
||||
const DebugLoc &DL, Register Src,
|
||||
Register SrcSubReg,
|
||||
Register Dst) const {
|
||||
return BuildMI(MBB, InsPt, DL, get(TargetOpcode::COPY), Dst)
|
||||
.addReg(Src, 0, SrcSubReg);
|
||||
}
|
||||
|
||||
/// Returns a \p outliner::OutlinedFunction struct containing target-specific
|
||||
/// information for a set of outlining candidates.
|
||||
virtual outliner::OutlinedFunction getOutliningCandidateInfo(
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@
|
|||
#include "llvm/CodeGen/MachineRegisterInfo.h"
|
||||
#include "llvm/CodeGen/SlotIndexes.h"
|
||||
#include "llvm/CodeGen/TargetInstrInfo.h"
|
||||
#include "llvm/CodeGen/TargetLowering.h"
|
||||
#include "llvm/CodeGen/TargetOpcodes.h"
|
||||
#include "llvm/CodeGen/TargetPassConfig.h"
|
||||
#include "llvm/CodeGen/TargetRegisterInfo.h"
|
||||
#include "llvm/CodeGen/TargetSubtargetInfo.h"
|
||||
#include "llvm/Pass.h"
|
||||
|
|
@ -254,12 +252,11 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
// Insert a register to register copy at the top of the current block (but
|
||||
// after any remaining phi nodes) which copies the new incoming register
|
||||
// into the phi node destination.
|
||||
MachineInstr *PHICopy = nullptr;
|
||||
const TargetInstrInfo *TII = MF.getSubtarget().getInstrInfo();
|
||||
if (allPhiOperandsUndefined(*MPhi, *MRI))
|
||||
// If all sources of a PHI node are implicit_def or undef uses, just emit an
|
||||
// implicit_def instead of a copy.
|
||||
PHICopy = BuildMI(MBB, AfterPHIsIt, MPhi->getDebugLoc(),
|
||||
BuildMI(MBB, AfterPHIsIt, MPhi->getDebugLoc(),
|
||||
TII->get(TargetOpcode::IMPLICIT_DEF), DestReg);
|
||||
else {
|
||||
// Can we reuse an earlier PHI node? This only happens for critical edges,
|
||||
|
|
@ -276,13 +273,15 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
const TargetRegisterClass *RC = MF.getRegInfo().getRegClass(DestReg);
|
||||
entry = IncomingReg = MF.getRegInfo().createVirtualRegister(RC);
|
||||
}
|
||||
// Give the target possiblity to handle special cases fallthrough otherwise
|
||||
PHICopy = TII->createPHIDestinationCopy(MBB, AfterPHIsIt, MPhi->getDebugLoc(),
|
||||
IncomingReg, DestReg);
|
||||
BuildMI(MBB, AfterPHIsIt, MPhi->getDebugLoc(),
|
||||
TII->get(TargetOpcode::COPY), DestReg)
|
||||
.addReg(IncomingReg);
|
||||
}
|
||||
|
||||
// Update live variable information if there is any.
|
||||
if (LV) {
|
||||
MachineInstr &PHICopy = *std::prev(AfterPHIsIt);
|
||||
|
||||
if (IncomingReg) {
|
||||
LiveVariables::VarInfo &VI = LV->getVarInfo(IncomingReg);
|
||||
|
||||
|
|
@ -303,7 +302,7 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
// killed. Note that because the value is defined in several places (once
|
||||
// each for each incoming block), the "def" block and instruction fields
|
||||
// for the VarInfo is not filled in.
|
||||
LV->addVirtualRegisterKilled(IncomingReg, *PHICopy);
|
||||
LV->addVirtualRegisterKilled(IncomingReg, PHICopy);
|
||||
}
|
||||
|
||||
// Since we are going to be deleting the PHI node, if it is the last use of
|
||||
|
|
@ -313,14 +312,15 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
|
||||
// If the result is dead, update LV.
|
||||
if (isDead) {
|
||||
LV->addVirtualRegisterDead(DestReg, *PHICopy);
|
||||
LV->addVirtualRegisterDead(DestReg, PHICopy);
|
||||
LV->removeVirtualRegisterDead(DestReg, *MPhi);
|
||||
}
|
||||
}
|
||||
|
||||
// Update LiveIntervals for the new copy or implicit def.
|
||||
if (LIS) {
|
||||
SlotIndex DestCopyIndex = LIS->InsertMachineInstrInMaps(*PHICopy);
|
||||
SlotIndex DestCopyIndex =
|
||||
LIS->InsertMachineInstrInMaps(*std::prev(AfterPHIsIt));
|
||||
|
||||
SlotIndex MBBStartIndex = LIS->getMBBStartIdx(&MBB);
|
||||
if (IncomingReg) {
|
||||
|
|
@ -406,9 +406,9 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
if (DefMI->isImplicitDef())
|
||||
ImpDefs.insert(DefMI);
|
||||
} else {
|
||||
NewSrcInstr =
|
||||
TII->createPHISourceCopy(opBlock, InsertPos, MPhi->getDebugLoc(),
|
||||
SrcReg, SrcSubReg, IncomingReg);
|
||||
NewSrcInstr = BuildMI(opBlock, InsertPos, MPhi->getDebugLoc(),
|
||||
TII->get(TargetOpcode::COPY), IncomingReg)
|
||||
.addReg(SrcReg, 0, SrcSubReg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -457,7 +457,7 @@ void PHIElimination::LowerPHINode(MachineBasicBlock &MBB,
|
|||
}
|
||||
} else {
|
||||
// We just inserted this copy.
|
||||
KillInst = NewSrcInstr;
|
||||
KillInst = std::prev(InsertPos);
|
||||
}
|
||||
}
|
||||
assert(KillInst->readsRegister(SrcReg) && "Cannot find kill instruction");
|
||||
|
|
|
|||
|
|
@ -6410,33 +6410,3 @@ bool llvm::execMayBeModifiedBeforeAnyUse(const MachineRegisterInfo &MRI,
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
MachineInstr *SIInstrInfo::createPHIDestinationCopy(
|
||||
MachineBasicBlock &MBB, MachineBasicBlock::iterator LastPHIIt,
|
||||
const DebugLoc &DL, Register Src, Register Dst) const {
|
||||
auto Cur = MBB.begin();
|
||||
while (Cur != MBB.end()) {
|
||||
if (!Cur->isPHI() && Cur->readsRegister(Dst))
|
||||
return BuildMI(MBB, Cur, DL, get(TargetOpcode::COPY), Dst).addReg(Src);
|
||||
++Cur;
|
||||
if (Cur == LastPHIIt)
|
||||
break;
|
||||
}
|
||||
|
||||
return TargetInstrInfo::createPHIDestinationCopy(MBB, LastPHIIt, DL, Src,
|
||||
Dst);
|
||||
}
|
||||
|
||||
MachineInstr *SIInstrInfo::createPHISourceCopy(
|
||||
MachineBasicBlock &MBB, MachineBasicBlock::iterator InsPt,
|
||||
const DebugLoc &DL, Register Src, Register SrcSubReg, Register Dst) const {
|
||||
if (InsPt != MBB.end() && InsPt->isPseudo() && InsPt->definesRegister(Src)) {
|
||||
InsPt++;
|
||||
return BuildMI(MBB, InsPt, InsPt->getDebugLoc(), get(TargetOpcode::COPY),
|
||||
Dst)
|
||||
.addReg(Src, 0, SrcSubReg)
|
||||
.addReg(AMDGPU::EXEC, RegState::Implicit);
|
||||
}
|
||||
return TargetInstrInfo::createPHISourceCopy(MBB, InsPt, DL, Src, SrcSubReg,
|
||||
Dst);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -954,17 +954,6 @@ public:
|
|||
|
||||
bool isBasicBlockPrologue(const MachineInstr &MI) const override;
|
||||
|
||||
MachineInstr *createPHIDestinationCopy(MachineBasicBlock &MBB,
|
||||
MachineBasicBlock::iterator InsPt,
|
||||
const DebugLoc &DL, Register Src,
|
||||
Register Dst) const override;
|
||||
|
||||
MachineInstr *createPHISourceCopy(MachineBasicBlock &MBB,
|
||||
MachineBasicBlock::iterator InsPt,
|
||||
const DebugLoc &DL, Register Src,
|
||||
Register SrcSubReg,
|
||||
Register Dst) const override;
|
||||
|
||||
/// Return a partially built integer add instruction without carry.
|
||||
/// Caller must add source operands.
|
||||
/// For pre-GFX9 it will generate unused carry destination operand.
|
||||
|
|
|
|||
|
|
@ -400,17 +400,13 @@ void SILowerControlFlow::emitLoop(MachineInstr &MI) {
|
|||
|
||||
void SILowerControlFlow::emitEndCf(MachineInstr &MI) {
|
||||
MachineBasicBlock &MBB = *MI.getParent();
|
||||
MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
|
||||
unsigned CFMask = MI.getOperand(0).getReg();
|
||||
MachineInstr *Def = MRI.getUniqueVRegDef(CFMask);
|
||||
const DebugLoc &DL = MI.getDebugLoc();
|
||||
|
||||
MachineBasicBlock::iterator InsPt =
|
||||
Def && Def->getParent() == &MBB ? std::next(MachineBasicBlock::iterator(Def))
|
||||
: MBB.begin();
|
||||
MachineInstr *NewMI = BuildMI(MBB, InsPt, DL, TII->get(OrOpc), Exec)
|
||||
.addReg(Exec)
|
||||
.add(MI.getOperand(0));
|
||||
MachineBasicBlock::iterator InsPt = MBB.begin();
|
||||
MachineInstr *NewMI =
|
||||
BuildMI(MBB, InsPt, DL, TII->get(OrOpc), Exec)
|
||||
.addReg(Exec)
|
||||
.add(MI.getOperand(0));
|
||||
|
||||
if (LIS)
|
||||
LIS->ReplaceMachineInstrInMaps(MI, *NewMI);
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ body: |
|
|||
|
||||
# CHECK-LABEL: name: foo
|
||||
# CHECK: bb.3:
|
||||
# CHECK-NEXT: dead %2:sreg_32_xm0 = IMPLICIT_DEF
|
||||
# CHECK-NEXT: %3:sreg_32_xm0 = COPY killed %4
|
||||
# CHECK-NEXT: dead %2:sreg_32_xm0 = IMPLICIT_DEF
|
||||
# CHECK-NEXT: S_NOP 0, implicit killed %3
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
# RUN: llc -mtriple amdgcn -run-pass livevars -run-pass phi-node-elimination -o - %s | FileCheck %s
|
||||
|
||||
# CHECK-LABEL: phi-cf-test
|
||||
# CHECK: bb.0:
|
||||
# CHECK: [[COND:%[0-9]+]]:sreg_64 = V_CMP_EQ_U32_e64
|
||||
# CHECK: [[IF_SOURCE0:%[0-9]+]]:sreg_64 = SI_IF [[COND]], %bb.1, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
# CHECK: [[IF_INPUT_REG:%[0-9]+]]:sreg_64 = COPY killed [[IF_SOURCE0]], implicit $exec
|
||||
|
||||
# CHECK: bb.1:
|
||||
# CHECK: [[END_CF_ARG:%[0-9]+]]:sreg_64 = COPY killed [[IF_INPUT_REG]]
|
||||
# CHECK: SI_END_CF killed [[END_CF_ARG]], implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
|
||||
# CHECK: bb.2:
|
||||
# CHECK: [[IF_SOURCE1:%[0-9]+]]:sreg_64 = SI_IF [[COND]], %bb.1, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
# CHECK: [[IF_INPUT_REG]]:sreg_64 = COPY killed [[IF_SOURCE1]], implicit $exec
|
||||
|
||||
|
||||
...
|
||||
---
|
||||
name: phi-cf-test
|
||||
tracksRegLiveness: true
|
||||
body: |
|
||||
|
||||
bb.0:
|
||||
successors: %bb.3(0x40000000), %bb.2(0x40000000)
|
||||
liveins: $vgpr0
|
||||
|
||||
%5:vgpr_32(s32) = COPY $vgpr0
|
||||
%0:sreg_64 = V_CMP_EQ_U32_e64 0, %5(s32), implicit $exec
|
||||
%18:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
|
||||
%22:sreg_64 = SI_IF %0, %bb.2, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
S_BRANCH %bb.3
|
||||
|
||||
bb.2:
|
||||
successors: %bb.3(0x80000000)
|
||||
|
||||
%24:sreg_64 = PHI %20, %bb.3, %22, %bb.0
|
||||
%23:vgpr_32 = PHI %19, %bb.3, %18, %bb.0
|
||||
SI_END_CF %24, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
%3:vgpr_32, dead %10:sreg_64 = nsw V_ADD_I32_e64 1, %23, 0, implicit $exec
|
||||
|
||||
bb.3:
|
||||
successors: %bb.3(0x40000000), %bb.2(0x40000000)
|
||||
|
||||
%4:vgpr_32 = PHI %19, %bb.3, %3, %bb.2, %18, %bb.0
|
||||
%15:sreg_32_xm0 = S_MOV_B32 61440
|
||||
%16:sreg_32_xm0 = S_MOV_B32 -1
|
||||
%17:sreg_128 = REG_SEQUENCE undef %14:sreg_32_xm0, %subreg.sub0, undef %12:sreg_32_xm0, %subreg.sub1, %16, %subreg.sub2, %15, %subreg.sub3
|
||||
BUFFER_STORE_DWORD_OFFSET %4, %17, 0, 0, 0, 0, 0, 0, implicit $exec :: (volatile store 4 into `i32 addrspace(1)* undef`, addrspace 1)
|
||||
%19:vgpr_32 = COPY %4
|
||||
%20:sreg_64 = SI_IF %0, %bb.2, implicit-def dead $exec, implicit-def dead $scc, implicit $exec
|
||||
S_BRANCH %bb.3
|
||||
|
||||
...
|
||||
Loading…
Reference in New Issue