Skip to content

Commit d8eeb9e

Browse files
committed
[AMDGPU] Fix a potential integer overflow in GCNRegPressure when true16 is enabled
Fixes SWDEV-537014.
1 parent 4f991cc commit d8eeb9e

File tree

2 files changed

+89
-1
lines changed

2 files changed

+89
-1
lines changed

llvm/lib/Target/AMDGPU/GCNRegPressure.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,25 @@ void GCNRegPressure::inc(unsigned Reg,
6666
Value[TupleIdx] += Sign * TRI->getRegClassWeight(RC).RegWeight;
6767
}
6868
// Pressure scales with number of new registers covered by the new mask.
69-
Sign *= SIRegisterInfo::getNumCoveredRegs(~PrevMask & NewMask);
69+
// Note when true16 is enabled, we can no longer safely use the following
70+
// approach to calculate the difference in the number of 32-bit registers
71+
// between two masks:
72+
//
73+
// Sign *= SIRegisterInfo::getNumCoveredRegs(~PrevMask & NewMask);
74+
//
75+
// The issue is that the mask calculation `~PrevMask & NewMask` doesn't
76+
// properly account for partial usage of a 32-bit register when dealing with
77+
// 16-bit registers.
78+
//
79+
// Consider this example:
80+
// Assume PrevMask = 0b0010 and NewMask = 0b1111. Here, the correct register
81+
// usage difference should be 1, because even though PrevMask uses only half
82+
// of a 32-bit register, it should still be counted as a full register use.
83+
// However, the mask calculation yields `~PrevMask & NewMask = 0b1101`, and
84+
// calling `getNumCoveredRegs` returns 2 instead of 1. This incorrect
85+
// calculation can lead to integer overflow when Sign = -1.
86+
Sign *= SIRegisterInfo::getNumCoveredRegs(NewMask) -
87+
SIRegisterInfo::getNumCoveredRegs(PrevMask);
7088
}
7189
Value[RegKind] += Sign;
7290
}
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
2+
# RUN: llc -x mir -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1102 -run-pass=machine-scheduler %s -o - | FileCheck %s
3+
4+
--- |
5+
declare void @llvm.amdgcn.s.waitcnt(i32 immarg)
6+
7+
declare <2 x i32> @llvm.amdgcn.raw.buffer.load.v2i32(<4 x i32>, i32, i32, i32 immarg)
8+
9+
define amdgpu_kernel void @foo(ptr %p) {
10+
entry:
11+
%foo.kernarg.segment = call nonnull align 16 dereferenceable(264) ptr addrspace(4) @llvm.amdgcn.kernarg.segment.ptr()
12+
%p.kernarg.offset1 = bitcast ptr addrspace(4) %foo.kernarg.segment to ptr addrspace(4)
13+
%p.load = load ptr, ptr addrspace(4) %p.kernarg.offset1, align 16
14+
%call = tail call <2 x i32> @llvm.amdgcn.raw.buffer.load.v2i32(<4 x i32> zeroinitializer, i32 0, i32 0, i32 0)
15+
%cast = bitcast <2 x i32> %call to <8 x i8>
16+
%shuffle = shufflevector <8 x i8> zeroinitializer, <8 x i8> %cast, <2 x i32> <i32 3, i32 11>
17+
%zext = zext <2 x i8> %shuffle to <2 x i16>
18+
%shl = shl <2 x i16> %zext, splat (i16 8)
19+
store <2 x i16> %shl, ptr %p.load, align 4
20+
tail call void @llvm.amdgcn.s.waitcnt(i32 0)
21+
ret void
22+
}
23+
24+
declare noundef align 4 ptr addrspace(4) @llvm.amdgcn.kernarg.segment.ptr()
25+
...
26+
---
27+
name: foo
28+
tracksRegLiveness: true
29+
liveins:
30+
- { reg: '$sgpr4_sgpr5', virtual-reg: '%3' }
31+
body: |
32+
bb.0.entry:
33+
liveins: $sgpr4_sgpr5
34+
35+
; CHECK-LABEL: name: foo
36+
; CHECK: liveins: $sgpr4_sgpr5
37+
; CHECK-NEXT: {{ $}}
38+
; CHECK-NEXT: [[COPY:%[0-9]+]]:sgpr_64(p4) = COPY $sgpr4_sgpr5
39+
; CHECK-NEXT: [[S_MOV_B32_:%[0-9]+]]:sreg_32 = S_MOV_B32 0
40+
; CHECK-NEXT: undef [[COPY1:%[0-9]+]].sub0:sgpr_128 = COPY [[S_MOV_B32_]]
41+
; CHECK-NEXT: [[COPY1:%[0-9]+]].sub1:sgpr_128 = COPY [[S_MOV_B32_]]
42+
; CHECK-NEXT: [[COPY1:%[0-9]+]].sub2:sgpr_128 = COPY [[S_MOV_B32_]]
43+
; CHECK-NEXT: [[COPY1:%[0-9]+]].sub3:sgpr_128 = COPY [[S_MOV_B32_]]
44+
; CHECK-NEXT: [[BUFFER_LOAD_DWORDX2_OFFSET:%[0-9]+]]:vreg_64 = BUFFER_LOAD_DWORDX2_OFFSET [[COPY1]], 0, 0, 0, 0, implicit $exec :: (dereferenceable load (s64), align 1, addrspace 8)
45+
; CHECK-NEXT: [[S_LOAD_DWORDX2_IMM:%[0-9]+]]:sreg_64_xexec = S_LOAD_DWORDX2_IMM [[COPY]](p4), 0, 0 :: (dereferenceable invariant load (s64) from %ir.p.kernarg.offset1, align 16, addrspace 4)
46+
; CHECK-NEXT: [[V_LSHRREV_B64_e64_:%[0-9]+]]:vreg_64 = V_LSHRREV_B64_e64 24, [[BUFFER_LOAD_DWORDX2_OFFSET]], implicit $exec
47+
; CHECK-NEXT: undef [[COPY2:%[0-9]+]].lo16:vgpr_32 = COPY [[V_LSHRREV_B64_e64_]].lo16
48+
; CHECK-NEXT: [[V_LSHLREV_B32_e64_:%[0-9]+]]:vgpr_32 = V_LSHLREV_B32_e64 16, [[COPY2]], implicit $exec
49+
; CHECK-NEXT: [[COPY3:%[0-9]+]]:vreg_64 = COPY [[S_LOAD_DWORDX2_IMM]]
50+
; CHECK-NEXT: [[V_PK_LSHLREV_B16_:%[0-9]+]]:vgpr_32 = V_PK_LSHLREV_B16 0, 8, 8, [[V_LSHLREV_B32_e64_]], 0, 0, 0, 0, 0, implicit $exec
51+
; CHECK-NEXT: FLAT_STORE_DWORD [[COPY3]], [[V_PK_LSHLREV_B16_]], 0, 0, implicit $exec, implicit $flat_scr :: (store (s32) into %ir.p.load)
52+
; CHECK-NEXT: S_WAITCNT 0
53+
; CHECK-NEXT: S_ENDPGM 0
54+
%3:sgpr_64(p4) = COPY killed $sgpr4_sgpr5
55+
%13:sreg_64_xexec = S_LOAD_DWORDX2_IMM killed %3(p4), 0, 0 :: (dereferenceable invariant load (s64) from %ir.p.kernarg.offset1, align 16, addrspace 4)
56+
%14:sreg_32 = S_MOV_B32 0
57+
undef %15.sub0:sgpr_128 = COPY %14
58+
%15.sub1:sgpr_128 = COPY %14
59+
%15.sub2:sgpr_128 = COPY %14
60+
%15.sub3:sgpr_128 = COPY killed %14
61+
%16:vreg_64 = BUFFER_LOAD_DWORDX2_OFFSET killed %15, 0, 0, 0, 0, implicit $exec :: (dereferenceable load (s64), align 1, addrspace 8)
62+
%26:vreg_64 = V_LSHRREV_B64_e64 24, killed %16, implicit $exec
63+
undef %28.lo16:vgpr_32 = COPY killed %26.lo16
64+
%30:vgpr_32 = V_LSHLREV_B32_e64 16, killed %28, implicit $exec
65+
%24:vgpr_32 = V_PK_LSHLREV_B16 0, 8, 8, killed %30, 0, 0, 0, 0, 0, implicit $exec
66+
%25:vreg_64 = COPY killed %13
67+
FLAT_STORE_DWORD killed %25, killed %24, 0, 0, implicit $exec, implicit $flat_scr :: (store (s32) into %ir.p.load)
68+
S_WAITCNT 0
69+
S_ENDPGM 0
70+
...

0 commit comments

Comments
 (0)