From: River Riddle Date: Wed, 29 May 2019 20:00:14 +0000 (-0700) Subject: Remove the Toy/* file path from the location check lines. This assumes a specific... X-Git-Tag: llvmorg-11-init~1466^2~1568 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06b0db5311f43f39598b33651717000767860edf;p=platform%2Fupstream%2Fllvm.git Remove the Toy/* file path from the location check lines. This assumes a specific file path format that breaks on MSVC. -- PiperOrigin-RevId: 250549223 --- diff --git a/mlir/test/Examples/Toy/Ch1/ast.toy b/mlir/test/Examples/Toy/Ch1/ast.toy index dd315ea..c628916 100644 --- a/mlir/test/Examples/Toy/Ch1/ast.toy +++ b/mlir/test/Examples/Toy/Ch1/ast.toy @@ -30,44 +30,44 @@ def main() { # CHECK: Module: # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}Toy/Ch1/ast.toy:5:1' +# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}ast.toy:5:1' # CHECK-NEXT: Params: [a, b] # CHECK-NEXT: Block { # CHECK-NEXT: Retur -# CHECK-NEXT: BinOp: * @{{.*}}Toy/Ch1/ast.toy:6:14 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch1/ast.toy:6:10 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch1/ast.toy:6:14 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch1/ast.toy:6:24 +# CHECK-NEXT: BinOp: * @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: a @{{.*}}ast.toy:6:10 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: b @{{.*}}ast.toy:6:24 # CHECK-NEXT: ] # CHECK-NEXT: } // Block # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'main' @{{.*}}Toy/Ch1/ast.toy:9:1' +# CHECK-NEXT: Proto 'main' @{{.*}}ast.toy:9:1' # CHECK-NEXT: Params: [] # CHECK-NEXT: Block { -# CHECK-NEXT: VarDecl a<> @{{.*}}Toy/Ch1/ast.toy:12:3 -# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}Toy/Ch1/ast.toy:12:11 -# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}Toy/Ch1/ast.toy:15:3 -# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}Toy/Ch1/ast.toy:15:17 -# CHECK-NEXT: VarDecl c<> @{{.*}}Toy/Ch1/ast.toy:18:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch1/ast.toy:18:11 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch1/ast.toy:18:30 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch1/ast.toy:18:33 +# CHECK-NEXT: VarDecl a<> @{{.*}}ast.toy:12:3 +# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}ast.toy:12:11 +# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}ast.toy:15:3 +# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}ast.toy:15:17 +# CHECK-NEXT: VarDecl c<> @{{.*}}ast.toy:18:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:18:11 +# CHECK-NEXT: var: a @{{.*}}ast.toy:18:30 +# CHECK-NEXT: var: b @{{.*}}ast.toy:18:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl d<> @{{.*}}Toy/Ch1/ast.toy:21:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch1/ast.toy:21:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch1/ast.toy:21:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch1/ast.toy:21:33 +# CHECK-NEXT: VarDecl d<> @{{.*}}ast.toy:21:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:21:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:21:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:21:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch1/ast.toy:24:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch1/ast.toy:24:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch1/ast.toy:24:30 -# CHECK-NEXT: var: c @{{.*}}Toy/Ch1/ast.toy:24:33 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:24:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:24:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:24:30 +# CHECK-NEXT: var: c @{{.*}}ast.toy:24:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch1/ast.toy:27:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch1/ast.toy:27:11 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch1/ast.toy:27:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch1/ast.toy:27:40 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:27:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:27:11 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:27:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:27:40 # CHECK-NEXT: ] -# CHECK-NEXT: var: c @{{.*}}Toy/Ch1/ast.toy:27:44 +# CHECK-NEXT: var: c @{{.*}}ast.toy:27:44 # CHECK-NEXT: ] diff --git a/mlir/test/Examples/Toy/Ch2/ast.toy b/mlir/test/Examples/Toy/Ch2/ast.toy index 1287ee1..6d7ea12 100644 --- a/mlir/test/Examples/Toy/Ch2/ast.toy +++ b/mlir/test/Examples/Toy/Ch2/ast.toy @@ -30,44 +30,44 @@ def main() { # CHECK: Module: # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}Toy/Ch2/ast.toy:5:1' +# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}ast.toy:5:1' # CHECK-NEXT: Params: [a, b] # CHECK-NEXT: Block { # CHECK-NEXT: Retur -# CHECK-NEXT: BinOp: * @{{.*}}Toy/Ch2/ast.toy:6:14 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch2/ast.toy:6:10 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch2/ast.toy:6:14 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch2/ast.toy:6:24 +# CHECK-NEXT: BinOp: * @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: a @{{.*}}ast.toy:6:10 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: b @{{.*}}ast.toy:6:24 # CHECK-NEXT: ] # CHECK-NEXT: } // Block # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'main' @{{.*}}Toy/Ch2/ast.toy:9:1' +# CHECK-NEXT: Proto 'main' @{{.*}}ast.toy:9:1' # CHECK-NEXT: Params: [] # CHECK-NEXT: Block { -# CHECK-NEXT: VarDecl a<> @{{.*}}Toy/Ch2/ast.toy:12:3 -# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}Toy/Ch2/ast.toy:12:11 -# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}Toy/Ch2/ast.toy:15:3 -# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}Toy/Ch2/ast.toy:15:17 -# CHECK-NEXT: VarDecl c<> @{{.*}}Toy/Ch2/ast.toy:18:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch2/ast.toy:18:11 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch2/ast.toy:18:30 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch2/ast.toy:18:33 +# CHECK-NEXT: VarDecl a<> @{{.*}}ast.toy:12:3 +# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}ast.toy:12:11 +# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}ast.toy:15:3 +# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}ast.toy:15:17 +# CHECK-NEXT: VarDecl c<> @{{.*}}ast.toy:18:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:18:11 +# CHECK-NEXT: var: a @{{.*}}ast.toy:18:30 +# CHECK-NEXT: var: b @{{.*}}ast.toy:18:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl d<> @{{.*}}Toy/Ch2/ast.toy:21:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch2/ast.toy:21:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch2/ast.toy:21:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch2/ast.toy:21:33 +# CHECK-NEXT: VarDecl d<> @{{.*}}ast.toy:21:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:21:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:21:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:21:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch2/ast.toy:24:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch2/ast.toy:24:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch2/ast.toy:24:30 -# CHECK-NEXT: var: c @{{.*}}Toy/Ch2/ast.toy:24:33 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:24:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:24:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:24:30 +# CHECK-NEXT: var: c @{{.*}}ast.toy:24:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch2/ast.toy:27:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch2/ast.toy:27:11 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch2/ast.toy:27:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch2/ast.toy:27:40 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:27:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:27:11 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:27:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:27:40 # CHECK-NEXT: ] -# CHECK-NEXT: var: c @{{.*}}Toy/Ch2/ast.toy:27:44 +# CHECK-NEXT: var: c @{{.*}}ast.toy:27:44 # CHECK-NEXT: ] diff --git a/mlir/test/Examples/Toy/Ch3/ast.toy b/mlir/test/Examples/Toy/Ch3/ast.toy index 19400f1..c716437 100644 --- a/mlir/test/Examples/Toy/Ch3/ast.toy +++ b/mlir/test/Examples/Toy/Ch3/ast.toy @@ -30,44 +30,44 @@ def main() { # CHECK: Module: # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}Toy/Ch3/ast.toy:5:1' +# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}ast.toy:5:1' # CHECK-NEXT: Params: [a, b] # CHECK-NEXT: Block { # CHECK-NEXT: Retur -# CHECK-NEXT: BinOp: * @{{.*}}Toy/Ch3/ast.toy:6:14 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch3/ast.toy:6:10 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch3/ast.toy:6:14 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch3/ast.toy:6:24 +# CHECK-NEXT: BinOp: * @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: a @{{.*}}ast.toy:6:10 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: b @{{.*}}ast.toy:6:24 # CHECK-NEXT: ] # CHECK-NEXT: } // Block # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'main' @{{.*}}Toy/Ch3/ast.toy:9:1' +# CHECK-NEXT: Proto 'main' @{{.*}}ast.toy:9:1' # CHECK-NEXT: Params: [] # CHECK-NEXT: Block { -# CHECK-NEXT: VarDecl a<> @{{.*}}Toy/Ch3/ast.toy:12:3 -# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}Toy/Ch3/ast.toy:12:11 -# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}Toy/Ch3/ast.toy:15:3 -# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}Toy/Ch3/ast.toy:15:17 -# CHECK-NEXT: VarDecl c<> @{{.*}}Toy/Ch3/ast.toy:18:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch3/ast.toy:18:11 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch3/ast.toy:18:30 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch3/ast.toy:18:33 +# CHECK-NEXT: VarDecl a<> @{{.*}}ast.toy:12:3 +# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}ast.toy:12:11 +# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}ast.toy:15:3 +# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}ast.toy:15:17 +# CHECK-NEXT: VarDecl c<> @{{.*}}ast.toy:18:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:18:11 +# CHECK-NEXT: var: a @{{.*}}ast.toy:18:30 +# CHECK-NEXT: var: b @{{.*}}ast.toy:18:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl d<> @{{.*}}Toy/Ch3/ast.toy:21:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch3/ast.toy:21:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch3/ast.toy:21:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch3/ast.toy:21:33 +# CHECK-NEXT: VarDecl d<> @{{.*}}ast.toy:21:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:21:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:21:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:21:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch3/ast.toy:24:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch3/ast.toy:24:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch3/ast.toy:24:30 -# CHECK-NEXT: var: c @{{.*}}Toy/Ch3/ast.toy:24:33 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:24:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:24:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:24:30 +# CHECK-NEXT: var: c @{{.*}}ast.toy:24:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch3/ast.toy:27:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch3/ast.toy:27:11 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch3/ast.toy:27:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch3/ast.toy:27:40 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:27:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:27:11 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:27:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:27:40 # CHECK-NEXT: ] -# CHECK-NEXT: var: c @{{.*}}Toy/Ch3/ast.toy:27:44 +# CHECK-NEXT: var: c @{{.*}}ast.toy:27:44 # CHECK-NEXT: ] diff --git a/mlir/test/Examples/Toy/Ch4/ast.toy b/mlir/test/Examples/Toy/Ch4/ast.toy index dbc9d92..a0897c0 100644 --- a/mlir/test/Examples/Toy/Ch4/ast.toy +++ b/mlir/test/Examples/Toy/Ch4/ast.toy @@ -30,44 +30,44 @@ def main() { # CHECK: Module: # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}Toy/Ch4/ast.toy:5:1' +# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}ast.toy:5:1' # CHECK-NEXT: Params: [a, b] # CHECK-NEXT: Block { # CHECK-NEXT: Retur -# CHECK-NEXT: BinOp: * @{{.*}}Toy/Ch4/ast.toy:6:14 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch4/ast.toy:6:10 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch4/ast.toy:6:14 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch4/ast.toy:6:24 +# CHECK-NEXT: BinOp: * @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: a @{{.*}}ast.toy:6:10 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: b @{{.*}}ast.toy:6:24 # CHECK-NEXT: ] # CHECK-NEXT: } // Block # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'main' @{{.*}}Toy/Ch4/ast.toy:9:1' +# CHECK-NEXT: Proto 'main' @{{.*}}ast.toy:9:1' # CHECK-NEXT: Params: [] # CHECK-NEXT: Block { -# CHECK-NEXT: VarDecl a<> @{{.*}}Toy/Ch4/ast.toy:12:3 -# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}Toy/Ch4/ast.toy:12:11 -# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}Toy/Ch4/ast.toy:15:3 -# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}Toy/Ch4/ast.toy:15:17 -# CHECK-NEXT: VarDecl c<> @{{.*}}Toy/Ch4/ast.toy:18:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch4/ast.toy:18:11 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch4/ast.toy:18:30 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch4/ast.toy:18:33 +# CHECK-NEXT: VarDecl a<> @{{.*}}ast.toy:12:3 +# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}ast.toy:12:11 +# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}ast.toy:15:3 +# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}ast.toy:15:17 +# CHECK-NEXT: VarDecl c<> @{{.*}}ast.toy:18:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:18:11 +# CHECK-NEXT: var: a @{{.*}}ast.toy:18:30 +# CHECK-NEXT: var: b @{{.*}}ast.toy:18:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl d<> @{{.*}}Toy/Ch4/ast.toy:21:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch4/ast.toy:21:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch4/ast.toy:21:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch4/ast.toy:21:33 +# CHECK-NEXT: VarDecl d<> @{{.*}}ast.toy:21:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:21:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:21:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:21:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch4/ast.toy:24:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch4/ast.toy:24:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch4/ast.toy:24:30 -# CHECK-NEXT: var: c @{{.*}}Toy/Ch4/ast.toy:24:33 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:24:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:24:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:24:30 +# CHECK-NEXT: var: c @{{.*}}ast.toy:24:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch4/ast.toy:27:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch4/ast.toy:27:11 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch4/ast.toy:27:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch4/ast.toy:27:40 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:27:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:27:11 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:27:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:27:40 # CHECK-NEXT: ] -# CHECK-NEXT: var: c @{{.*}}Toy/Ch4/ast.toy:27:44 +# CHECK-NEXT: var: c @{{.*}}ast.toy:27:44 # CHECK-NEXT: ] diff --git a/mlir/test/Examples/Toy/Ch5/ast.toy b/mlir/test/Examples/Toy/Ch5/ast.toy index 0eaa513..9676116 100644 --- a/mlir/test/Examples/Toy/Ch5/ast.toy +++ b/mlir/test/Examples/Toy/Ch5/ast.toy @@ -30,44 +30,44 @@ def main() { # CHECK: Module: # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}Toy/Ch5/ast.toy:5:1' +# CHECK-NEXT: Proto 'multiply_transpose' @{{.*}}ast.toy:5:1' # CHECK-NEXT: Params: [a, b] # CHECK-NEXT: Block { # CHECK-NEXT: Retur -# CHECK-NEXT: BinOp: * @{{.*}}Toy/Ch5/ast.toy:6:14 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch5/ast.toy:6:10 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch5/ast.toy:6:14 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch5/ast.toy:6:24 +# CHECK-NEXT: BinOp: * @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: a @{{.*}}ast.toy:6:10 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:6:14 +# CHECK-NEXT: var: b @{{.*}}ast.toy:6:24 # CHECK-NEXT: ] # CHECK-NEXT: } // Block # CHECK-NEXT: Function -# CHECK-NEXT: Proto 'main' @{{.*}}Toy/Ch5/ast.toy:9:1' +# CHECK-NEXT: Proto 'main' @{{.*}}ast.toy:9:1' # CHECK-NEXT: Params: [] # CHECK-NEXT: Block { -# CHECK-NEXT: VarDecl a<> @{{.*}}Toy/Ch5/ast.toy:12:3 -# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}Toy/Ch5/ast.toy:12:11 -# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}Toy/Ch5/ast.toy:15:3 -# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}Toy/Ch5/ast.toy:15:17 -# CHECK-NEXT: VarDecl c<> @{{.*}}Toy/Ch5/ast.toy:18:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch5/ast.toy:18:11 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch5/ast.toy:18:30 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch5/ast.toy:18:33 +# CHECK-NEXT: VarDecl a<> @{{.*}}ast.toy:12:3 +# CHECK-NEXT: Literal: <2, 3>[ <3>[ 1.000000e+00, 2.000000e+00, 3.000000e+00], <3>[ 4.000000e+00, 5.000000e+00, 6.000000e+00]] @{{.*}}ast.toy:12:11 +# CHECK-NEXT: VarDecl b<2, 3> @{{.*}}ast.toy:15:3 +# CHECK-NEXT: Literal: <6>[ 1.000000e+00, 2.000000e+00, 3.000000e+00, 4.000000e+00, 5.000000e+00, 6.000000e+00] @{{.*}}ast.toy:15:17 +# CHECK-NEXT: VarDecl c<> @{{.*}}ast.toy:18:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:18:11 +# CHECK-NEXT: var: a @{{.*}}ast.toy:18:30 +# CHECK-NEXT: var: b @{{.*}}ast.toy:18:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl d<> @{{.*}}Toy/Ch5/ast.toy:21:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch5/ast.toy:21:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch5/ast.toy:21:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch5/ast.toy:21:33 +# CHECK-NEXT: VarDecl d<> @{{.*}}ast.toy:21:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:21:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:21:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:21:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch5/ast.toy:24:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch5/ast.toy:24:11 -# CHECK-NEXT: var: b @{{.*}}Toy/Ch5/ast.toy:24:30 -# CHECK-NEXT: var: c @{{.*}}Toy/Ch5/ast.toy:24:33 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:24:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:24:11 +# CHECK-NEXT: var: b @{{.*}}ast.toy:24:30 +# CHECK-NEXT: var: c @{{.*}}ast.toy:24:33 # CHECK-NEXT: ] -# CHECK-NEXT: VarDecl e<> @{{.*}}Toy/Ch5/ast.toy:27:3 -# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}Toy/Ch5/ast.toy:27:11 -# CHECK-NEXT: Call 'transpose' [ @{{.*}}Toy/Ch5/ast.toy:27:30 -# CHECK-NEXT: var: a @{{.*}}Toy/Ch5/ast.toy:27:40 +# CHECK-NEXT: VarDecl e<> @{{.*}}ast.toy:27:3 +# CHECK-NEXT: Call 'multiply_transpose' [ @{{.*}}ast.toy:27:11 +# CHECK-NEXT: Call 'transpose' [ @{{.*}}ast.toy:27:30 +# CHECK-NEXT: var: a @{{.*}}ast.toy:27:40 # CHECK-NEXT: ] -# CHECK-NEXT: var: c @{{.*}}Toy/Ch5/ast.toy:27:44 +# CHECK-NEXT: var: c @{{.*}}ast.toy:27:44 # CHECK-NEXT: ]