Merge pull request #481 from Xilinx/jrickert.print_newline_skipped_attrs

Do not print unnecessary newlines if attributes are elided

Author: jorickert

mlir/lib/IR/AsmPrinter.cpp

@@ -2791,7 +2791,8 @@ void AsmPrinter::Impl::printOptionalAttrDict(ArrayRef<NamedAttribute> attrs,
 
     SmallString<16> separator = StringRef(", ");
     if (printerFlags.getNewlineAfterAttrLimit() &&
-        attrs.size() > *printerFlags.getNewlineAfterAttrLimit()) {
+        std::distance(filteredAttrs.begin(), filteredAttrs.end()) >
+            *printerFlags.getNewlineAfterAttrLimit()) {
 
       // Increase indent to match the visually match the "{ " below.
       // currentIndent += 2;

mlir/test/IR/mlir-newline-after-attr.mlir

@@ -29,3 +29,6 @@
 // CHECK-NEXT:    ],
 "test.op"() {foo.dense_attr = dense<1> : tensor<3xi32>, foo.second_attr = dense<2> : tensor<3xi32>, Operands = [{foo.vect_attr_1_start = dense<0> : vector<3xindex>, foo.vect_attr_1_end = dense<0> : vector<3xindex>, foo.vect_attr_1_count = dense<1> : vector<3xindex>, foo.vect_attr_2_start = dense<0> : vector<3xindex>, foo.vect_attr_2_end = dense<0> : vector<3xindex>, foo.vect_attr_2_count = dense<1> : vector<3xindex>}, {foo.vect_attr_1_start = dense<0> : vector<3xindex>, foo.vect_attr_1_end = dense<0> : vector<3xindex>, foo.vect_attr_1_count = dense<1> : vector<3xindex>, foo.vect_attr_2_start = dense<0> : vector<3xindex>, foo.vect_attr_2_end = dense<0> : vector<3xindex>, foo.vect_attr_2_count = dense<1> : vector<3xindex>}]} : () -> ()
 
+// const_shape skips over shape attr when printing. Check that we do not insert unnecessary newlines
+// CHECK{LITERAL}: shape.const_shape  {foo.second_attr = dense<2> : tensor<3xi32>, foo.third_attr = dense<2> : tensor<3xi32>}[1, 1, 1] : tensor<3xindex>
+"shape.const_shape"()  {shape = dense<1> : tensor<3xindex>, foo.second_attr = dense<2> : tensor<3xi32>, foo.third_attr = dense<2> : tensor<3xi32>} : () -> (tensor<3xindex>)