intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-25 01:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mlir][NFC] Fully qualify TableGen generated code handling properties

Browse Source 
This makes it possible to compile the TableGen generated files without having to use `using namespace mlir;` or being in the `mlir` namespace.
This commit is contained in:
Markus Böck
2023-06-30 17:28:15 +02:00
parent 1d75b18843
commit ba047d0991
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/include/mlir/IR/OpBase.td
View File

@@ -253,8 +253,8 @@ class Property<string storageTypeParam = "", string desc = ""> {
// - `$_storage` is the storage type value.
// - `$_reader` is a `DialectBytecodeReader`.
code readFromMlirBytecode = [{
if (failed(readFromMlirBytecode($_reader, $_storage)))
return failure();
if (::mlir::failed(readFromMlirBytecode($_reader, $_storage)))
return ::mlir::failure();
}];
// Default value for the property.

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

@@ -1123,11 +1123,11 @@ void OpEmitter::genPropertiesSupport() {
// Convert the property to the attribute form.
setPropMethod << R"decl(
::mlir::DictionaryAttr dict = dyn_cast<::mlir::DictionaryAttr>(attr);
::mlir::DictionaryAttr dict = ::llvm::dyn_cast<::mlir::DictionaryAttr>(attr);
if (!dict) {
if (diag)
*diag << "expected DictionaryAttr to set properties";
return failure();
return ::mlir::failure();
}
)decl";
// TODO: properties might be optional as well.
@@ -1142,9 +1142,10 @@ void OpEmitter::genPropertiesSupport() {
if (diag)
*diag << "expected key entry for {1} in DictionaryAttr to set "
"Properties.";
return failure();
return ::mlir::failure();
}
if (failed(setFromAttr(prop.{1}, attr, diag))) return ::mlir::failure();
if (::mlir::failed(setFromAttr(prop.{1}, attr, diag)))
return ::mlir::failure();
}
)decl";
for (const auto &attrOrProp : attrOrProperties) {
@@ -1171,15 +1172,15 @@ void OpEmitter::genPropertiesSupport() {
if (diag)
*diag << "expected key entry for {0} in DictionaryAttr to set "
"Properties.";
return failure();
return ::mlir::failure();
}
auto convertedAttr = dyn_cast<std::remove_reference_t<decltype(propStorage)>>(attr);
auto convertedAttr = ::llvm::dyn_cast<std::remove_reference_t<decltype(propStorage)>>(attr);
if (convertedAttr) {{
propStorage = convertedAttr;
} else {{
if (diag)
*diag << "Invalid attribute `{0}` in property conversion: " << attr;
return failure();
return ::mlir::failure();
}
}
}
@@ -1340,7 +1341,7 @@ void OpEmitter::genPropertiesSupport() {
{1};
return ::mlir::success();
};
if (failed(readProp()))
if (::mlir::failed(readProp()))
return ::mlir::failure();
}
)",
@@ -1360,16 +1361,16 @@ void OpEmitter::genPropertiesSupport() {
StringRef name = namedAttr->attrName;
if (namedAttr->isRequired) {
readPropertiesMethod << formatv(R"(
if (failed(reader.readAttribute(prop.{0})))
return failure();
if (::mlir::failed(reader.readAttribute(prop.{0})))
return ::mlir::failure();
)",
name);
writePropertiesMethod
<< formatv(" writer.writeAttribute(prop.{0});\n", name);
} else {
readPropertiesMethod << formatv(R"(
if (failed(reader.readOptionalAttribute(prop.{0})))
return failure();
if (::mlir::failed(reader.readOptionalAttribute(prop.{0})))
return ::mlir::failure();
)",
name);
writePropertiesMethod << formatv(R"(
@@ -1378,7 +1379,7 @@ void OpEmitter::genPropertiesSupport() {
name);
}
}
readPropertiesMethod << " return success();";
readPropertiesMethod << " return ::mlir::success();";
}
void OpEmitter::genAttrGetters() {