[Mlir-commits] [mlir] d259594 - [mlir][ods] AttrOrTypeDef format: parse types

[llvmlistbot at llvm.org]

Author: Mogball
Date: 2021-11-14T23:24:29Z
New Revision: d259594be968b9a07bb937c27ba041ed14276bab

URL: https://github.com/llvm/llvm-project/commit/d259594be968b9a07bb937c27ba041ed14276bab
DIFF: https://github.com/llvm/llvm-project/commit/d259594be968b9a07bb937c27ba041ed14276bab.diff

LOG: [mlir][ods] AttrOrTypeDef format: parse types

Add template specialization to `FieldParser` for parsing types.

Reviewed By: mehdi_amini

Differential Revision: https://reviews.llvm.org/D113867

Added: 
    

Modified: 
    mlir/include/mlir/IR/DialectImplementation.h
    mlir/test/lib/Dialect/Test/TestAttrDefs.td
    mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir
    mlir/test/mlir-tblgen/attr-or-type-format.mlir

Removed: 
    


################################################################################
diff  --git a/mlir/include/mlir/IR/DialectImplementation.h b/mlir/include/mlir/IR/DialectImplementation.h
index b841135ca1a9c..1d0c4887e25e5 100644
--- a/mlir/include/mlir/IR/DialectImplementation.h
+++ b/mlir/include/mlir/IR/DialectImplementation.h
@@ -70,6 +70,18 @@ struct FieldParser<
   }
 };
 
+/// Parse a type.
+template <typename TypeT>
+struct FieldParser<
+    TypeT, std::enable_if_t<std::is_base_of<Type, TypeT>::value, TypeT>> {
+  static FailureOr<TypeT> parse(AsmParser &parser) {
+    TypeT value;
+    if (parser.parseType(value))
+      return failure();
+    return value;
+  }
+};
+
 /// Parse any integer.
 template <typename IntT>
 struct FieldParser<IntT,

diff  --git a/mlir/test/lib/Dialect/Test/TestAttrDefs.td b/mlir/test/lib/Dialect/Test/TestAttrDefs.td
index af56d3cae8ddb..a9721cf31de81 100644
--- a/mlir/test/lib/Dialect/Test/TestAttrDefs.td
+++ b/mlir/test/lib/Dialect/Test/TestAttrDefs.td
@@ -161,4 +161,12 @@ def TestAttrParams: Test_Attr<"TestAttrParams"> {
   let assemblyFormat = "`<` params `>`";
 }
 
+// Test types can be parsed/printed.
+def TestAttrWithTypeParam : Test_Attr<"TestAttrWithTypeParam"> {
+  let parameters = (ins "::mlir::IntegerType":$int_type,
+                        "::mlir::Type":$any_type);
+  let mnemonic = "attr_with_type";
+  let assemblyFormat = "`<` $int_type `,` $any_type `>`";
+}
+
 #endif // TEST_ATTRDEFS

diff  --git a/mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir b/mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir
index f403f6f4b059d..20aef66e183f4 100644
--- a/mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir
+++ b/mlir/test/mlir-tblgen/attr-or-type-format-roundtrip.mlir
@@ -12,7 +12,9 @@ attributes {
   // CHECK: #test<"attr_ugly begin 5 : index end">
   attr2 = #test<"attr_ugly begin 5 : index end">,
   // CHECK: #test.attr_params<42, 24>
-  attr3 = #test.attr_params<42, 24>
+  attr3 = #test.attr_params<42, 24>,
+  // CHECK: #test.attr_with_type<i32, vector<4xi32>>
+  attr4 = #test.attr_with_type<i32, vector<4xi32>>
 }
 
 // CHECK-LABEL: @test_roundtrip_default_parsers_struct

diff  --git a/mlir/test/mlir-tblgen/attr-or-type-format.mlir b/mlir/test/mlir-tblgen/attr-or-type-format.mlir
index 3ff638c5f640f..c5b02eb35d0bc 100644
--- a/mlir/test/mlir-tblgen/attr-or-type-format.mlir
+++ b/mlir/test/mlir-tblgen/attr-or-type-format.mlir
@@ -125,3 +125,11 @@ func private @test_verifier_fails() -> () attributes {
   // expected-error at +1 {{expected 'one' to equal 'four.size()'}}
   attr = #test.attr_with_format<42 : two = "hello", four = [1, 2, 3] : 42 : i64>
 }
+
+// -----
+
+func private @test_attr_with_type_failed_to_parse_type() -> () attributes {
+  // expected-error at +2 {{invalid kind of type specified}}
+  // expected-error at +1 {{failed to parse TestAttrWithTypeParam parameter 'int_type'}}
+  attr = #test.attr_with_type<vector<4xi32>, vector<4xi32>>
+}