[AMDGPU] Skip debug uses in SIInsertWaitcnts::shouldFlushVmCnt (#160818)

jayfoad · web-flow · commit 8cd917bc80eb · 2025-09-26T08:39:11.000+01:00
diff --git a/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp b/llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
@@ -2730,7 +2730,7 @@ bool SIInsertWaitcnts::shouldFlushVmCnt(MachineLoop *ML,
           HasVMemStore = true;
       }
       for (const MachineOperand &Op : MI.all_uses()) {
-        if (!TRI->isVectorRegister(*MRI, Op.getReg()))
+        if (Op.isDebug() || !TRI->isVectorRegister(*MRI, Op.getReg()))
           continue;
         RegInterval Interval = Brackets.getRegInterval(&MI, MRI, TRI, Op);
         // Vgpr use
diff --git a/llvm/test/CodeGen/AMDGPU/waitcnt-vmcnt-loop.mir b/llvm/test/CodeGen/AMDGPU/waitcnt-vmcnt-loop.mir
@@ -1,4 +1,5 @@
 # RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s | FileCheck -check-prefix=GFX9 %s
+# RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s -debugify-and-strip-all-safe | FileCheck -check-prefix=GFX9 %s
 # RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s | FileCheck -check-prefix=GFX10 %s
 # RUN: llc -mtriple=amdgcn -mcpu=gfx1200 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s | FileCheck -check-prefix=GFX12 %s
 

Original file line number	Diff line number	Diff line change
`@@ -2730,7 +2730,7 @@ bool SIInsertWaitcnts::shouldFlushVmCnt(MachineLoop *ML,`
`2730`	`2730`	`HasVMemStore = true;`
`2731`	`2731`	`}`
`2732`	`2732`	`for (const MachineOperand &Op : MI.all_uses()) {`
`2733`		`- if (!TRI->isVectorRegister(*MRI, Op.getReg()))`
	`2733`	`+ if (Op.isDebug() \|\| !TRI->isVectorRegister(*MRI, Op.getReg()))`
`2734`	`2734`	`continue;`
`2735`	`2735`	`RegInterval Interval = Brackets.getRegInterval(&MI, MRI, TRI, Op);`
`2736`	`2736`	`// Vgpr use`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s \| FileCheck -check-prefix=GFX9 %s`
	`2`	`+# RUN: llc -mtriple=amdgcn -mcpu=gfx900 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s -debugify-and-strip-all-safe \| FileCheck -check-prefix=GFX9 %s`
`2`	`3`	`# RUN: llc -mtriple=amdgcn -mcpu=gfx1010 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s \| FileCheck -check-prefix=GFX10 %s`
`3`	`4`	`# RUN: llc -mtriple=amdgcn -mcpu=gfx1200 -verify-machineinstrs -run-pass si-insert-waitcnts -o - %s \| FileCheck -check-prefix=GFX12 %s`
`4`	`5`