Skip to content

[AMDGPU] Fix a crash by skipping DBG instrs at start of sched region #131167

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
epilk merged 2 commits into from
Mar 19, 2025
Merged

[AMDGPU] Fix a crash by skipping DBG instrs at start of sched region #131167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
505b5df
[AMDGPU] Fix a crash by skipping DBG instrs at start of sched region
epilk Mar 13, 2025
22d457f
address test comments
epilk Mar 17, 2025
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
2 changes: 2 additions & 0 deletions llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,8 @@ void GCNScheduleDAGMILive::computeBlockPressure(unsigned RegionIdx,
Pressure[CurRegion] = RPTracker.moveMaxPressure();
if (CurRegion-- == RegionIdx)
break;
auto &Rgn = Regions[CurRegion];
NonDbgMI = &*skipDebugInstructionsForward(Rgn.first, Rgn.second);
}
RPTracker.advanceToNext();
RPTracker.advanceBeforeNext();
Expand Down
27 changes: 27 additions & 0 deletions llvm/test/CodeGen/AMDGPU/dbg-value-starts-sched-region.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
# RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -verify-misched -run-pass=machine-scheduler -o - %s | FileCheck %s

# Verify we maintain live-ins even if the first instruction in sched region is
# DBG_.

---
name: sched
tracksRegLiveness: true
body: |
bb.0:
; CHECK-LABEL: name: sched
; CHECK: [[DEF:%[0-9]+]]:sgpr_32 = IMPLICIT_DEF
; CHECK-NEXT: S_NOP 0
; CHECK-NEXT: SCHED_BARRIER 0
; CHECK-NEXT: DBG_VALUE
; CHECK-NEXT: dead [[COPY:%[0-9]+]]:sgpr_32 = COPY [[DEF]]
; CHECK-NEXT: S_NOP 0
; CHECK-NEXT: S_ENDPGM 0
%0:sgpr_32 = IMPLICIT_DEF
S_NOP 0
SCHED_BARRIER 0
DBG_VALUE
dead %1:sgpr_32 = COPY %0
S_NOP 0
S_ENDPGM 0
...