Skip to content

Next batch of tests #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rossberg merged 2 commits into from
Jun 16, 2016
Merged

Next batch of tests #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1acce
More tests
rossberg May 19, 2016
748f9da
Some actual looping
rossberg May 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ml-proto/host/format.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ let rec expr e =
match e.it with
| Nop -> "nop", []
| Unreachable -> "unreachable", []
| Block ([], {it = Loop e; _}) -> "loop", [expr e]
| Block (es, e) -> "block", list expr (es @ [e])
| Loop e -> "loop", [expr e]
| Loop e -> assert false
| Break (x, eo) -> "br " ^ var x, opt expr eo
| BreakIf (x, eo, e) -> "br_if " ^ var x, opt expr eo @ [expr e]
| BreakTable (xs, x, eo, e) ->
Expand Down
7 changes: 5 additions & 2 deletions ml-proto/runtests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ class RunTests(unittest.TestCase):
def _runCommand(self, command, logPath = None, expectedExitCode = 0):
out = None if logPath is None else file(logPath, 'w+')

exitCode = subprocess.call(command, shell=True, stdout=out, stderr=subprocess.STDOUT)
self.assertEqual(expectedExitCode, exitCode, "test runner failed with exit code %i, expected %i" % (exitCode, expectedExitCode))
try:
exitCode = subprocess.call(command, shell=True, stdout=out, stderr=subprocess.STDOUT)
self.assertEqual(expectedExitCode, exitCode, "test runner failed with exit code %i, expected %i" % (exitCode, expectedExitCode))
except:
print(("# Failure running %s") % command)

if logPath is not None:
out.close()
Expand Down
77 changes: 52 additions & 25 deletions ml-proto/test/block.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,43 +46,62 @@
(f32.gt (block (call $nop) (f32.const 3)) (block (call $nop) (f32.const 3)))
)

