diff options
author | Chris Lattner <clattner@google.com> | 2019-04-05 23:56:49 -0700 |
---|---|---|
committer | Mehdi Amini <joker.eph@gmail.com> | 2019-04-07 18:21:13 -0700 |
commit | 72441fcbf20dd90f2bece2d99cada6cf708588fd (patch) | |
tree | 14dc7b627efb7feae40500249940df29aea5f196 /mlir/test/Examples | |
parent | 3f93d93367c15082d11fe4573af80cc3c4f3da11 (diff) | |
download | llvm-72441fcbf20dd90f2bece2d99cada6cf708588fd.zip llvm-72441fcbf20dd90f2bece2d99cada6cf708588fd.tar.gz llvm-72441fcbf20dd90f2bece2d99cada6cf708588fd.tar.bz2 |
Change the asmprinter to use pretty syntax for dialect types when it can,
making the IR dumps much nicer.
This is part 2/3 of the path to making dialect types more nice. Part 3/3 will
slightly generalize the set of characters allowed in pretty types and make it
more principled.
--
PiperOrigin-RevId: 242249955
Diffstat (limited to 'mlir/test/Examples')
-rw-r--r-- | mlir/test/Examples/Toy/Ch2/codegen.toy | 22 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch2/invalid.mlir | 2 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch3/codegen.toy | 22 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch3/invalid.mlir | 2 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch3/scalar.toy | 6 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch4/codegen.toy | 22 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch4/invalid.mlir | 2 | ||||
-rw-r--r-- | mlir/test/Examples/Toy/Ch4/scalar.toy | 6 |
8 files changed, 42 insertions, 42 deletions
diff --git a/mlir/test/Examples/Toy/Ch2/codegen.toy b/mlir/test/Examples/Toy/Ch2/codegen.toy index e361a09..e2ff0fe 100644 --- a/mlir/test/Examples/Toy/Ch2/codegen.toy +++ b/mlir/test/Examples/Toy/Ch2/codegen.toy @@ -13,20 +13,20 @@ def main() { print(d); } -# CHECK-LABEL: func @multiply_transpose(%arg0: !toy<"array">, %arg1: !toy<"array">) +# CHECK-LABEL: func @multiply_transpose(%arg0: !toy.array, %arg1: !toy.array) # CHECK-NEXT: attributes {toy.generic: true} { -# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy<"array">) -> !toy<"array"> -# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy<"array">, !toy<"array">) -> !toy<"array"> -# CHECK-NEXT: "toy.return"(%1) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy.array) -> !toy.array +# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy.array, !toy.array) -> !toy.array +# CHECK-NEXT: "toy.return"(%1) : (!toy.array) -> () # CHECK-NEXT: } # CHECK-LABEL: func @main() { -# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy<"array<2, 3>"> -# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy<"array<2, 3>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy<"array<6>"> -# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy<"array<6>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: "toy.print"(%5) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy.array<2, 3> +# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy.array<2, 3>) -> !toy.array<2, 3> +# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy.array<6> +# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy.array<6>) -> !toy.array<2, 3> +# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: "toy.print"(%5) : (!toy.array) -> () # CHECK-NEXT: "toy.return"() : () -> () diff --git a/mlir/test/Examples/Toy/Ch2/invalid.mlir b/mlir/test/Examples/Toy/Ch2/invalid.mlir index fe8369b..919dbea 100644 --- a/mlir/test/Examples/Toy/Ch2/invalid.mlir +++ b/mlir/test/Examples/Toy/Ch2/invalid.mlir @@ -7,5 +7,5 @@ // - There should be a block terminator. // This all round-trip since this is opaque for MLIR. func @main() { - %0 = "toy.print"() : () -> !toy<"array<2, 3>"> + %0 = "toy.print"() : () -> !toy.array<2, 3> } diff --git a/mlir/test/Examples/Toy/Ch3/codegen.toy b/mlir/test/Examples/Toy/Ch3/codegen.toy index a4d7058..03e9d36 100644 --- a/mlir/test/Examples/Toy/Ch3/codegen.toy +++ b/mlir/test/Examples/Toy/Ch3/codegen.toy @@ -13,20 +13,20 @@ def main() { print(d); } -# CHECK-LABEL: func @multiply_transpose(%arg0: !toy<"array">, %arg1: !toy<"array">) +# CHECK-LABEL: func @multiply_transpose(%arg0: !toy.array, %arg1: !toy.array) # CHECK-NEXT: attributes {toy.generic: true} { -# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy<"array">) -> !toy<"array"> -# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy<"array">, !toy<"array">) -> !toy<"array"> -# CHECK-NEXT: "toy.return"(%1) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy.array) -> !toy.array +# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy.array, !toy.array) -> !toy.array +# CHECK-NEXT: "toy.return"(%1) : (!toy.array) -> () # CHECK-NEXT: } # CHECK-LABEL: func @main() { -# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy<"array<2, 3>"> -# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy<"array<2, 3>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy<"array<6>"> -# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy<"array<6>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: "toy.print"(%5) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy.array<2, 3> +# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy.array<2, 3>) -> !toy.array<2, 3> +# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy.array<6> +# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy.array<6>) -> !toy.array<2, 3> +# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: "toy.print"(%5) : (!toy.array) -> () # CHECK-NEXT: "toy.return"() : () -> () diff --git a/mlir/test/Examples/Toy/Ch3/invalid.mlir b/mlir/test/Examples/Toy/Ch3/invalid.mlir index 2dd2228..e750b52 100644 --- a/mlir/test/Examples/Toy/Ch3/invalid.mlir +++ b/mlir/test/Examples/Toy/Ch3/invalid.mlir @@ -7,5 +7,5 @@ // - There should be a block terminator. // This all round-trip since this is opaque for MLIR. func @main() { - %0 = "toy.print"() : () -> !toy<"array<2, 3>"> + %0 = "toy.print"() : () -> !toy.array<2, 3> } diff --git a/mlir/test/Examples/Toy/Ch3/scalar.toy b/mlir/test/Examples/Toy/Ch3/scalar.toy index 16bb254..de1f8c3 100644 --- a/mlir/test/Examples/Toy/Ch3/scalar.toy +++ b/mlir/test/Examples/Toy/Ch3/scalar.toy @@ -6,9 +6,9 @@ def main() { } # CHECK-LABEL: func @main() { -# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<1xf64>, [5.500000e+00]>} : () -> !toy<"array<1>"> -# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy<"array<1>">) -> !toy<"array<2, 2>"> -# CHECK-NEXT: "toy.print"(%1) : (!toy<"array<2, 2>">) -> () +# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<1xf64>, [5.500000e+00]>} : () -> !toy.array<1> +# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy.array<1>) -> !toy.array<2, 2> +# CHECK-NEXT: "toy.print"(%1) : (!toy.array<2, 2>) -> () # CHECK-NEXT: "toy.return"() : () -> () # CHECK-NEXT: } diff --git a/mlir/test/Examples/Toy/Ch4/codegen.toy b/mlir/test/Examples/Toy/Ch4/codegen.toy index c0497a1..518032f 100644 --- a/mlir/test/Examples/Toy/Ch4/codegen.toy +++ b/mlir/test/Examples/Toy/Ch4/codegen.toy @@ -13,20 +13,20 @@ def main() { print(d); } -# CHECK-LABEL: func @multiply_transpose(%arg0: !toy<"array">, %arg1: !toy<"array">) +# CHECK-LABEL: func @multiply_transpose(%arg0: !toy.array, %arg1: !toy.array) # CHECK-NEXT: attributes {toy.generic: true} { -# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy<"array">) -> !toy<"array"> -# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy<"array">, !toy<"array">) -> !toy<"array"> -# CHECK-NEXT: "toy.return"(%1) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.transpose"(%arg1) : (!toy.array) -> !toy.array +# CHECK-NEXT: %1 = "toy.mul"(%arg0, %0) : (!toy.array, !toy.array) -> !toy.array +# CHECK-NEXT: "toy.return"(%1) : (!toy.array) -> () # CHECK-NEXT: } # CHECK-LABEL: func @main() { -# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy<"array<2, 3>"> -# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy<"array<2, 3>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy<"array<6>"> -# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy<"array<6>">) -> !toy<"array<2, 3>"> -# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy<"array<2, 3>">, !toy<"array<2, 3>">) -> !toy<"array"> -# CHECK-NEXT: "toy.print"(%5) : (!toy<"array">) -> () +# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<2x3xf64>, {{\[\[}}1.000000e+00, 2.000000e+00, 3.000000e+00], [4.000000e+00, 5.000000e+00, 6.000000e+00]]>} : () -> !toy.array<2, 3> +# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy.array<2, 3>) -> !toy.array<2, 3> +# CHECK-NEXT: %2 = "toy.constant"() {value: dense<tensor<6xf64>, [1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00]>} : () -> !toy.array<6> +# CHECK-NEXT: %3 = "toy.reshape"(%2) : (!toy.array<6>) -> !toy.array<2, 3> +# CHECK-NEXT: %4 = "toy.generic_call"(%1, %3) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: %5 = "toy.generic_call"(%3, %1) {callee: "multiply_transpose"} : (!toy.array<2, 3>, !toy.array<2, 3>) -> !toy.array +# CHECK-NEXT: "toy.print"(%5) : (!toy.array) -> () # CHECK-NEXT: "toy.return"() : () -> () diff --git a/mlir/test/Examples/Toy/Ch4/invalid.mlir b/mlir/test/Examples/Toy/Ch4/invalid.mlir index 0e33397..d153866 100644 --- a/mlir/test/Examples/Toy/Ch4/invalid.mlir +++ b/mlir/test/Examples/Toy/Ch4/invalid.mlir @@ -7,5 +7,5 @@ // - There should be a block terminator. // This all round-trip since this is opaque for MLIR. func @main() { - %0 = "toy.print"() : () -> !toy<"array<2, 3>"> + %0 = "toy.print"() : () -> !toy.array<2, 3> } diff --git a/mlir/test/Examples/Toy/Ch4/scalar.toy b/mlir/test/Examples/Toy/Ch4/scalar.toy index 51fbcaf..6420052 100644 --- a/mlir/test/Examples/Toy/Ch4/scalar.toy +++ b/mlir/test/Examples/Toy/Ch4/scalar.toy @@ -6,9 +6,9 @@ def main() { } # CHECK-LABEL: func @main() { -# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<1xf64>, [5.500000e+00]>} : () -> !toy<"array<1>"> -# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy<"array<1>">) -> !toy<"array<2, 2>"> -# CHECK-NEXT: "toy.print"(%1) : (!toy<"array<2, 2>">) -> () +# CHECK-NEXT: %0 = "toy.constant"() {value: dense<tensor<1xf64>, [5.500000e+00]>} : () -> !toy.array<1> +# CHECK-NEXT: %1 = "toy.reshape"(%0) : (!toy.array<1>) -> !toy.array<2, 2> +# CHECK-NEXT: "toy.print"(%1) : (!toy.array<2, 2>) -> () # CHECK-NEXT: "toy.return"() : () -> () # CHECK-NEXT: } |