Doomhowl-Interactive/llvm-project
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

[mlir] Enhance error messages for attribute type mismatch in properties (#193758)

Browse Source
This commit is contained in:
Vincentius Janssen
2026-04-24 02:37:51 +08:00
committed by GitHub
parent 86230d5091
commit 0bdaf63d01
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mlir/lib/IR/ODSSupport.cpp
View File

@@ -23,7 +23,7 @@ mlir::convertFromAttribute(int64_t &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<IntegerAttr>(attr);
if (!valueAttr) {
emitError() << "expected IntegerAttr for key `value`";
emitError() << "expected IntegerAttr";
return failure();
}
storage = valueAttr.getValue().getSExtValue();
@@ -38,7 +38,7 @@ mlir::convertFromAttribute(int32_t &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<IntegerAttr>(attr);
if (!valueAttr) {
emitError() << "expected IntegerAttr for key `value`";
emitError() << "expected IntegerAttr";
return failure();
}
storage = valueAttr.getValue().getSExtValue();
@@ -53,7 +53,7 @@ mlir::convertFromAttribute(int8_t &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<IntegerAttr>(attr);
if (!valueAttr) {
emitError() << "expected IntegerAttr for key `value`";
emitError() << "expected IntegerAttr";
return failure();
}
storage = valueAttr.getValue().getSExtValue();
@@ -70,7 +70,7 @@ mlir::convertFromAttribute(uint8_t &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<IntegerAttr>(attr);
if (!valueAttr) {
emitError() << "expected IntegerAttr for key `value`";
emitError() << "expected IntegerAttr";
return failure();
}
storage = valueAttr.getValue().getZExtValue();
@@ -87,8 +87,7 @@ mlir::convertFromAttribute(std::string &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<StringAttr>(attr);
if (!valueAttr)
return emitError()
<< "expected string property to come from string attribute";
return emitError() << "expected StringAttr";
storage = valueAttr.getValue().str();
return success();
}
@@ -102,7 +101,7 @@ mlir::convertFromAttribute(bool &storage, Attribute attr,
function_ref<InFlightDiagnostic()> emitError) {
auto valueAttr = dyn_cast<BoolAttr>(attr);
if (!valueAttr)
return emitError() << "expected BoolAttr for key `value`";
return emitError() << "expected BoolAttr";
storage = valueAttr.getValue();
return success();
}
@@ -117,7 +116,7 @@ convertDenseArrayFromAttr(MutableArrayRef<T> storage, Attribute attr,
StringRef denseArrayTyStr) {
auto valueAttr = dyn_cast<DenseArrayTy>(attr);
if (!valueAttr) {
emitError() << "expected " << denseArrayTyStr << " for key `value`";
emitError() << "expected " << denseArrayTyStr;
return failure();
}
if (valueAttr.size() != static_cast<int64_t>(storage.size())) {
@@ -148,7 +147,7 @@ convertDenseArrayFromAttr(SmallVectorImpl<T> &storage, Attribute attr,
StringRef denseArrayTyStr) {
auto valueAttr = dyn_cast<DenseArrayTy>(attr);
if (!valueAttr) {
emitError() << "expected " << denseArrayTyStr << " for key `value`";
emitError() << "expected " << denseArrayTyStr;
return failure();
}
storage.resize_for_overwrite(valueAttr.size());

10
mlir/test/IR/invalid-properties.mlir
View File

@@ -4,7 +4,7 @@
// -----
func.func @wrong_string_prop_type() {
// expected-error@+1 {{expected string property to come from string attribute}}
// expected-error@+1 {{for `c`: expected StringAttr}}
"test.with_properties"() <{b = "foo", c = 32 : i64}> : () -> ()
return
}
@@ -12,7 +12,7 @@ func.func @wrong_string_prop_type() {
// -----
func.func @wrong_bool_prop_type() {
// expected-error@+1 {{expected BoolAttr for key `value`}}
// expected-error@+1 {{for `flag`: expected BoolAttr}}
"test.with_properties"() <{b = "foo", flag = "bar"}> : () -> ()
return
}
@@ -20,7 +20,7 @@ func.func @wrong_bool_prop_type() {
// -----
func.func @wrong_integer_prop_type() {
// expected-error@+1 {{expected IntegerAttr for key `value`}}
// expected-error@+1 {{for `a`: expected IntegerAttr}}
"test.with_properties"() <{b = "foo", a = "bar"}> : () -> ()
return
}
@@ -28,7 +28,7 @@ func.func @wrong_integer_prop_type() {
// -----
func.func @wrong_dense_i64_array_prop_type() {
// expected-error@+1 {{expected DenseI64ArrayAttr for key `value`}}
// expected-error@+1 {{for `array`: expected DenseI64ArrayAttr}}
"test.with_properties"() <{b = "foo", array = array<i32: 1, 2, 3, 4>}> : () -> ()
return
}
@@ -36,7 +36,7 @@ func.func @wrong_dense_i64_array_prop_type() {
// -----
func.func @wrong_dense_i32_array_prop_type() {
// expected-error@+1 {{expected DenseI32ArrayAttr for key `value`}}
// expected-error@+1 {{for `array32`: expected DenseI32ArrayAttr}}
"test.with_properties"() <{b = "foo", array32 = array<i64: 5, 6>}> : () -> ()
return
}

8
mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp
View File

@@ -1441,12 +1441,16 @@ void OpEmitter::genPropertiesSupport() {
{1};
)decl";
const char *attrGetNoDefaultFmt = R"decl(;
if (attr && ::mlir::failed(setFromAttr(prop.{0}, attr, emitError)))
if (attr && ::mlir::failed(setFromAttr(prop.{0}, attr, [&]() {{
return emitError() << "for `{0}`: ";
})))
return ::mlir::failure();
)decl";
const char *attrGetDefaultFmt = R"decl(;
if (attr) {{
if (::mlir::failed(setFromAttr(prop.{0}, attr, emitError)))
if (::mlir::failed(setFromAttr(prop.{0}, attr, [&]() {{
return emitError() << "for `{0}`: ";
})))
return ::mlir::failure();
} else {{
prop.{0} = {1};

4
mlir/tools/mlir-tblgen/OpFormatGen.cpp
View File

@@ -1329,7 +1329,9 @@ if (!attr && {2}) {{
"Properties.";
return ::mlir::failure();
}
if (attr && ::mlir::failed(setFromAttr(prop.{1}, attr, emitError)))
if (attr && ::mlir::failed(setFromAttr(prop.{1}, attr, [&]() {{
return emitError() << "for `{1}`: ";
})))
return ::mlir::failure();
)decl";