[mlir] Added RankedIntElementsAttr class

[Joonsoo]

Summary

Defines a tablegen class RankedIntElementsAttr. This is an integer version of RankedFloatElementsAttr.

[merge_guards_bot]

Unit tests: fail. 62357 tests passed, 1 failed and 839 were skipped.

failed: libc++.std/containers/sequences/array/array_creation/to_array.fail.cpp

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[ftynse]

mlir/include/mlir/IR/OpBase.td

1047

Would it be possible to make this a bit more readable than a 7-line flow of tokens? One suggestion is to use (1) reuse the predicate of IntElementsAttr and (2) use the And class to combine predicates instead of manual "&&". We actually have an expression simplifier in the op that relies on that.

1052

Drop llvm::, ArrayRef is re-exported into the mlir namespace

[Joonsoo]

Fixed compile error and improve readability

[Joonsoo]

Restored missing conditions

[Joonsoo]

Improve predicate readability

[merge_guards_bot]

Unit tests: fail. 62356 tests passed, 2 failed and 839 were skipped.

failed: MLIR.IR/attribute.mlir
failed: libc++.std/containers/sequences/array/array_creation/to_array.fail.cpp

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[merge_guards_bot]

Unit tests: fail. 62357 tests passed, 1 failed and 839 were skipped.

failed: libc++.std/containers/sequences/array/array_creation/to_array.fail.cpp

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[merge_guards_bot]

Unit tests: fail. 62357 tests passed, 1 failed and 839 were skipped.

failed: libc++.std/containers/sequences/array/array_creation/to_array.fail.cpp

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[ftynse]

LGTM after one nit is fixed.

mlir/include/mlir/IR/OpBase.td

1058

Drop llvm::, ArrayRef is re-exported into the mlir namespace

[Joonsoo]

Drop llvm:: from llvm::makeArrayRef

[merge_guards_bot]

Unit tests: fail. 62357 tests passed, 1 failed and 839 were skipped.

failed: libc++.std/containers/sequences/array/array_creation/to_array.fail.cpp

clang-tidy: pass.

clang-format: pass.

Build artifacts: diff.json, clang-tidy.txt, clang-format.patch, CMakeCache.txt, console-log.txt, test-results.xml

Pre-merge checks is in beta. Report issue. Please join beta or enable it for your project.

[antiagainst]

LGTM, just two nits regarding the test names.

mlir/test/IR/attribute.mlir

276

wrong_shape_fail ?

287

wrong_shape_fail ?

[Joonsoo]

Fixed test case names

mlir/include/mlir/IR/OpBase.td

let constBuilderCall = "DenseElementsAttr::get("
     "RankedTensorType::get({}, $_builder.getIntegerType(" # width # ")), "
     "llvm::makeArrayRef($0)).cast<DenseIntElementsAttr>()";
   let convertFromStorage = "$_self";
 }
 
 def I32ElementsAttr : IntElementsAttr<32>;
 def I64ElementsAttr : IntElementsAttr<64>;
 
