summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMatt Arsenault <Matthew.Arsenault@amd.com>2019-05-31 22:47:36 +0000
committerMatt Arsenault <Matthew.Arsenault@amd.com>2019-05-31 22:47:36 +0000
commit302eedcbfae15e2d1606802a818358d5b7c219ca (patch)
treee5107b3373f0a177e25cb4ccf9970fdc54867b2f /llvm/lib
parentabb2a93c5327ad21d057164539ee06d27f733b71 (diff)
downloadbcm5719-llvm-302eedcbfae15e2d1606802a818358d5b7c219ca.tar.gz
bcm5719-llvm-302eedcbfae15e2d1606802a818358d5b7c219ca.zip
AMDGPU: Fix not adding ImplicitBufferPtr as a live-in
Fixes missing test from r293000. llvm-svn: 362275
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/AMDGPU/SIFrameLowering.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
index e333154f83b..4b2124b14c0 100644
--- a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -419,7 +419,7 @@ void SIFrameLowering::emitEntryFunctionScratchSetup(const GCNSubtarget &ST,
}
}
MF.getRegInfo().addLiveIn(GitPtrLo);
- MF.front().addLiveIn(GitPtrLo);
+ MBB.addLiveIn(GitPtrLo);
BuildMI(MBB, I, DL, SMovB32, RsrcLo)
.addReg(GitPtrLo)
.addReg(ScratchRsrcReg, RegState::ImplicitDefine);
@@ -487,6 +487,9 @@ void SIFrameLowering::emitEntryFunctionScratchSetup(const GCNSubtarget &ST,
.addImm(0) // dlc
.addMemOperand(MMO)
.addReg(ScratchRsrcReg, RegState::ImplicitDefine);
+
+ MF.getRegInfo().addLiveIn(MFI->getImplicitBufferPtrUserSGPR());
+ MBB.addLiveIn(MFI->getImplicitBufferPtrUserSGPR());
}
} else {
unsigned Rsrc0 = TRI->getSubReg(ScratchRsrcReg, AMDGPU::sub0);
OpenPOWER on IntegriCloud