Skip to content

[mlir][spirv] Fix lookup logic spirv.target_env for gpu.module #147262

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

[mlir][spirv] Fix lookup logic spirv.target_env for gpu.module #147262

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5d05b68
[mlir][SPIRV] Fix lookup logic `spirv.target_env` for `gpu.module`
oojahooo Jul 7, 2025
71d3d92
Add test
oojahooo Jul 8, 2025
ae6ba9c
Delete braces for complying with conding standard
oojahooo Jul 8, 2025
fa3b44e
fixup! [mlir][SPIRV] Fix lookup logic `spirv.target_env` for `gpu.mod…
oojahooo Jul 10, 2025
7d43c59
Remove unnecessary check in test
oojahooo Jul 10, 2025
40b6f07
Add same lookup target env logic in GPUModuleConversion
oojahooo Jul 10, 2025
0b68019
fixup! Add same lookup target env logic in GPUModuleConversion
oojahooo Jul 10, 2025
0833b2a
Update mlir/test/Conversion/GPUToSPIRV/lookup-target-env.mlir
oojahooo Jul 11, 2025
a688ec2
Spell out the not obvious types
oojahooo Jul 11, 2025
1f38539
Add documentation comments
oojahooo Jul 11, 2025
9344c20
Simplify pass pipeline of test code
oojahooo Jul 11, 2025
3f8a379
Fix failures in other tests
oojahooo Jul 16, 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
4 changes: 4 additions & 0 deletions mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ LogicalResult GPUModuleConversion::matchAndRewrite(
if (auto attr = moduleOp->getAttrOfType<spirv::TargetEnvAttr>(
spirv::getTargetEnvAttrName()))
spvModule->setAttr(spirv::getTargetEnvAttrName(), attr);
for (auto targetAttr : moduleOp.getTargetsAttr())
if (auto spirvTargetEnvAttr =
llvm::dyn_cast<spirv::TargetEnvAttr>(targetAttr))
spvModule->setAttr(spirv::getTargetEnvAttrName(), spirvTargetEnvAttr);

rewriter.eraseOp(moduleOp);
return success();
Expand Down
27 changes: 23 additions & 4 deletions mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,38 @@ struct GPUToSPIRVPass final : impl::ConvertGPUToSPIRVBase<GPUToSPIRVPass> {
void runOnOperation() override;

private:
spirv::TargetEnvAttr lookupTargetEnvInTargets(gpu::GPUModuleOp moduleOp);
spirv::TargetEnvAttr lookupTargetEnvOrDefault(gpu::GPUModuleOp moduleOp);
bool mapMemorySpace;
};

spirv::TargetEnvAttr
GPUToSPIRVPass::lookupTargetEnvInTargets(gpu::GPUModuleOp moduleOp) {
for (auto &targetAttr : moduleOp.getTargetsAttr())
if (auto spirvTargetEnvAttr =
llvm::dyn_cast<spirv::TargetEnvAttr>(targetAttr))
return spirvTargetEnvAttr;

return {};
}

spirv::TargetEnvAttr
GPUToSPIRVPass::lookupTargetEnvOrDefault(gpu::GPUModuleOp moduleOp) {
if (auto targetEnvAttr = lookupTargetEnvInTargets(moduleOp))
return targetEnvAttr;

return spirv::lookupTargetEnvOrDefault(moduleOp);
}

void GPUToSPIRVPass::runOnOperation() {
MLIRContext *context = &getContext();
ModuleOp module = getOperation();

SmallVector<Operation *, 1> gpuModules;
OpBuilder builder(context);

auto targetEnvSupportsKernelCapability = [](gpu::GPUModuleOp moduleOp) {
Operation *gpuModule = moduleOp.getOperation();
auto targetAttr = spirv::lookupTargetEnvOrDefault(gpuModule);
auto targetEnvSupportsKernelCapability = [this](gpu::GPUModuleOp moduleOp) {
auto targetAttr = lookupTargetEnvOrDefault(moduleOp);
spirv::TargetEnv targetEnv(targetAttr);
return targetEnv.allows(spirv::Capability::Kernel);
};
Expand All @@ -86,7 +105,7 @@ void GPUToSPIRVPass::runOnOperation() {
// TargetEnv attributes.
for (Operation *gpuModule : gpuModules) {
spirv::TargetEnvAttr targetAttr =
spirv::lookupTargetEnvOrDefault(gpuModule);
lookupTargetEnvOrDefault(llvm::cast<gpu::GPUModuleOp>(gpuModule));

// Map MemRef memory space to SPIR-V storage class first if requested.
if (mapMemorySpace) {
Expand Down
7 changes: 0 additions & 7 deletions mlir/lib/Dialect/SPIRV/IR/TargetAndABI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,6 @@ spirv::TargetEnvAttr spirv::lookupTargetEnv(Operation *op) {
if (!op)
break;

if (auto arrAttr = op->getAttrOfType<ArrayAttr>("targets")) {
for (auto attr : arrAttr)
if (auto spirvTargetEnvAttr =
llvm::dyn_cast<spirv::TargetEnvAttr>(attr))
return spirvTargetEnvAttr;
}

if (auto attr = op->getAttrOfType<spirv::TargetEnvAttr>(
spirv::getTargetEnvAttrName()))
return attr;
Expand Down
2 changes: 1 addition & 1 deletion mlir/test/Conversion/GPUToSPIRV/lookup-target-env.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: mlir-opt --spirv-attach-target='caps=Shader exts=SPV_KHR_storage_buffer_storage_class' --convert-gpu-to-spirv %s -o - | FileCheck %s

module attributes {gpu.container_module} {
// CHECK-LABEL: spirv.module @{{.*}} GLSL450 requires #spirv.vce<v1.0, [Shader], [SPV_KHR_storage_buffer_storage_class]> {
// CHECK-LABEL: spirv.module @{{.*}} GLSL450
gpu.module @kernels {
// CHECK: spirv.func @load_kernel
// CHECK-SAME: %[[ARG:.*]]: !spirv.ptr<!spirv.struct<(!spirv.array<48 x f32, stride=4> [0])>, StorageBuffer> {spirv.interface_var_abi = #spirv.interface_var_abi<(0, 0)>})
Expand Down