Skip to content

Commit 0745219

Browse files
authored
[AMDGPU] Add target intrinsic for s_buffer_prefetch_data (#107293)
1 parent 4c1a6a2 commit 0745219

16 files changed

+168
-9
lines changed

clang/include/clang/Basic/BuiltinsAMDGPU.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ TARGET_BUILTIN(__builtin_amdgcn_s_wakeup_barrier, "vi", "n", "gfx12-insts")
449449
TARGET_BUILTIN(__builtin_amdgcn_s_barrier_leave, "b", "n", "gfx12-insts")
450450
TARGET_BUILTIN(__builtin_amdgcn_s_get_barrier_state, "Uii", "n", "gfx12-insts")
451451
TARGET_BUILTIN(__builtin_amdgcn_s_prefetch_data, "vvC*Ui", "nc", "gfx12-insts")
452+
TARGET_BUILTIN(__builtin_amdgcn_s_buffer_prefetch_data, "vQbIiUi", "nc", "gfx12-insts")
452453

453454
TARGET_BUILTIN(__builtin_amdgcn_global_load_tr_b64_v2i32, "V2iV2i*1", "nc", "gfx12-insts,wavefrontsize32")
454455
TARGET_BUILTIN(__builtin_amdgcn_global_load_tr_b128_v8i16, "V8sV8s*1", "nc", "gfx12-insts,wavefrontsize32")

clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12-param-err.cl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ kernel void builtins_amdgcn_s_barrier_signal_isfirst_err(global int* in, global
2222
__builtin_amdgcn_s_barrier_wait(-1);
2323
*out = *in;
2424
}
25+
26+
void test_s_buffer_prefetch_data(__amdgpu_buffer_rsrc_t rsrc, unsigned int off)
27+
{
28+
__builtin_amdgcn_s_buffer_prefetch_data(rsrc, off, 31); // expected-error {{'__builtin_amdgcn_s_buffer_prefetch_data' must be a constant integer}}
29+
}

clang/test/CodeGenOpenCL/builtins-amdgcn-gfx12.cl

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,22 @@ void test_s_prefetch_data(int *fp, global float *gp, constant char *cp, unsigned
281281
__builtin_amdgcn_s_prefetch_data(gp, len);
282282
__builtin_amdgcn_s_prefetch_data(cp, 31);
283283
}
284+
285+
// CHECK-LABEL: @test_s_buffer_prefetch_data(
286+
// CHECK-NEXT: entry:
287+
// CHECK-NEXT: [[RSRC_ADDR:%.*]] = alloca ptr addrspace(8), align 16, addrspace(5)
288+
// CHECK-NEXT: [[LEN_ADDR:%.*]] = alloca i32, align 4, addrspace(5)
289+
// CHECK-NEXT: store ptr addrspace(8) [[RSRC:%.*]], ptr addrspace(5) [[RSRC_ADDR]], align 16
290+
// CHECK-NEXT: store i32 [[LEN:%.*]], ptr addrspace(5) [[LEN_ADDR]], align 4
291+
// CHECK-NEXT: [[TMP0:%.*]] = load ptr addrspace(8), ptr addrspace(5) [[RSRC_ADDR]], align 16
292+
// CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr addrspace(5) [[LEN_ADDR]], align 4
293+
// CHECK-NEXT: call void @llvm.amdgcn.s.buffer.prefetch.data(ptr addrspace(8) [[TMP0]], i32 128, i32 [[TMP1]])
294+
// CHECK-NEXT: [[TMP2:%.*]] = load ptr addrspace(8), ptr addrspace(5) [[RSRC_ADDR]], align 16
295+
// CHECK-NEXT: call void @llvm.amdgcn.s.buffer.prefetch.data(ptr addrspace(8) [[TMP2]], i32 0, i32 31)
296+
// CHECK-NEXT: ret void
297+
//
298+
void test_s_buffer_prefetch_data(__amdgpu_buffer_rsrc_t rsrc, unsigned int len)
299+
{
300+
__builtin_amdgcn_s_buffer_prefetch_data(rsrc, 128, len);
301+
__builtin_amdgcn_s_buffer_prefetch_data(rsrc, 0, 31);
302+
}

llvm/include/llvm/IR/IntrinsicsAMDGPU.td

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,15 @@ class AMDGPUStructPtrBufferLoadLDS : Intrinsic <
17231723
ImmArg<ArgIndex<7>>, IntrNoCallback, IntrNoFree], "", [SDNPMemOperand]>, AMDGPURsrcIntrinsic<0>;
17241724
def int_amdgcn_struct_ptr_buffer_load_lds : AMDGPUStructPtrBufferLoadLDS;
17251725

1726+
def int_amdgcn_s_buffer_prefetch_data : DefaultAttrsIntrinsic <
1727+
[],
1728+
[AMDGPUBufferRsrcTy, // rsrc(SGPR)
1729+
llvm_i32_ty, // offset (imm)
1730+
llvm_i32_ty], // len (SGPR/imm)
1731+
[IntrInaccessibleMemOrArgMemOnly, ImmArg<ArgIndex<1>>], "", [SDNPMemOperand]>,
1732+
AMDGPURsrcIntrinsic<0>,
1733+
ClangBuiltin<"__builtin_amdgcn_s_buffer_prefetch_data">;
1734+
17261735
} // defset AMDGPUBufferIntrinsics
17271736

