Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,8 @@ void mlir::populateGPUToSPIRVPatterns(const SPIRVTypeConverter &typeConverter,
spirv::BuiltIn::NumSubgroups>,
SingleDimLaunchConfigConversion<gpu::SubgroupSizeOp,
spirv::BuiltIn::SubgroupSize>,
SingleDimLaunchConfigConversion<
gpu::LaneIdOp, spirv::BuiltIn::SubgroupLocalInvocationId>,
WorkGroupSizeConversion, GPUAllReduceConversion,
GPUSubgroupReduceConversion, GPUPrintfConversion>(typeConverter,
patterns.getContext());
Expand Down
3 changes: 2 additions & 1 deletion mlir/lib/Dialect/SPIRV/Transforms/SPIRVConversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,8 @@ getOrInsertBuiltinVariable(Block &body, Location loc, spirv::BuiltIn builtin,
}
case spirv::BuiltIn::SubgroupId:
case spirv::BuiltIn::NumSubgroups:
case spirv::BuiltIn::SubgroupSize: {
case spirv::BuiltIn::SubgroupSize:
case spirv::BuiltIn::SubgroupLocalInvocationId: {
auto ptrType =
spirv::PointerType::get(integerType, spirv::StorageClass::Input);
std::string name = getBuiltinVarName(builtin, prefix, suffix);
Expand Down
22 changes: 22 additions & 0 deletions mlir/test/Conversion/GPUToSPIRV/builtins-opencl.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,25 @@ module attributes {
}
}
}

// -----

module attributes {
gpu.container_module,
spirv.target_env = #spirv.target_env<#spirv.vce<v1.0, [Addresses, Kernel, Int64], []>, #spirv.resource_limits<>>
} {
// INDEX32-LABEL: spirv.module @{{.*}} Physical32 OpenCL
// INDEX32: spirv.GlobalVariable [[LANEID:@.*]] built_in("SubgroupLocalInvocationId") : !spirv.ptr<i32, Input>
// INDEX64-LABEL: spirv.module @{{.*}} Physical64 OpenCL
// INDEX64: spirv.GlobalVariable [[LANEID:@.*]] built_in("SubgroupLocalInvocationId") : !spirv.ptr<i32, Input>
gpu.module @kernels {
gpu.func @builtin_laneid() kernel
attributes {spirv.entry_point_abi = #spirv.entry_point_abi<workgroup_size = [16, 1, 1]>} {
// INDEX32: [[ADDRESS:%.*]] = spirv.mlir.addressof [[LANEID]]
// INDEX32-NEXT: {{%.*}} = spirv.Load "Input" [[ADDRESS]]
// INDEX64: spirv.UConvert %{{.+}} : i32 to i64
%0 = gpu.lane_id
gpu.return
}
}
}
Loading