Skip to content

[mlir][llvm] Fix verifier for const int and dense #74340

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
Dec 5, 2023
Merged

[mlir][llvm] Fix verifier for const int and dense #74340

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
4714090
[mlir][llvm] Fix verifier for const int
rikhuijzer Dec 4, 2023
ee0a857
Throw error on vector attr with float type
rikhuijzer Dec 4, 2023
f55e793
Apply `clang-format`
rikhuijzer Dec 4, 2023
aadff25
Trigger CI
rikhuijzer Dec 5, 2023
2245d1a
Merge branch 'main' into rh/mismatched-llvm-int-const
rikhuijzer Dec 5, 2023
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
10 changes: 10 additions & 0 deletions mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,6 +2544,10 @@ LogicalResult LLVM::ConstantOp::verify() {
if (!llvm::isa<IntegerAttr, ArrayAttr, FloatAttr, ElementsAttr>(getValue()))
return emitOpError()
<< "only supports integer, float, string or elements attributes";
if (auto intAttr = dyn_cast<IntegerAttr>(getValue())) {
if (!llvm::isa<IntegerType>(getType()))
return emitOpError() << "expected integer type";
}
if (auto floatAttr = dyn_cast<FloatAttr>(getValue())) {
const llvm::fltSemantics &sem = floatAttr.getValue().getSemantics();
unsigned floatWidth = APFloat::getSizeInBits(sem);
Expand All @@ -2558,6 +2562,12 @@ LogicalResult LLVM::ConstantOp::verify() {
return emitOpError() << "expected integer type of width " << floatWidth;
}
}
if (auto splatAttr = dyn_cast<SplatElementsAttr>(getValue())) {
if (!getType().isa<VectorType>() && !getType().isa<LLVM::LLVMArrayType>() &&
!getType().isa<LLVM::LLVMFixedVectorType>() &&
!getType().isa<LLVM::LLVMScalableVectorType>())
return emitOpError() << "expected vector or array type";
}
return success();
}

Expand Down
16 changes: 16 additions & 0 deletions mlir/test/Target/LLVMIR/llvmir-invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ func.func @foo() {

// -----

llvm.func @vector_with_non_vector_type() -> f32 {
// expected-error @below{{expected vector or array type}}
%cst = llvm.mlir.constant(dense<100.0> : vector<1xf64>) : f32
llvm.return %cst : f32
}

// -----

llvm.func @no_non_complex_struct() -> !llvm.array<2 x array<2 x array<2 x struct<(i32)>>>> {
// expected-error @below{{expected struct type to be a complex number}}
%0 = llvm.mlir.constant(dense<[[[1, 2], [3, 4]], [[42, 43], [44, 45]]]> : tensor<2x2x2xi32>) : !llvm.array<2 x array<2 x array<2 x struct<(i32)>>>>
Expand All @@ -31,6 +39,14 @@ llvm.func @struct_wrong_attribute_element_type() -> !llvm.struct<(f64, f64)> {

// -----

llvm.func @integer_with_float_type() -> f32 {
// expected-error @+1 {{expected integer type}}
%0 = llvm.mlir.constant(1 : index) : f32
llvm.return %0 : f32
}

// -----

llvm.func @incompatible_float_attribute_type() -> f32 {
// expected-error @below{{expected float type of width 64}}
%cst = llvm.mlir.constant(1.0 : f64) : f32
Expand Down