Skip to content

[AMDGPU] Fix end() iterator dereference in SILowerSGPRSpills #88828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 18, 2024
Merged

[AMDGPU] Fix end() iterator dereference in SILowerSGPRSpills #88828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d317f1
[AMDGPU] Fix end() iterator dereference in SILowerSGPRSpills
bcahoon Apr 15, 2024
5ca4ce8
Use findDebugLoc
bcahoon Apr 16, 2024
d48995b
Replace test case with smaller version
bcahoon Apr 17, 2024
d1db304
Change test to use gfx900
bcahoon Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions llvm/lib/Target/AMDGPU/SILowerSGPRSpills.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ void SILowerSGPRSpills::extendWWMVirtRegLiveness(MachineFunction &MF,
for (auto Reg : MFI->getSGPRSpillVGPRs()) {
for (MachineBasicBlock *SaveBlock : SaveBlocks) {
MachineBasicBlock::iterator InsertBefore = SaveBlock->begin();
auto MIB = BuildMI(*SaveBlock, *InsertBefore, InsertBefore->getDebugLoc(),
DebugLoc DL = SaveBlock->findDebugLoc(InsertBefore);
auto MIB = BuildMI(*SaveBlock, InsertBefore, DL,
TII->get(AMDGPU::IMPLICIT_DEF), Reg);
MFI->setFlag(Reg, AMDGPU::VirtRegFlag::WWM_REG);
// Set SGPR_SPILL asm printer flag
Expand All @@ -294,10 +295,10 @@ void SILowerSGPRSpills::extendWWMVirtRegLiveness(MachineFunction &MF,
for (MachineBasicBlock *RestoreBlock : RestoreBlocks) {
MachineBasicBlock::iterator InsertBefore =
RestoreBlock->getFirstTerminator();
DebugLoc DL = RestoreBlock->findDebugLoc(InsertBefore);
for (auto Reg : MFI->getSGPRSpillVGPRs()) {
auto MIB =
BuildMI(*RestoreBlock, *InsertBefore, InsertBefore->getDebugLoc(),
TII->get(TargetOpcode::KILL));
auto MIB = BuildMI(*RestoreBlock, InsertBefore, DL,
TII->get(TargetOpcode::KILL));
MIB.addReg(Reg);
if (LIS)
LIS->InsertMachineInstrInMaps(*MIB);
Expand Down
33 changes: 33 additions & 0 deletions llvm/test/CodeGen/AMDGPU/sgpr-spills-empty-prolog-block.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 4
# RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -verify-machineinstrs -run-pass=si-lower-sgpr-spills -o - %s | FileCheck %s

# Test that the si-lower-sgpr-spills pass does not defeference a
# machine instruction iterator that is equal to end().

---
name: empty_prolog_block
stack:
- { id: 0, name: '', type: spill-slot, offset: 0, size: 32, alignment: 4,
stack-id: sgpr-spill, callee-saved-register: '', callee-saved-restored: true,
debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
machineFunctionInfo:
hasSpilledSGPRs: true
body: |
; CHECK-LABEL: name: empty_prolog_block
; CHECK: bb.0:
; CHECK-NEXT: successors: %bb.1(0x80000000)
; CHECK-NEXT: liveins: $sgpr0
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: [[DEF:%[0-9]+]]:vgpr_32 = IMPLICIT_DEF
; CHECK-NEXT: {{ $}}
; CHECK-NEXT: bb.1:
; CHECK-NEXT: $sgpr0 = SI_RESTORE_S32_FROM_VGPR [[DEF]], 0
; CHECK-NEXT: KILL [[DEF]]
; CHECK-NEXT: S_ENDPGM 0
bb.0:
liveins: $sgpr0
bb.1:
renamable $sgpr0 = SI_SPILL_S32_RESTORE %stack.0, implicit $exec, implicit $sgpr32
S_ENDPGM 0

...