Skip to content

[mlir][spirv] Fix verification and serialization replicated constant … #151168

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
merged 5 commits into from
Aug 1, 2025
Merged

[mlir][spirv] Fix verification and serialization replicated constant … #151168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c246a1a
[mlir][spirv] Fix verification and serialization replicated constant …
mahabadm Jul 18, 2025
f0ef523
Addressing code review comments
mahabadm Jul 30, 2025
cfb89f7
Merge branch 'main' into multidim_replicated_const_composites_fix
mahabadm Jul 31, 2025
fd5e115
Merge branch 'main' into multidim_replicated_const_composites_fix
mahabadm Aug 1, 2025
0e80019
Addressing further code review comments
mahabadm Aug 1, 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
28 changes: 17 additions & 11 deletions mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,19 +767,25 @@ void mlir::spirv::AddressOfOp::getAsmResultNames(
// spirv.EXTConstantCompositeReplicate
//===----------------------------------------------------------------------===//

// Returns type of attribute. In case of a TypedAttr this will simply return
// the type. But for an ArrayAttr which is untyped and can be multidimensional
// it creates the ArrayType recursively.
static Type getValueType(Attribute attr) {
if (auto typedAttr = dyn_cast<TypedAttr>(attr)) {
return typedAttr.getType();
}

if (auto arrayAttr = dyn_cast<ArrayAttr>(attr)) {
return spirv::ArrayType::get(getValueType(arrayAttr[0]), arrayAttr.size());
}

return nullptr;
}

LogicalResult spirv::EXTConstantCompositeReplicateOp::verify() {
Type valueType;
if (auto typedAttr = dyn_cast<TypedAttr>(getValue())) {
valueType = typedAttr.getType();
} else if (auto arrayAttr = dyn_cast<ArrayAttr>(getValue())) {
auto typedElemAttr = dyn_cast<TypedAttr>(arrayAttr[0]);
if (!typedElemAttr)
return emitError("value attribute is not typed");
valueType =
spirv::ArrayType::get(typedElemAttr.getType(), arrayAttr.size());
} else {
Type valueType = getValueType(getValue());
if (!valueType)
return emitError("unknown value attribute type");
}

auto compositeType = dyn_cast<spirv::CompositeType>(getType());
if (!compositeType)
Expand Down
28 changes: 17 additions & 11 deletions mlir/lib/Target/SPIRV/Serialization/Serializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,21 @@ uint32_t Serializer::prepareConstantFp(Location loc, FloatAttr floatAttr,
return resultID;
}

// Returns type of attribute. In case of a TypedAttr this will simply return
// the type. But for an ArrayAttr which is untyped and can be multidimensional
// it creates the ArrayType recursively.
static Type getValueType(Attribute attr) {
if (auto typedAttr = dyn_cast<TypedAttr>(attr)) {
return typedAttr.getType();
}

if (auto arrayAttr = dyn_cast<ArrayAttr>(attr)) {
return spirv::ArrayType::get(getValueType(arrayAttr[0]), arrayAttr.size());
}

return nullptr;
}

uint32_t Serializer::prepareConstantCompositeReplicate(Location loc,
Type resultType,
Attribute valueAttr) {
Expand All @@ -1200,18 +1215,9 @@ uint32_t Serializer::prepareConstantCompositeReplicate(Location loc,
return 0;
}

Type valueType;
if (auto typedAttr = dyn_cast<TypedAttr>(valueAttr)) {
valueType = typedAttr.getType();
} else if (auto arrayAttr = dyn_cast<ArrayAttr>(valueAttr)) {
auto typedElemAttr = dyn_cast<TypedAttr>(arrayAttr[0]);
if (!typedElemAttr)
return 0;
valueType =
spirv::ArrayType::get(typedElemAttr.getType(), arrayAttr.size());
} else {
Type valueType = getValueType(valueAttr);
if (!valueAttr)
return 0;
}

auto compositeType = dyn_cast<CompositeType>(resultType);
if (!compositeType)
Expand Down
14 changes: 14 additions & 0 deletions mlir/test/Target/SPIRV/constant.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,13 @@ spirv.module Logical GLSL450 requires #spirv.vce<v1.0, [Shader, ReplicatedCompos
spirv.ReturnValue %0 : !spirv.arm.tensor<2x3xi32>
}

// CHECK-LABEL: @splat_array_of_non_splat_array_of_arrays_of_i32
spirv.func @splat_array_of_non_splat_array_of_arrays_of_i32() -> !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x i32>>> "None" {
// CHECK: spirv.EXT.ConstantCompositeReplicate {{\[}}{{\[}}[1 : i32, 2 : i32, 3 : i32], [4 : i32, 5 : i32, 6 : i32]]] : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x i32>>>
%0 = spirv.EXT.ConstantCompositeReplicate [[[1 : i32, 2 : i32, 3 : i32], [4 : i32, 5 : i32, 6 : i32]]] : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x i32>>>
spirv.ReturnValue %0 : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x i32>>>
}

// CHECK-LABEL: @null_cc_arm_tensor_of_i32
spirv.func @null_cc_arm_tensor_of_i32() -> (!spirv.arm.tensor<2x3xi32>) "None" {
// CHECK: spirv.Constant dense<0> : !spirv.arm.tensor<2x3xi32>
Expand Down Expand Up @@ -461,6 +468,13 @@ spirv.module Logical GLSL450 requires #spirv.vce<v1.0, [Shader, ReplicatedCompos
spirv.ReturnValue %0 : !spirv.arm.tensor<2x3xf32>
}

// CHECK-LABEL: @splat_array_of_non_splat_array_of_arrays_of_f32
spirv.func @splat_array_of_non_splat_array_of_arrays_of_f32() -> !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x f32>>> "None" {
// CHECK: spirv.EXT.ConstantCompositeReplicate {{\[}}{{\[}}[1.000000e+00 : f32, 2.000000e+00 : f32, 3.000000e+00 : f32], [4.000000e+00 : f32, 5.000000e+00 : f32, 6.000000e+00 : f32]]] : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x f32>>>
%0 = spirv.EXT.ConstantCompositeReplicate [[[1.0 : f32, 2.0 : f32, 3.0 : f32], [4.0 : f32, 5.0 : f32, 6.0 : f32]]] : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x f32>>>
spirv.ReturnValue %0 : !spirv.array<2 x !spirv.array<2 x !spirv.array<3 x f32>>>
}

// CHECK-LABEL: @null_cc_arm_tensor_of_f32
spirv.func @null_cc_arm_tensor_of_f32() -> (!spirv.arm.tensor<2x3xf32>) "None" {
// CHECK: spirv.Constant dense<0.000000e+00> : !spirv.arm.tensor<2x3xf32>
Expand Down