+// A `width`-bit integer elements attribute. The attribute should be ranked and
+// has a shape as specified in `dims`.
+class RankedIntElementsAttr<int width, list<int> dims> : IntElementsAttr<width> {
+  // Check that this has the specified shape.
+  let predicate = And<[
+    IntElementsAttr<width>.predicate,
+    CPred<"$_self.cast<DenseIntElementsAttr>().getType().getShape() == "
+        "ArrayRef<int64_t>({" # StrJoinInt<dims>.result # "})">]>;
+
+  let description = width # "-bit int elements attribute of shape [" #
+                    StrJoinInt<dims>.result # "]";
+
+  let constBuilderCall = "DenseIntElementsAttr::get("
+    "RankedTensorType::get({" # StrJoinInt<dims>.result #
+    "}, $_builder.getIntegerType(" # width # ")), makeArrayRef($0))";
+}
+
+class RankedI32ElementsAttr<list<int> dims> : RankedIntElementsAttr<32, dims>;
+class RankedI64ElementsAttr<list<int> dims> : RankedIntElementsAttr<64, dims>;
+
 class FloatElementsAttr<int width> : ElementsAttrBase<
   CPred<"$_self.isa<DenseFPElementsAttr>() &&"
       "$_self.cast<DenseElementsAttr>().getType()."
       "getElementType().isF" # width # "()">,
   width # "-bit float elements attribute"> {
 
   let storageType = [{ DenseElementsAttr }];
   let returnType = [{ DenseElementsAttr }];

mlir/test/IR/attribute.mlir

 
 // CHECK: test.symbol_ref_attr
 "test.symbol_ref_attr"() {symbol = @fn} : () -> ()
 
 // -----
 
 // expected-error @+1 {{referencing to a 'FuncOp' symbol}}
 "test.symbol_ref_attr"() {symbol = @foo} : () -> ()
+
+// -----
+
+//===----------------------------------------------------------------------===//
+// Test IntElementsAttr
+//===----------------------------------------------------------------------===//
+
+func @correct_type_pass() {
+  "test.int_elements_attr"() {
+    // CHECK: matrix_i64_attr = dense<6> : tensor<4x8xi64>
+    // CHECK: vector_i32_attr = dense<5> : tensor<2xi32>
+    matrix_i64_attr = dense<6> : tensor<4x8xi64>,
+    vector_i32_attr = dense<5> : tensor<2xi32>
+  } : () -> ()
+  return
+}
+
+// -----
+
+func @wrong_element_type_fail() {
+  // expected-error @+1 {{failed to satisfy constraint: 32-bit int elements attribute of shape [2]}}
+  "test.int_elements_attr"() {
+    matrix_i64_attr = dense<6> : tensor<4x8xi64>,
+    vector_i32_attr = dense<5> : tensor<2xi64>
+  } : () -> ()
+  return
+}
+
+// -----
+
+func @wrong_shape_fail() {
+  // expected-error @+1 {{failed to satisfy constraint: 64-bit int elements attribute of shape [4, 8]}}
+  "test.int_elements_attr"() {
+    matrix_i64_attr = dense<6> : tensor<4xi64>,
+    vector_i32_attr = dense<5> : tensor<2xi32>
+  } : () -> ()
+  return
+}
+
+// -----
+
+func @wrong_shape_fail() {
+  // expected-error @+1 {{failed to satisfy constraint: 32-bit int elements attribute of shape [2]}}
+  "test.int_elements_attr"() {
+    matrix_i64_attr = dense<6> : tensor<4x8xi64>,
+    vector_i32_attr = dense<5> : tensor<i32>
+  } : () -> ()
+  return
+}
+

mlir/test/lib/TestDialect/TestOps.td

 def UpdateFloatElementsAttr : Pat<
   (FloatElementsAttrOp
     ConstantAttr<RankedF32ElementsAttr<[2]>, "{3.0f, 4.0f}">:$f32attr,
     $f64attr),
   (FloatElementsAttrOp
     ConstantAttr<RankedF32ElementsAttr<[2]>, "{5.0f, 6.0f}">:$f32attr,
     $f64attr)>;
 
+def IntElementsAttrOp : TEST_Op<"int_elements_attr"> {
+  let arguments = (ins
+      RankedI32ElementsAttr<[2]>:$vector_i32_attr,
+      RankedI64ElementsAttr<[4, 8]>:$matrix_i64_attr
+  );
+}
+
 //===----------------------------------------------------------------------===//
 // Test Attribute Constraints
 //===----------------------------------------------------------------------===//
 
 def SymbolRefOp : TEST_Op<"symbol_ref_attr"> {
   let arguments = (ins
     Confined<FlatSymbolRefAttr, [ReferToOp<"FuncOp">]>:$symbol
   );