(func "br-bare" (result i32)
(func "break-bare" (result i32)
Copy link
Member

@sunfishcode sunfishcode May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not rename "br" to "break" in the tests; the instruction is named "br".

Copy link
Member Author

@rossberg rossberg May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to match the loop test cases, where the names distinguish between breaking and continuing (see below). So the naming does not refer to the operator, but to the control flow transfer happening.

Copy link
Member

@sunfishcode sunfishcode May 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I guess I'm already in the habit of thinking in terms of WebAssembly/design#652. If we do that, we can simplify these tests.

(block (br 0) (unreachable))
(block (br_if 0 (i32.const 1)) (unreachable))
(block (br_table 0 (i32.const 0)) (unreachable))
(block (br_table 0 0 0 (i32.const 1)) (unreachable))
(i32.const 19)
)
(func "br-value" (result i32)
(func "break-value" (result i32)
(block (br 0 (i32.const 18)) (i32.const 19))
)
(func "br-repeated" (result i32)
(func "break-repeated" (result i32)
(block
(br 0 (i32.const 18))
(br 0 (i32.const 19))
(br 0 (i32.const 20))
(br_if 0 (i32.const 20) (i32.const 0))
(br_if 0 (i32.const 20) (i32.const 1))
(br 0 (i32.const 21))
(br_table 0 (i32.const 22) (i32.const 4))
(br_table 0 0 0 (i32.const 23) (i32.const 1))
(i32.const 21)
)
)
(func "br-inner" (result i32)
(block
(block (br 1 (i32.const 22)))
(block (br 0))
(i32.const 21)
)
(func "break-inner" (result i32)
(local i32)
(set_local 0 (i32.const 0))
(set_local 0 (i32.add (get_local 0) (block (block (br 1 (i32.const 0x1))))))
(set_local 0 (i32.add (get_local 0) (block (block (br 0)) (i32.const 0x2))))
(set_local 0 (i32.add (get_local 0) (block (i32.ctz (br 0 (i32.const 0x4))))))
(set_local 0 (i32.add (get_local 0) (block (i32.ctz (block (br 1 (i32.const 0x8)))))))
(get_local 0)
)

(func "drop-inner" (result i32)
(func "drop-mid" (result i32)
(block (call $fx) (i32.const 7) (call $nop) (i32.const 8))
)
(func "drop-last"
(block (call $nop) (call $fx) (nop) (i32.const 8))
)
(func "drop-br-void"
(func "drop-break-void"
(block (br 0 (nop)))
(block (br 0 (call $nop)))
)
(func "drop-br-value"
(block (br 0 (i32.const 8)))
)
(func "drop-br-value-heterogeneous"
(block (br_if 0 (nop) (i32.const 0)))
(block (br_if 0 (nop) (i32.const 1)))
(block (br_if 0 (call $nop) (i32.const 0)))
(block (br_if 0 (call $nop) (i32.const 1)))
(block (br_table 0 (nop) (i32.const 3)))
(block (br_table 0 0 0 (nop) (i32.const 2)))
)
(func "drop-break-value"
(block (br 0 (i32.const 12)))
(block (br_if 0 (i32.const 11) (i32.const 0)))
(block (br_if 0 (i32.const 10) (i32.const 1)))
(block (br_table 0 (i32.const 9) (i32.const 5)))
(block (br_table 0 0 0 (i32.const 8) (i32.const 1)))
)
(func "drop-break-value-heterogeneous"
(block (br 0 (i32.const 8)) (br 0 (f64.const 8)) (br 0 (f32.const 8)))
(block (br 0 (i32.const 8)) (br 0) (br 0 (f64.const 8)))
(block (br 0 (i32.const 8)) (br 0 (call $nop)) (br 0 (f64.const 8)))
Expand Down Expand Up @@ -117,16 +136,16 @@
(assert_return (invoke "test-operand") (i32.const 0))
(assert_return (invoke "compare-operand") (i32.const 0))

(assert_return (invoke "br-bare") (i32.const 19))
(assert_return (invoke "br-value") (i32.const 18))
(assert_return (invoke "br-repeated") (i32.const 18))
(assert_return (invoke "br-inner") (i32.const 22))
(assert_return (invoke "break-bare") (i32.const 19))
(assert_return (invoke "break-value") (i32.const 18))
(assert_return (invoke "break-repeated") (i32.const 18))
(assert_return (invoke "break-inner") (i32.const 0xf))

(assert_return (invoke "drop-inner") (i32.const 8))
(assert_return (invoke "drop-mid") (i32.const 8))
(assert_return (invoke "drop-last"))
(assert_return (invoke "drop-br-void"))
(assert_return (invoke "drop-br-value"))
(assert_return (invoke "drop-br-value-heterogeneous"))
(assert_return (invoke "drop-break-void"))
(assert_return (invoke "drop-break-value"))
(assert_return (invoke "drop-break-value-heterogeneous"))

(assert_return (invoke "effects") (i32.const 1))

Expand Down Expand Up @@ -162,4 +181,12 @@
(module (func (result i32) (block (block (br 1 (i64.const 1))) (br 0 (i32.const 1)))))
"type mismatch"
)
(assert_invalid
(module (func (result i32) (block (br 0))))
"type mismatch"
)
(assert_invalid
(module (func (result i32) (i32.ctz (block (br 0)))))
"type mismatch"
)

248 changes: 248 additions & 0 deletions ml-proto/test/br.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
;; Test `br` operator

(module
(func "type-i32" (block (i32.ctz (br 0))))
(func "type-i64" (block (i64.ctz (br 0))))
(func "type-f32" (block (f32.neg (br 0))))
(func "type-f64" (block (f64.neg (br 0))))

(func "block-first"
(block (br 0) (i32.const 2))
)
(func "block-mid"
(block (i32.const 1) (br 0) (i32.const 2))
)
(func "block-last"
(block (nop) (i32.const 1) (br 0))
)
(func "block-value" (result i32)
(block (nop) (i32.const 1) (br 0 (i32.const 2)))
)

(func "loop-first" (result i32)
(loop (br 1 (i32.const 3)) (i32.const 2))
)
(func "loop-mid" (result i32)
(loop (i32.const 1) (br 1 (i32.const 4)) (i32.const 2))
)
(func "loop-last" (result i32)
(loop (nop) (i32.const 1) (br 1 (i32.const 5)))
)

(func "br-value" (result i32)
(block (br 0 (br 0 (i32.const 9))))
)

(func "br_if-cond"
(block (br_if 0 (br 0)))
)
(func "br_if-value" (result i32)
(block (br_if 0 (br 0 (i32.const 8)) (i32.const 1)) (i32.const 7))
)
(func "br_if-value-cond" (result i32)
(block (br_if 0 (i32.const 6) (br 0 (i32.const 9))) (i32.const 7))
)

(func "br_table-index"
(block (br_table 0 0 0 (br 0)))
)
(func "br_table-value" (result i32)
(block (br_table 0 0 0 (br 0 (i32.const 10)) (i32.const 1)) (i32.const 7))
)
(func "br_table-value-index" (result i32)
(block (br_table 0 0 (i32.const 6) (br 0 (i32.const 11))) (i32.const 7))
)

(func "return-value" (result i64)
(block (return (br 0 (i64.const 7))))
)

(func "if-cond" (result i32)
(block (if (br 0 (i32.const 2)) (i32.const 0) (i32.const 1)))
)
(func "if-then" (param i32 i32) (result i32)
(block (if (get_local 0) (br 1 (i32.const 3)) (get_local 1)))
)
(func "if-else" (param i32 i32) (result i32)
(block (if (get_local 0) (get_local 1) (br 1 (i32.const 4))))
)

(func "select-first" (param i32 i32) (result i32)
(block (select (br 0 (i32.const 5)) (get_local 0) (get_local 1)))
)
(func "select-second" (param i32 i32) (result i32)
(block (select (get_local 0) (br 0 (i32.const 6)) (get_local 1)))
)
(func "select-cond" (result i32)
(block (select (i32.const 0) (i32.const 1) (br 0 (i32.const 7))))
)

(func $f (param i32 i32 i32) (result i32) (i32.const -1))
(func "call-first" (result i32)
(block (call $f (br 0 (i32.const 12)) (i32.const 2) (i32.const 3)))
)
(func "call-mid" (result i32)
(block (call $f (i32.const 1) (br 0 (i32.const 13)) (i32.const 3)))
)
(func "call-last" (result i32)
(block (call $f (i32.const 1) (i32.const 2) (br 0 (i32.const 14))))
)

(import "spectest" "print" (param i32 i32 i32))
(func "call_import-first"
(block (call_import 0 (br 0) (i32.const 2) (i32.const 3)))
)
(func "call_import-mid"
(block (call_import 0 (i32.const 1) (br 0) (i32.const 3)))
)
(func "call_import-last"
(block (call_import 0 (i32.const 1) (i32.const 2) (br 0)))
)

(type $sig (func (param i32 i32 i32) (result i32)))
(table $f)
(func "call_indirect-func" (result i32)
(block (call_indirect $sig (br 0 (i32.const 20)) (i32.const 1) (i32.const 2) (i32.const 3)))
)
(func "call_indirect-first" (result i32)
(block (call_indirect $sig (i32.const 0) (br 0 (i32.const 21)) (i32.const 2) (i32.const 3)))
)
(func "call_indirect-mid" (result i32)
(block (call_indirect $sig (i32.const 0) (i32.const 1) (br 0 (i32.const 22)) (i32.const 3)))
)
(func "call_indirect-last" (result i32)
(block (call_indirect $sig (i32.const 0) (i32.const 1) (i32.const 2) (br 0 (i32.const 23))))
)

(func "set_local-value" (result i32) (local f32)
(block (set_local 0 (br 0 (i32.const 17))) (i32.const -1))
)

(memory 1)
(func "load-address" (result f32)
(block (f32.load (br 0 (f32.const 1.7))))
)
(func "loadN-address" (result i64)
(block (i64.load8_s (br 0 (i64.const 30))))
)

(func "store-address" (result i32)
(block (f64.store (br 0 (i32.const 30)) (f64.const 7)) (i32.const -1))
)
(func "store-value" (result i32)
(block (i64.store (i32.const 2) (br 0 (i32.const 31))) (i32.const -1))
)

(func "storeN-address" (result i32)
(block (i32.store8 (br 0 (i32.const 32)) (i32.const 7)) (i32.const -1))
)
(func "storeN-value" (result i32)
(block (i64.store16 (i32.const 2) (br 0 (i32.const 33))) (i32.const -1))
)

(func "unary-operand" (result f32)
(block (f32.neg (br 0 (f32.const 3.4))))
)

(func "binary-left" (result i32)
(block (i32.add (br 0 (i32.const 3)) (i32.const 10)))
)
(func "binary-right" (result i64)
(block (i64.sub (i64.const 10) (br 0 (i64.const 45))))
)

(func "test-operand" (result i32)
(block (i32.eqz (br 0 (i32.const 44))))
)

(func "compare-left" (result i32)
(block (f64.le (br 0 (i32.const 43)) (f64.const 10)))
)
(func "compare-right" (result i32)
(block (f32.ne (f32.const 10) (br 0 (i32.const 42))))
)

(func "convert-operand" (result i32)
(block (i32.wrap/i64 (br 0 (i32.const 41))))
)

(func "grow_memory-size" (result i32)
(block (grow_memory (br 0 (i32.const 40))))
)
)

(assert_return (invoke "type-i32"))
(assert_return (invoke "type-i64"))
(assert_return (invoke "type-f32"))
(assert_return (invoke "type-f64"))

(assert_return (invoke "block-first"))
(assert_return (invoke "block-mid"))
(assert_return (invoke "block-last"))
(assert_return (invoke "block-value") (i32.const 2))

(assert_return (invoke "loop-first") (i32.const 3))
(assert_return (invoke "loop-mid") (i32.const 4))
(assert_return (invoke "loop-last") (i32.const 5))

(assert_return (invoke "br-value") (i32.const 9))

(assert_return (invoke "br_if-cond"))
(assert_return (invoke "br_if-value") (i32.const 8))
(assert_return (invoke "br_if-value-cond") (i32.const 9))

(assert_return (invoke "br_table-index"))
(assert_return (invoke "br_table-value") (i32.const 10))
(assert_return (invoke "br_table-value-index") (i32.const 11))

(assert_return (invoke "return-value") (i64.const 7))

(assert_return (invoke "if-cond") (i32.const 2))
(assert_return (invoke "if-then" (i32.const 1) (i32.const 6)) (i32.const 3))
(assert_return (invoke "if-then" (i32.const 0) (i32.const 6)) (i32.const 6))
(assert_return (invoke "if-else" (i32.const 0) (i32.const 6)) (i32.const 4))
(assert_return (invoke "if-else" (i32.const 1) (i32.const 6)) (i32.const 6))

(assert_return (invoke "select-first" (i32.const 0) (i32.const 6)) (i32.const 5))
(assert_return (invoke "select-first" (i32.const 1) (i32.const 6)) (i32.const 5))
(assert_return (invoke "select-second" (i32.const 0) (i32.const 6)) (i32.const 6))
(assert_return (invoke "select-second" (i32.const 1) (i32.const 6)) (i32.const 6))
(assert_return (invoke "select-cond") (i32.const 7))

(assert_return (invoke "call-first") (i32.const 12))
(assert_return (invoke "call-mid") (i32.const 13))
(assert_return (invoke "call-last") (i32.const 14))

(assert_return (invoke "call_import-first"))
(assert_return (invoke "call_import-mid"))
(assert_return (invoke "call_import-last"))

(assert_return (invoke "call_indirect-func") (i32.const 20))
(assert_return (invoke "call_indirect-first") (i32.const 21))
(assert_return (invoke "call_indirect-mid") (i32.const 22))
(assert_return (invoke "call_indirect-last") (i32.const 23))

(assert_return (invoke "set_local-value") (i32.const 17))

(assert_return (invoke "load-address") (f32.const 1.7))
(assert_return (invoke "loadN-address") (i64.const 30))

(assert_return (invoke "store-address") (i32.const 30))
(assert_return (invoke "store-value") (i32.const 31))
(assert_return (invoke "storeN-address") (i32.const 32))
(assert_return (invoke "storeN-value") (i32.const 33))

(assert_return (invoke "unary-operand") (f32.const 3.4))

(assert_return (invoke "binary-left") (i32.const 3))
(assert_return (invoke "binary-right") (i64.const 45))

(assert_return (invoke "test-operand") (i32.const 44))

(assert_return (invoke "compare-left") (i32.const 43))
(assert_return (invoke "compare-right") (i32.const 42))

(assert_return (invoke "convert-operand") (i32.const 41))

(assert_return (invoke "grow_memory-size") (i32.const 40))

Loading