17281737
// Uses that do not set the done bit should set IntrWriteMem on the

llvm/lib/Target/AMDGPU/AMDGPUGISel.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ def : GINodeEquiv<G_AMDGPU_S_BUFFER_LOAD_SBYTE, SIsbuffer_load_byte>;
296296
def : GINodeEquiv<G_AMDGPU_S_BUFFER_LOAD_UBYTE, SIsbuffer_load_ubyte>;
297297
def : GINodeEquiv<G_AMDGPU_S_BUFFER_LOAD_SSHORT, SIsbuffer_load_short>;
298298
def : GINodeEquiv<G_AMDGPU_S_BUFFER_LOAD_USHORT, SIsbuffer_load_ushort>;
299+
def : GINodeEquiv<G_AMDGPU_S_BUFFER_PREFETCH, SIsbuffer_prefetch>;
299300

300301
class GISelSop2Pat <
301302
SDPatternOperator node,

llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5545,6 +5545,7 @@ const char* AMDGPUTargetLowering::getTargetNodeName(unsigned Opcode) const {
55455545
NODE_NAME_CASE(SBUFFER_LOAD_UBYTE)
55465546
NODE_NAME_CASE(SBUFFER_LOAD_SHORT)
55475547
NODE_NAME_CASE(SBUFFER_LOAD_USHORT)
5548+
NODE_NAME_CASE(SBUFFER_PREFETCH_DATA)
55485549
NODE_NAME_CASE(BUFFER_STORE)
55495550
NODE_NAME_CASE(BUFFER_STORE_BYTE)
55505551
NODE_NAME_CASE(BUFFER_STORE_SHORT)

llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ enum NodeType : unsigned {
589589
SBUFFER_LOAD_UBYTE,
590590
SBUFFER_LOAD_SHORT,
591591
SBUFFER_LOAD_USHORT,
592+
SBUFFER_PREFETCH_DATA,
592593
BUFFER_STORE,
593594
BUFFER_STORE_BYTE,
594595
BUFFER_STORE_SHORT,

llvm/lib/Target/AMDGPU/AMDGPUInstructionSelector.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5237,7 +5237,8 @@ getConstantZext32Val(Register Reg, const MachineRegisterInfo &MRI) {
52375237

52385238
InstructionSelector::ComplexRendererFns
52395239
AMDGPUInstructionSelector::selectSMRDBufferImm(MachineOperand &Root) const {
5240-
std::optional<uint64_t> OffsetVal = getConstantZext32Val(Root.getReg(), *MRI);
5240+
std::optional<uint64_t> OffsetVal =
5241+
Root.isImm() ? Root.getImm() : getConstantZext32Val(Root.getReg(), *MRI);
52415242
if (!OffsetVal)
52425243
return {};
52435244

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6797,6 +6797,18 @@ bool AMDGPULegalizerInfo::legalizeSBufferLoad(LegalizerHelper &Helper,
67976797
return true;
67986798
}
67996799

6800+
bool AMDGPULegalizerInfo::legalizeSBufferPrefetch(LegalizerHelper &Helper,
6801+
MachineInstr &MI) const {
6802+
MachineIRBuilder &B = Helper.MIRBuilder;
6803+
GISelChangeObserver &Observer = Helper.Observer;
6804+
Observer.changingInstr(MI);
6805+
MI.setDesc(B.getTII().get(AMDGPU::G_AMDGPU_S_BUFFER_PREFETCH));
6806+
MI.removeOperand(0); // Remove intrinsic ID
6807+
castBufferRsrcArgToV4I32(MI, B, 0);
6808+
Observer.changedInstr(MI);
6809+
return true;
6810+
}
6811+
68006812
// TODO: Move to selection
68016813
bool AMDGPULegalizerInfo::legalizeTrap(MachineInstr &MI,
68026814
MachineRegisterInfo &MRI,
@@ -7485,6 +7497,8 @@ bool AMDGPULegalizerInfo::legalizeIntrinsic(LegalizerHelper &Helper,
74857497
case Intrinsic::amdgcn_permlanex16:
74867498
case Intrinsic::amdgcn_permlane64:
74877499
return legalizeLaneOp(Helper, MI, IntrID);
7500+
case Intrinsic::amdgcn_s_buffer_prefetch_data:
7501+
return legalizeSBufferPrefetch(Helper, MI);
74887502
default: {
74897503
if (const AMDGPU::ImageDimIntrinsicInfo *ImageDimIntr =
74907504
AMDGPU::getImageDimIntrinsicInfo(IntrID))

llvm/lib/Target/AMDGPU/AMDGPULegalizerInfo.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ class AMDGPULegalizerInfo final : public LegalizerInfo {
227227

228228
bool legalizeSBufferLoad(LegalizerHelper &Helper, MachineInstr &MI) const;
229229

230+
bool legalizeSBufferPrefetch(LegalizerHelper &Helper, MachineInstr &MI) const;
231+
230232
bool legalizeTrap(MachineInstr &MI, MachineRegisterInfo &MRI,
231233
MachineIRBuilder &B) const;
232234
bool legalizeTrapEndpgm(MachineInstr &MI, MachineRegisterInfo &MRI,

0 commit comments

Comments
 (0)