Skip to content

Commit 8d02e56

Browse files
mihajlovicanamihajlovicana
committed
skip debug instructions
1 parent 5752242 commit 8d02e56

File tree

4 files changed

+132
-15
lines changed

4 files changed

+132
-15
lines changed

‎llvm/lib/Target/AMDGPU/AMDGPUWaitSGPRHazards.cpp

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,13 @@ class AMDGPUWaitSGPRHazards {
165165
}
166166

167167
unsigned mergeMasks(unsigned Mask1, unsigned Mask2) {
168-
unsigned Mask = Mask1 & Mask2;
169-
168+
unsigned Mask = 0xffff;
169+
Mask = AMDGPU::DepCtr::encodeFieldSaSdst(
170+
Mask, std::min(AMDGPU::DepCtr::decodeFieldSaSdst(Mask1),
171+
AMDGPU::DepCtr::decodeFieldSaSdst(Mask2)));
172+
Mask = AMDGPU::DepCtr::encodeFieldVaVcc(
173+
Mask, std::min(AMDGPU::DepCtr::decodeFieldVaVcc(Mask1),
174+
AMDGPU::DepCtr::decodeFieldVaVcc(Mask2)));
170175
Mask = AMDGPU::DepCtr::encodeFieldVmVsrc(
171176
Mask, std::min(AMDGPU::DepCtr::decodeFieldVmVsrc(Mask1),
172177
AMDGPU::DepCtr::decodeFieldVmVsrc(Mask2)));
@@ -176,6 +181,12 @@ class AMDGPUWaitSGPRHazards {
176181
Mask = AMDGPU::DepCtr::encodeFieldVaVdst(
177182
Mask, std::min(AMDGPU::DepCtr::decodeFieldVaVdst(Mask1),
178183
AMDGPU::DepCtr::decodeFieldVaVdst(Mask2)));
184+
Mask = AMDGPU::DepCtr::encodeFieldHoldCnt(
185+
Mask, std::min(AMDGPU::DepCtr::decodeFieldHoldCnt(Mask1),
186+
AMDGPU::DepCtr::decodeFieldHoldCnt(Mask2)));
187+
Mask = AMDGPU::DepCtr::encodeFieldVaSsrc(
188+
Mask, std::min(AMDGPU::DepCtr::decodeFieldVaSsrc(Mask1),
189+
AMDGPU::DepCtr::decodeFieldVaSsrc(Mask2)));
179190
return Mask;
180191
}
181192

@@ -377,13 +388,17 @@ class AMDGPUWaitSGPRHazards {
377388
Mask = AMDGPU::DepCtr::encodeFieldVaSdst(Mask, 0);
378389
}
379390
if (Emit) {
380-
if (MI != MI->getParent()->begin()) {
381-
MachineInstr &PrevMI = *std::prev(MI);
382-
if (PrevMI.getOpcode() == AMDGPU::S_WAITCNT_DEPCTR) {
383-
Mask = mergeMasks(Mask, PrevMI.getOperand(0).getImm());
384-
PrevMI.eraseFromParent();
391+
if (MI != MBB.instr_begin()) {
392+
MachineBasicBlock::instr_iterator It = std::prev(MI);
393+
while (It != MBB.instr_begin() && It->isDebugInstr())
394+
--It;
395+
if (It->getOpcode() == AMDGPU::S_WAITCNT_DEPCTR) {
396+
Mask = mergeMasks(Mask, It->getOperand(0).getImm());
397+
It->getOperand(0).setImm(Mask);
398+
continue;
385399
}
386400
}
401+
387402
auto NewMI = BuildMI(MBB, MI, MI->getDebugLoc(),
388403
TII->get(AMDGPU::S_WAITCNT_DEPCTR))
389404
.addImm(Mask);

‎llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,18 @@ inline unsigned getSaSdstBitWidth() { return 1; }
164164
/// \returns SaSdst bit shift
165165
inline unsigned getSaSdstBitShift() { return 0; }
166166

167+
/// \returns VaSsrc width
168+
inline unsigned getVaSsrcBitWidth() { return 1; }
169+
170+
/// \returns VaSsrc bit shift
171+
inline unsigned getVaSsrcBitShift() { return 8; }
172+
173+
/// \returns HoldCnt bit shift
174+
inline unsigned getHoldCntWidth() { return 1; }
175+
176+
/// \returns HoldCnt bit shift
177+
inline unsigned getHoldCntBitShift() { return 7; }
178+
167179
} // end anonymous namespace
168180

169181
namespace llvm {
@@ -1740,6 +1752,14 @@ unsigned decodeFieldVaVcc(unsigned Encoded) {
17401752
return unpackBits(Encoded, getVaVccBitShift(), getVaVccBitWidth());
17411753
}
17421754

1755+
unsigned decodeFieldVaSsrc(unsigned Encoded) {
1756+
return unpackBits(Encoded, getVaSsrcBitShift(), getVaSsrcBitWidth());
1757+
}
1758+
1759+
unsigned decodeFieldHoldCnt(unsigned Encoded) {
1760+
return unpackBits(Encoded, getHoldCntBitShift(), getHoldCntWidth());
1761+
}
1762+
17431763
unsigned encodeFieldVmVsrc(unsigned Encoded, unsigned VmVsrc) {
17441764
return packBits(VmVsrc, Encoded, getVmVsrcBitShift(), getVmVsrcBitWidth());
17451765
}
@@ -1780,6 +1800,22 @@ unsigned encodeFieldVaVcc(unsigned VaVcc) {
17801800
return encodeFieldVaVcc(0xffff, VaVcc);
17811801
}
17821802

1803+
unsigned encodeFieldVaSsrc(unsigned Encoded, unsigned VaSsrc) {
1804+
return packBits(VaSsrc, Encoded, getVaSsrcBitShift(), getVaSsrcBitWidth());
1805+
}
1806+
1807+
unsigned encodeFieldVaSsrc(unsigned VaSsrc) {
1808+
return encodeFieldVaSsrc(0xfff, VaSsrc);
1809+
}
1810+
1811+
unsigned encodeFieldHoldCnt(unsigned Encoded, unsigned HoldCnt) {
1812+
return packBits(HoldCnt, Encoded, getHoldCntBitShift(), getHoldCntWidth());
1813+
}
1814+
1815+
unsigned encodeFieldHoldCnt(unsigned HoldCnt) {
1816+
return encodeFieldHoldCnt(0xfff, HoldCnt);
1817+
}
1818+
17831819
} // namespace DepCtr
17841820

17851821
//===----------------------------------------------------------------------===//

‎llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,6 +1180,12 @@ unsigned decodeFieldVaSdst(unsigned Encoded);
11801180
/// \returns Decoded VaVcc from given immediate \p Encoded.
11811181
unsigned decodeFieldVaVcc(unsigned Encoded);
11821182

1183+
/// \returns Decoded SaSrc from given immediate \p Encoded.
1184+
unsigned decodeFieldVaSsrc(unsigned Encoded);
1185+
1186+
/// \returns Decoded HoldCnt from given immediate \p Encoded.
1187+
unsigned decodeFieldHoldCnt(unsigned Encoded);
1188+
11831189
/// \returns \p VmVsrc as an encoded Depctr immediate.
11841190
unsigned encodeFieldVmVsrc(unsigned VmVsrc);
11851191

@@ -1210,6 +1216,18 @@ unsigned encodeFieldVaVcc(unsigned VaVcc);
12101216
/// \returns \p Encoded combined with encoded \p VaVcc.
12111217
unsigned encodeFieldVaVcc(unsigned Encoded, unsigned VaVcc);
12121218

1219+
/// \returns \p HoldCnt as an encoded Depctr immediate.
1220+
unsigned encodeFieldHoldCnt(unsigned HoldCnt);
1221+
1222+
/// \returns \p Encoded combined with encoded \p HoldCnt.
1223+
unsigned encodeFieldHoldCnt(unsigned HoldCnt, unsigned Encoded);
1224+
1225+
/// \returns \p VaSsrc as an encoded Depctr immediate.
1226+
unsigned encodeFieldVaSsrc(unsigned VaSsrc);
1227+
1228+
/// \returns \p Encoded combined with encoded \p VaSsrc.
1229+
unsigned encodeFieldVaSsrc(unsigned Encoded, unsigned VaSsrc);
1230+
12131231
} // namespace DepCtr
12141232

12151233
namespace Exp {

‎llvm/test/CodeGen/AMDGPU/merge-consecutive-wait-alus.mir

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
---
66
name: merge_consecutive_wait_alus
7-
exposesReturnsTwice: false
8-
legalized: false
9-
regBankSelected: false
10-
selected: false
11-
failedISel: false
12-
tracksRegLiveness: true
137
body: |
148
bb.0:
159
liveins: $vgpr0
@@ -24,7 +18,61 @@ body: |
2418
S_WAITCNT_DEPCTR 65530
2519
renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc
2620
...
21+
---
22+
name: merge_consecutive_wait_alus_two_bb
23+
body: |
24+
; CHECK-LABEL: name: merge_consecutive_wait_alus_two_bb
25+
; CHECK: bb.0:
26+
; CHECK-NEXT: successors: %bb.1(0x80000000)
27+
; CHECK-NEXT: liveins: $vgpr0
28+
; CHECK-NEXT: {{ $}}
29+
; CHECK-NEXT: renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc_lo
30+
; CHECK-NEXT: S_WAITCNT_DEPCTR 65530
31+
; CHECK-NEXT: {{ $}}
32+
; CHECK-NEXT: bb.1:
33+
; CHECK-NEXT: liveins: $sgpr0
34+
; CHECK-NEXT: {{ $}}
35+
; CHECK-NEXT: S_WAITCNT_DEPCTR 61951
36+
; CHECK-NEXT: renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc_lo
37+
bb.0:
38+
liveins: $vgpr0
39+
40+
renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc
41+
S_WAITCNT_DEPCTR 65530
2742
43+
bb.1:
44+
liveins: $sgpr0
2845
29-
## NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
30-
# CHECK: {{.*}}
46+
renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc
47+
...
48+
---
49+
name: meta_instructions
50+
machineFunctionInfo:
51+
body: |
52+
bb.0:
53+
; CHECK-LABEL: name: meta_instructions
54+
; CHECK: renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc_lo
55+
; CHECK-NEXT: S_WAITCNT_DEPCTR 65530
56+
; CHECK-NEXT: SCHED_BARRIER 0
57+
; CHECK-NEXT: S_WAITCNT_DEPCTR 61951
58+
; CHECK-NEXT: renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc_lo
59+
renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc
60+
S_WAITCNT_DEPCTR 65530
61+
SCHED_BARRIER 0
62+
renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc
63+
...
64+
---
65+
name: debug_instruction
66+
machineFunctionInfo:
67+
body: |
68+
bb.0:
69+
; CHECK-LABEL: name: debug_instruction
70+
; CHECK: renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc_lo
71+
; CHECK-NEXT: S_WAITCNT_DEPCTR 61946
72+
; CHECK-NEXT: DBG_VALUE $sgpr0
73+
; CHECK-NEXT: renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc_lo
74+
renamable $sgpr0 = V_CMP_NE_U32_e64 0, $vgpr0, implicit $exec, implicit-def $vcc_lo, implicit-def $vcc
75+
S_WAITCNT_DEPCTR 65530
76+
DBG_VALUE $sgpr0
77+
renamable $vgpr0 = V_CNDMASK_B32_e64 0, -1, 0, killed $vgpr0, killed $sgpr0, implicit $exec, implicit-def $vcc
78+
...

0 commit comments

Comments
 (0)