[PATCH] D75138: [WIP][AMDGPU] Add Scratch Wave Offset to Scratch Buffer Descriptor in entry functions

[Matt Arsenault via Phabricator via llvm-commits]

arsenm accepted this revision.
arsenm added a comment.
This revision is now accepted and ready to land.

LGTM with nits



================
Comment at: llvm/lib/Target/AMDGPU/SIFrameLowering.cpp:354-357
+  if (ScratchRsrcReg != AMDGPU::NoRegister)
+    for (MachineBasicBlock &OtherBB : MF)
+      if (&OtherBB != &MBB)
+        OtherBB.addLiveIn(ScratchRsrcReg);
----------------
Braces


================
Comment at: llvm/lib/Target/AMDGPU/SIFrameLowering.cpp:380
+  if (MF.getFrameInfo().hasCalls()) {
+    unsigned SPReg = MFI->getStackPtrOffsetReg();
+    assert(SPReg != AMDGPU::SP_REG);
----------------
s/unsigned/Register


================
Comment at: llvm/lib/Target/AMDGPU/SIFrameLowering.cpp:387
+  if (hasFP(MF)) {
+    unsigned FPReg = MFI->getFrameOffsetReg();
+    assert(FPReg != AMDGPU::FP_REG);
----------------
Ditto


================
Comment at: llvm/lib/Target/AMDGPU/SIFrameLowering.cpp:539
+
+    if (ScratchRsrcReg != PreloadedScratchRsrcReg)
+      BuildMI(MBB, I, DL, TII->get(AMDGPU::COPY), ScratchRsrcReg)
----------------
Braces


================
Comment at: llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp:99
+  if (FuncInfo->isEntryFunction()) {
+    return TFI->hasFP(MF) ? FuncInfo->getFrameOffsetReg() : AMDGPU::NoRegister;
+  }
----------------
s/NoRegister/Register()


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75138/new/

https://reviews.llvm.org/D75138