Skip to content

[mlir][spirv]: Add ImageSsupport in ABI Lowering #150996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FranklandJack merged 3 commits into from
Jul 29, 2025
Merged

[mlir][spirv]: Add ImageSsupport in ABI Lowering #150996

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4c348
[mlir][spirv]: Add ImageSsupport in ABI Lowering
FranklandJack Jul 28, 2025
fd5c33d
[mlir][spirv]: Address Feedback
FranklandJack Jul 29, 2025
5d57b0b
[mlir][spirv]: Address Feedback
FranklandJack Jul 29, 2025
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
12 changes: 11 additions & 1 deletion mlir/lib/Dialect/SPIRV/Transforms/LowerABIAttributesPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,17 @@ createGlobalVarForEntryPointArgument(OpBuilder &builder, spirv::FuncOp funcOp,
spirv::PointerType::get(spirv::StructType::get(varType), *storageClass);
}
auto varPtrType = cast<spirv::PointerType>(varType);
auto varPointeeType = cast<spirv::StructType>(varPtrType.getPointeeType());
Type pointeeType = varPtrType.getPointeeType();

// Images are an opaque type and so we can just return a pointer to an image.
// Note that currently only sampled images are supported in the SPIR-V
// lowering.
if (isa<spirv::SampledImageType>(pointeeType))
return builder.create<spirv::GlobalVariableOp>(
funcOp.getLoc(), varType, varName, abiInfo.getDescriptorSet(),
abiInfo.getBinding());

auto varPointeeType = cast<spirv::StructType>(pointeeType);

// Set the offset information.
varPointeeType =
Expand Down
24 changes: 24 additions & 0 deletions mlir/test/Dialect/SPIRV/Transforms/abi-interface.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,27 @@ spirv.module Logical GLSL450 attributes {spirv.target_env = #spirv.target_env<#s
// CHECK: spirv.EntryPoint "GLCompute" [[FN]], [[VAR0]], [[VAR1]]
// CHECK: spirv.ExecutionMode [[FN]] "LocalSize", 32, 1, 1
} // end spirv.module

// -----

module {
spirv.module Logical GLSL450 attributes {spirv.target_env = #spirv.target_env<#spirv.vce<v1.6, [Shader, Sampled1D], []>, #spirv.resource_limits<>>} {
// CHECK-DAG: spirv.GlobalVariable @[[IMAGE_GV:.*]] bind(0, 0) : !spirv.ptr<!spirv.sampled_image<!spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>>, UniformConstant>
// CHECK: spirv.func @read_image
spirv.func @read_image(%arg0: !spirv.ptr<!spirv.sampled_image<!spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>>, UniformConstant> {spirv.interface_var_abi = #spirv.interface_var_abi<(0, 0)>}, %arg1: !spirv.ptr<!spirv.struct<(!spirv.array<1 x f32, stride=4> [0])>, StorageBuffer> {spirv.interface_var_abi = #spirv.interface_var_abi<(0, 1)>}) "None" attributes {spirv.entry_point_abi = #spirv.entry_point_abi<workgroup_size = [1, 1, 1]>} {
// CHECK: %[[IMAGE_ADDR:.*]] = spirv.mlir.addressof @[[IMAGE_GV]] : !spirv.ptr<!spirv.sampled_image<!spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>>, UniformConstant>
%cst0_i32 = spirv.Constant 0 : i32
// CHECK: spirv.Load "UniformConstant" %[[IMAGE_ADDR]]
%0 = spirv.Load "UniformConstant" %arg0 : !spirv.sampled_image<!spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>>
%1 = spirv.Image %0 : !spirv.sampled_image<!spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>>
%2 = spirv.ImageFetch %1, %cst0_i32 : !spirv.image<f32, Dim1D, DepthUnknown, NonArrayed, SingleSampled, NeedSampler, R32f>, i32 -> vector<4xf32>
%3 = spirv.CompositeExtract %2[0 : i32] : vector<4xf32>
%cst0_i32_0 = spirv.Constant 0 : i32
%cst0_i32_1 = spirv.Constant 0 : i32
%cst1_i32 = spirv.Constant 1 : i32
%4 = spirv.AccessChain %arg1[%cst0_i32_0, %cst0_i32] : !spirv.ptr<!spirv.struct<(!spirv.array<1 x f32, stride=4> [0])>, StorageBuffer>, i32, i32 -> !spirv.ptr<f32, StorageBuffer>
spirv.Store "StorageBuffer" %4, %3 : f32
spirv.Return
}
}
}