Skip to content

Commit bd81ac3

Browse files
committed
[WIP][AMDGPU] Improve the handling of inreg arguments
When SGPRs available for `inreg` argument passing run out, the compiler silently falls back to using whole VGPRs to pass those arguments. Ideally, instead of using whole VGPRs, we should pack `inreg` arguments into individual lanes of VGPRs. This PR introduces `InregVGPRSpiller`, which handles this packing. It uses `v_writelane` at the call site to place `inreg` arguments into specific VGPR lanes, and then extracts them in the callee using `v_readlane`. Fixes #130443 and #129071.
1 parent 8e7d6ba commit bd81ac3

File tree

3 files changed

+231
-8
lines changed

3 files changed

+231
-8
lines changed

llvm/lib/Target/AMDGPU/SIISelLowering.cpp

Lines changed: 123 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2841,6 +2841,96 @@ void SITargetLowering::insertCopiesSplitCSR(
28412841
}
28422842
}
28432843

2844+
/// Classes for spilling inreg VGPR arguments.
2845+
///
2846+
/// When an argument marked inreg is pushed to a VGPR, it indicates that the
2847+
/// available SGPRs for argument passing have been exhausted. In such cases, it
2848+
/// is preferable to pack multiple inreg arguments into individual lanes of
2849+
/// VGPRs instead of assigning each directly to separate VGPRs.
2850+
///
2851+
/// Spilling involves two parts: the caller-side (call site) and the
2852+
/// callee-side. Both must follow the same method for selecting registers and
2853+
/// lanes, ensuring that an argument written at the call site matches exactly
2854+
/// with the one read at the callee.
2855+
2856+
/// The spilling class for the caller-side that lowers packing of call site
2857+
/// arguments.
2858+
class InregVPGRSpillerCallee {
2859+
CCState &State;
2860+
SelectionDAG &DAG;
2861+
MachineFunction &MF;
2862+
2863+
Register SrcReg;
2864+
SDValue SrcVal;
2865+
unsigned CurLane = 0;
2866+
2867+
public:
2868+
InregVPGRSpillerCallee(SelectionDAG &DAG, MachineFunction &MF, CCState &State)
2869+
: State(State), DAG(DAG), MF(MF) {}
2870+
2871+
SDValue readLane(SDValue Chain, const SDLoc &SL, Register &Reg, EVT VT) {
2872+
if (SrcVal) {
2873+
State.DeallocateReg(Reg);
2874+
} else {
2875+
Reg = MF.addLiveIn(Reg, &AMDGPU::VGPR_32RegClass);
2876+
SrcReg = Reg;
2877+
SrcVal = DAG.getCopyFromReg(Chain, SL, Reg, VT);
2878+
}
2879+
// According to the calling convention, VGPR0-31 are used for passing
2880+
// function arguments, no matter they are regular arguments, or 'inreg'
2881+
// function arguments that get spilled into VGPRs. Therefore, there are at
2882+
// most 32 'inreg' arguments that can be spilled to VGPRs.
2883+
assert(CurLane < 32 && "more than expected VGPR inreg arguments");
2884+
SmallVector<SDValue, 4> Operands{
2885+
DAG.getTargetConstant(Intrinsic::amdgcn_readlane, SL, MVT::i32),
2886+
DAG.getRegister(SrcReg, VT),
2887+
DAG.getTargetConstant(CurLane++, SL, MVT::i32)};
2888+
return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, SL, VT, Operands);
2889+
}
2890+
};
2891+
2892+
/// The spilling class for the caller-side that lowers packing of call site
2893+
/// arguments.
2894+
class InregVPGRSpillerCallSite {
2895+
Register DstReg;
2896+
SDValue LastWrite;
2897+
unsigned CurLane = 0;
2898+
2899+
SelectionDAG &DAG;
2900+
MachineFunction &MF;
2901+
2902+
public:
2903+
InregVPGRSpillerCallSite(SelectionDAG &DAG, MachineFunction &MF)
2904+
: DAG(DAG), MF(MF) {}
2905+
2906+
void writeLane(const SDLoc &SL, Register &Reg, SDValue Val, EVT VT) {
2907+
if (DstReg.isValid())
2908+
Reg = DstReg;
2909+
else
2910+
DstReg = Reg;
2911+
// According to the calling convention, VGPR0-31 are used for passing
2912+
// function arguments, no matter they are regular arguments, or 'inreg'
2913+
// function arguments that get spilled into VGPRs. Therefore, there are at
2914+
// most 32 'inreg' arguments that can be spilled to VGPRs.
2915+
assert(CurLane < 32 && "more than expected VGPR inreg arguments");
2916+
SmallVector<SDValue, 4> Operands{
2917+
DAG.getTargetConstant(Intrinsic::amdgcn_writelane, SL, MVT::i32), Val,
2918+
DAG.getTargetConstant(CurLane++, SL, MVT::i32)};
2919+
if (!LastWrite) {
2920+
Register VReg = MF.getRegInfo().getLiveInVirtReg(DstReg);
2921+
LastWrite = DAG.getRegister(VReg, VT);
2922+
}
2923+
Operands.push_back(LastWrite);
2924+
LastWrite = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, SL, VT, Operands);
2925+
}
2926+
2927+
SDValue finalize(SDValue Chain, const SDLoc &SL, SDValue InGlue) {
2928+
if (!LastWrite)
2929+
return LastWrite;
2930+
return DAG.getCopyToReg(Chain, SL, DstReg, LastWrite, InGlue);
2931+
}
2932+
};
2933+
28442934
SDValue SITargetLowering::LowerFormalArguments(
28452935
SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
28462936
const SmallVectorImpl<ISD::InputArg> &Ins, const SDLoc &DL,
@@ -2963,6 +3053,7 @@ SDValue SITargetLowering::LowerFormalArguments(
29633053
// FIXME: Alignment of explicit arguments totally broken with non-0 explicit
29643054
// kern arg offset.
29653055
const Align KernelArgBaseAlign = Align(16);
3056+
InregVPGRSpillerCallee Spiller(DAG, MF, CCInfo);
29663057

29673058
for (unsigned i = 0, e = Ins.size(), ArgIdx = 0; i != e; ++i) {
29683059
const ISD::InputArg &Arg = Ins[i];
@@ -3130,8 +3221,17 @@ SDValue SITargetLowering::LowerFormalArguments(
31303221
llvm_unreachable("Unexpected register class in LowerFormalArguments!");
31313222
EVT ValVT = VA.getValVT();
31323223

3133-
Reg = MF.addLiveIn(Reg, RC);
3134-
SDValue Val = DAG.getCopyFromReg(Chain, DL, Reg, VT);
3224+
SDValue Val;
3225+
// If an argument is marked inreg but gets pushed to a VGPR, it indicates
3226+
// we've run out of SGPRs for argument passing. In such cases, we'd prefer
3227+
// to start packing inreg arguments into individual lanes of VGPRs, rather
3228+
// than placing them directly into VGPRs.
3229+
if (RC == &AMDGPU::VGPR_32RegClass && Arg.Flags.isInReg()) {
3230+
Val = Spiller.readLane(Chain, DL, Reg, VT);
3231+
} else {
3232+
Reg = MF.addLiveIn(Reg, RC);
3233+
Val = DAG.getCopyFromReg(Chain, DL, Reg, VT);
3234+
}
31353235

31363236
if (Arg.Flags.isSRet()) {
31373237
// The return object should be reasonably addressable.
@@ -3373,7 +3473,7 @@ SDValue SITargetLowering::LowerCallResult(
33733473
// from the explicit user arguments present in the IR.
33743474
void SITargetLowering::passSpecialInputs(
33753475
CallLoweringInfo &CLI, CCState &CCInfo, const SIMachineFunctionInfo &Info,
3376-
SmallVectorImpl<std::pair<unsigned, SDValue>> &RegsToPass,
3476+
SmallVectorImpl<std::pair<Register, SDValue>> &RegsToPass,
33773477
SmallVectorImpl<SDValue> &MemOpChains, SDValue Chain) const {
33783478
// If we don't have a call site, this was a call inserted by
33793479
// legalization. These can never use special inputs.
@@ -3817,7 +3917,7 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
38173917
}
38183918

38193919
const SIMachineFunctionInfo *Info = MF.getInfo<SIMachineFunctionInfo>();
3820-
SmallVector<std::pair<unsigned, SDValue>, 8> RegsToPass;
3920+
SmallVector<std::pair<Register, SDValue>, 8> RegsToPass;
38213921
SmallVector<SDValue, 8> MemOpChains;
38223922

38233923
// Analyze operands of the call, assigning locations to each operand.
@@ -3875,6 +3975,8 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
38753975

38763976
MVT PtrVT = MVT::i32;
38773977

3978+
InregVPGRSpillerCallSite Spiller(DAG, MF);
3979+
38783980
// Walk the register/memloc assignments, inserting copies/loads.
38793981
for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) {
38803982
CCValAssign &VA = ArgLocs[i];
@@ -3988,8 +4090,8 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
39884090
SDValue InGlue;
39894091

39904092
unsigned ArgIdx = 0;
3991-
for (auto [Reg, Val] : RegsToPass) {
3992-
if (ArgIdx++ >= NumSpecialInputs &&
4093+
for (auto &[Reg, Val] : RegsToPass) {
4094+
if (ArgIdx >= NumSpecialInputs &&
39934095
(IsChainCallConv || !Val->isDivergent()) && TRI->isSGPRPhysReg(Reg)) {
39944096
// For chain calls, the inreg arguments are required to be
39954097
// uniform. Speculatively Insert a readfirstlane in case we cannot prove
@@ -4008,7 +4110,21 @@ SDValue SITargetLowering::LowerCall(CallLoweringInfo &CLI,
40084110
ReadfirstlaneArgs);
40094111
}
40104112

4011-
Chain = DAG.getCopyToReg(Chain, DL, Reg, Val, InGlue);
4113+
if (ArgIdx >= NumSpecialInputs &&
4114+
Outs[ArgIdx - NumSpecialInputs].Flags.isInReg() &&
4115+
AMDGPU::VGPR_32RegClass.contains(Reg)) {
4116+
Spiller.writeLane(DL, Reg, Val,
4117+
ArgLocs[ArgIdx - NumSpecialInputs].getLocVT());
4118+
} else {
4119+
Chain = DAG.getCopyToReg(Chain, DL, Reg, Val, InGlue);
4120+
InGlue = Chain.getValue(1);
4121+
}
4122+
4123+
++ArgIdx;
4124+
}
4125+
4126+
if (SDValue R = Spiller.finalize(Chain, DL, InGlue)) {
4127+
Chain = R;
40124128
InGlue = Chain.getValue(1);
40134129
}
40144130

llvm/lib/Target/AMDGPU/SIISelLowering.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ class SITargetLowering final : public AMDGPUTargetLowering {
406406
CallLoweringInfo &CLI,
407407
CCState &CCInfo,
408408
const SIMachineFunctionInfo &Info,
409-
SmallVectorImpl<std::pair<unsigned, SDValue>> &RegsToPass,
409+
SmallVectorImpl<std::pair<Register, SDValue>> &RegsToPass,
410410
SmallVectorImpl<SDValue> &MemOpChains,
411411
SDValue Chain) const;
412412

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
2+
; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx950 -o - %s | FileCheck %s
3+
4+
; arg3 is v0, arg4 is in v1. These should be packed into a lane and extracted with readlane
5+
define i32 @callee(<8 x i32> inreg %arg0, <8 x i32> inreg %arg1, <2 x i32> inreg %arg2, i32 inreg %arg3, i32 inreg %arg4) {
6+
; CHECK-LABEL: callee:
7+
; CHECK: ; %bb.0:
8+
; CHECK-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
9+
; CHECK-NEXT: v_readlane_b32 s0, v0, 1
10+
; CHECK-NEXT: v_readlane_b32 s1, v0, 0
11+
; CHECK-NEXT: s_sub_i32 s0, s1, s0
12+
; CHECK-NEXT: v_mov_b32_e32 v0, s0
13+
; CHECK-NEXT: s_setpc_b64 s[30:31]
14+
%add = sub i32 %arg3, %arg4
15+
ret i32 %add
16+
}
17+
18+
define amdgpu_kernel void @kernel(<8 x i32> %arg0, <8 x i32> %arg1, <2 x i32> %arg2, i32 %arg3, i32 %arg4, ptr %p) {
19+
; CHECK-LABEL: kernel:
20+
; CHECK: ; %bb.0:
21+
; CHECK-NEXT: s_load_dwordx16 s[36:51], s[4:5], 0x0
22+
; CHECK-NEXT: s_load_dwordx4 s[28:31], s[4:5], 0x40
23+
; CHECK-NEXT: s_load_dwordx2 s[34:35], s[4:5], 0x50
24+
; CHECK-NEXT: s_mov_b32 s12, s8
25+
; CHECK-NEXT: s_add_u32 s8, s4, 0x58
26+
; CHECK-NEXT: s_mov_b32 s13, s9
27+
; CHECK-NEXT: s_addc_u32 s9, s5, 0
28+
; CHECK-NEXT: v_mov_b32_e32 v1, v0
29+
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
30+
; CHECK-NEXT: v_writelane_b32 v1, s30, 0
31+
; CHECK-NEXT: s_getpc_b64 s[4:5]
32+
; CHECK-NEXT: s_add_u32 s4, s4, callee@gotpcrel32@lo+4
33+
; CHECK-NEXT: s_addc_u32 s5, s5, callee@gotpcrel32@hi+12
34+
; CHECK-NEXT: v_writelane_b32 v1, s31, 1
35+
; CHECK-NEXT: s_load_dwordx2 s[30:31], s[4:5], 0x0
36+
; CHECK-NEXT: s_mov_b32 s14, s10
37+
; CHECK-NEXT: s_mov_b64 s[10:11], s[6:7]
38+
; CHECK-NEXT: s_mov_b64 s[4:5], s[0:1]
39+
; CHECK-NEXT: s_mov_b64 s[6:7], s[2:3]
40+
; CHECK-NEXT: v_mov_b32_e32 v31, v0
41+
; CHECK-NEXT: s_mov_b32 s0, s36
42+
; CHECK-NEXT: s_mov_b32 s1, s37
43+
; CHECK-NEXT: s_mov_b32 s2, s38
44+
; CHECK-NEXT: s_mov_b32 s3, s39
45+
; CHECK-NEXT: s_mov_b32 s16, s40
46+
; CHECK-NEXT: s_mov_b32 s17, s41
47+
; CHECK-NEXT: s_mov_b32 s18, s42
48+
; CHECK-NEXT: s_mov_b32 s19, s43
49+
; CHECK-NEXT: s_mov_b32 s20, s44
50+
; CHECK-NEXT: s_mov_b32 s21, s45
51+
; CHECK-NEXT: s_mov_b32 s22, s46
52+
; CHECK-NEXT: s_mov_b32 s23, s47
53+
; CHECK-NEXT: s_mov_b32 s24, s48
54+
; CHECK-NEXT: s_mov_b32 s25, s49
55+
; CHECK-NEXT: s_mov_b32 s26, s50
56+
; CHECK-NEXT: s_mov_b32 s27, s51
57+
; CHECK-NEXT: v_mov_b32_e32 v0, v1
58+
; CHECK-NEXT: s_mov_b32 s32, 0
59+
; CHECK-NEXT: s_waitcnt lgkmcnt(0)
60+
; CHECK-NEXT: s_swappc_b64 s[30:31], s[30:31]
61+
; CHECK-NEXT: v_mov_b64_e32 v[2:3], s[34:35]
62+
; CHECK-NEXT: flat_store_dword v[2:3], v0
63+
; CHECK-NEXT: s_endpgm
64+
%ret = call i32 @callee(<8 x i32> %arg0, <8 x i32> %arg1, <2 x i32> %arg2, i32 %arg3, i32 %arg4)
65+
store i32 %ret, ptr %p
66+
ret void
67+
}
68+
69+
; define i32 @caller(<8 x i32> inreg %arg0, <8 x i32> inreg %arg1, <2 x i32> inreg %arg2, i32 inreg %arg3, i32 inreg %arg4) {
70+
; ; CHECK-LABEL: caller:
71+
; ; CHECK: ; %bb.0:
72+
; ; CHECK-NEXT: s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
73+
; ; CHECK-NEXT: s_mov_b32 s42, s33
74+
; ; CHECK-NEXT: s_mov_b32 s33, s32
75+
; ; CHECK-NEXT: s_xor_saveexec_b64 s[40:41], -1
76+
; ; CHECK-NEXT: scratch_store_dword off, v1, s33 ; 4-byte Folded Spill
77+
; ; CHECK-NEXT: s_mov_b64 exec, s[40:41]
78+
; ; CHECK-NEXT: v_readlane_b32 s41, v0, 0
79+
; ; CHECK-NEXT: s_add_i32 s32, s32, 16
80+
; ; CHECK-NEXT: v_readlane_b32 s40, v0, 1
81+
; ; CHECK-NEXT: v_writelane_b32 v0, s41, 0
82+
; ; CHECK-NEXT: v_writelane_b32 v1, s30, 0
83+
; ; CHECK-NEXT: v_writelane_b32 v0, s40, 1
84+
; ; CHECK-NEXT: s_getpc_b64 s[40:41]
85+
; ; CHECK-NEXT: s_add_u32 s40, s40, callee@gotpcrel32@lo+4
86+
; ; CHECK-NEXT: s_addc_u32 s41, s41, callee@gotpcrel32@hi+12
87+
; ; CHECK-NEXT: s_load_dwordx2 s[40:41], s[40:41], 0x0
88+
; ; CHECK-NEXT: v_writelane_b32 v1, s31, 1
89+
; ; CHECK-NEXT: s_waitcnt lgkmcnt(0)
90+
; ; CHECK-NEXT: s_swappc_b64 s[30:31], s[40:41]
91+
; ; CHECK-NEXT: v_readlane_b32 s31, v1, 1
92+
; ; CHECK-NEXT: v_readlane_b32 s30, v1, 0
93+
; ; CHECK-NEXT: s_mov_b32 s32, s33
94+
; ; CHECK-NEXT: s_xor_saveexec_b64 s[0:1], -1
95+
; ; CHECK-NEXT: scratch_load_dword v1, off, s33 ; 4-byte Folded Reload
96+
; ; CHECK-NEXT: s_mov_b64 exec, s[0:1]
97+
; ; CHECK-NEXT: s_mov_b32 s33, s42
98+
; ; CHECK-NEXT: s_waitcnt vmcnt(0)
99+
; ; CHECK-NEXT: s_setpc_b64 s[30:31]
100+
; %ret = call i32 @callee(<8 x i32> %arg0, <8 x i32> %arg1, <2 x i32> %arg2, i32 %arg3, i32 %arg4)
101+
; ret i32 %ret
102+
; }
103+
104+
; define i32 @tail_caller(<8 x i32> inreg %arg0, <8 x i32> inreg %arg1, <2 x i32> inreg %arg2, i32 inreg %arg3, i32 inreg %arg4) {
105+
; %ret = tail call i32 @callee(<8 x i32> %arg0, <8 x i32> %arg1, <2 x i32> %arg2, i32 %arg3, i32 %arg4)
106+
; ret i32 %ret
107+
; }

0 commit comments

Comments
 (0)