[llvm] [AMDGPU][SIInsertWaitcnts] don't crash when printing messages at end of block (PR #145694)
Sameer Sahasrabuddhe via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 25 07:29:01 PDT 2025
https://github.com/ssahasra updated https://github.com/llvm/llvm-project/pull/145694
>From a8133bef200c4595d902a2f14e198a6a82b3b078 Mon Sep 17 00:00:00 2001
From: Sameer Sahasrabuddhe <sameer.sahasrabuddhe at amd.com>
Date: Wed, 25 Jun 2025 19:58:12 +0530
Subject: [PATCH] [AMDGPU][SIInsertWaitcnts] don't crash when printing messages
at end of block
---
llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
index f43831016952a..41e1f0586e36c 100644
--- a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
+++ b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
@@ -1353,7 +1353,13 @@ bool WaitcntGeneratorPreGFX12::applyPreexistingWaitcnt(
MachineInstr *WaitcntInstr = nullptr;
MachineInstr *WaitcntVsCntInstr = nullptr;
- LLVM_DEBUG(dbgs() << "PreGFX12::applyPreexistingWaitcnt at: " << *It);
+ LLVM_DEBUG({
+ dbgs() << "PreGFX12::applyPreexistingWaitcnt at: ";
+ if (It == OldWaitcntInstr.getParent()->instr_end())
+ dbgs() << "end of block\n";
+ else
+ dbgs() << *It;
+ });
for (auto &II :
make_early_inc_range(make_range(OldWaitcntInstr.getIterator(), It))) {
@@ -1507,7 +1513,13 @@ bool WaitcntGeneratorGFX12Plus::applyPreexistingWaitcnt(
MachineInstr *CombinedStoreDsCntInstr = nullptr;
MachineInstr *WaitInstrs[NUM_EXTENDED_INST_CNTS] = {};
- LLVM_DEBUG(dbgs() << "GFX12Plus::applyPreexistingWaitcnt at: " << *It);
+ LLVM_DEBUG({
+ dbgs() << "GFX12Plus::applyPreexistingWaitcnt at: ";
+ if (It == OldWaitcntInstr.getParent()->instr_end())
+ dbgs() << "end of block\n";
+ else
+ dbgs() << *It;
+ });
for (auto &II :
make_early_inc_range(make_range(OldWaitcntInstr.getIterator(), It))) {
More information about the llvm-commits
mailing list