Reorganize tests (#523)

* Refactor Lightbeam's tests.

This refactors Lightbeam's tests.rs file into several pieces, separating
quickcheck tests into their own file, and moving tests which can be run as
wast tests into `tests/misc_testsuite`, and creating a tests directory
for the rest.

* Remove the old filetests tests.

These are all covered by misc_testsuite and spec_testsuite tests.

* rustfmt

* Remove the "bench" feature.
This commit is contained in:
Dan Gohman
2019-11-08 14:16:12 -08:00
committed by Alex Crichton
parent 0f4f9d7832
commit e691bf36f3
17 changed files with 614 additions and 582 deletions

View File

@@ -0,0 +1,187 @@
;; Test `call_indirect` calls between modules.
(module
;; Auxiliary definitions
(type $proc (func))
(type $out-i32 (func (result i32)))
(type $out-i64 (func (result i64)))
(type $out-f32 (func (result f32)))
(type $out-f64 (func (result f64)))
(type $over-i32 (func (param i32) (result i32)))
(type $over-i64 (func (param i64) (result i64)))
(type $over-f32 (func (param f32) (result f32)))
(type $over-f64 (func (param f64) (result f64)))
(type $f32-i32 (func (param f32 i32) (result i32)))
(type $i32-i64 (func (param i32 i64) (result i64)))
(type $f64-f32 (func (param f64 f32) (result f32)))
(type $i64-f64 (func (param i64 f64) (result f64)))
(type $over-i32-duplicate (func (param i32) (result i32)))
(type $over-i64-duplicate (func (param i64) (result i64)))
(type $over-f32-duplicate (func (param f32) (result f32)))
(type $over-f64-duplicate (func (param f64) (result f64)))
(func $const-i32 (type $out-i32) (i32.const 0x132))
(func $const-i64 (type $out-i64) (i64.const 0x164))
(func $const-f32 (type $out-f32) (f32.const 0xf32))
(func $const-f64 (type $out-f64) (f64.const 0xf64))
(func $id-i32 (type $over-i32) (local.get 0))
(func $id-i64 (type $over-i64) (local.get 0))
(func $id-f32 (type $over-f32) (local.get 0))
(func $id-f64 (type $over-f64) (local.get 0))
(func $i32-i64 (type $i32-i64) (local.get 1))
(func $i64-f64 (type $i64-f64) (local.get 1))
(func $f32-i32 (type $f32-i32) (local.get 1))
(func $f64-f32 (type $f64-f32) (local.get 1))
(func $over-i32-duplicate (type $over-i32-duplicate) (local.get 0))
(func $over-i64-duplicate (type $over-i64-duplicate) (local.get 0))
(func $over-f32-duplicate (type $over-f32-duplicate) (local.get 0))
(func $over-f64-duplicate (type $over-f64-duplicate) (local.get 0))
(table (export "table") funcref
(elem
$const-i32 $const-i64 $const-f32 $const-f64
$id-i32 $id-i64 $id-f32 $id-f64
$f32-i32 $i32-i64 $f64-f32 $i64-f64
$over-i32-duplicate $over-i64-duplicate
$over-f32-duplicate $over-f64-duplicate
)
)
;; Typing
(func (export "type-i32") (result i32)
(call_indirect (type $out-i32) (i32.const 0))
)
(func (export "type-i64") (result i64)
(call_indirect (type $out-i64) (i32.const 1))
)
(func (export "type-f32") (result f32)
(call_indirect (type $out-f32) (i32.const 2))
)
(func (export "type-f64") (result f64)
(call_indirect (type $out-f64) (i32.const 3))
)
(func (export "type-index") (result i64)
(call_indirect (type $over-i64) (i64.const 100) (i32.const 5))
)
(func (export "type-first-i32") (result i32)
(call_indirect (type $over-i32) (i32.const 32) (i32.const 4))
)
(func (export "type-first-i64") (result i64)
(call_indirect (type $over-i64) (i64.const 64) (i32.const 5))
)
(func (export "type-first-f32") (result f32)
(call_indirect (type $over-f32) (f32.const 1.32) (i32.const 6))
)
(func (export "type-first-f64") (result f64)
(call_indirect (type $over-f64) (f64.const 1.64) (i32.const 7))
)
(func (export "type-second-i32") (result i32)
(call_indirect (type $f32-i32) (f32.const 32.1) (i32.const 32) (i32.const 8))
)
(func (export "type-second-i64") (result i64)
(call_indirect (type $i32-i64) (i32.const 32) (i64.const 64) (i32.const 9))
)
(func (export "type-second-f32") (result f32)
(call_indirect (type $f64-f32) (f64.const 64) (f32.const 32) (i32.const 10))
)
(func (export "type-second-f64") (result f64)
(call_indirect (type $i64-f64) (i64.const 64) (f64.const 64.1) (i32.const 11))
)
)
(register "test")
(module
;; Auxiliary definitions. These are the same types as "test"'s, but in a
;; different order, since call_indirect types are compared structurally.
(type $out-i32 (func (result i32)))
(type $out-i64 (func (result i64)))
(type $out-f32 (func (result f32)))
(type $out-f64 (func (result f64)))
(type $over-i32 (func (param i32) (result i32)))
(type $over-i64 (func (param i64) (result i64)))
(type $over-f32 (func (param f32) (result f32)))
(type $over-f64 (func (param f64) (result f64)))
(type $f32-i32 (func (param f32 i32) (result i32)))
(type $i32-i64 (func (param i32 i64) (result i64)))
(type $f64-f32 (func (param f64 f32) (result f32)))
(type $i64-f64 (func (param i64 f64) (result f64)))
(type $over-i32-duplicate (func (param i32) (result i32)))
(type $over-i64-duplicate (func (param i64) (result i64)))
(type $over-f32-duplicate (func (param f32) (result f32)))
(type $over-f64-duplicate (func (param f64) (result f64)))
(type $proc (func))
;; Import the table from "test".
(import "test" "table" (table 16 funcref))
;; Typing
(func (export "type-i32") (result i32)
(call_indirect (type $out-i32) (i32.const 0))
)
(func (export "type-i64") (result i64)
(call_indirect (type $out-i64) (i32.const 1))
)
(func (export "type-f32") (result f32)
(call_indirect (type $out-f32) (i32.const 2))
)
(func (export "type-f64") (result f64)
(call_indirect (type $out-f64) (i32.const 3))
)
(func (export "type-index") (result i64)
(call_indirect (type $over-i64) (i64.const 100) (i32.const 5))
)
(func (export "type-first-i32") (result i32)
(call_indirect (type $over-i32) (i32.const 32) (i32.const 4))
)
(func (export "type-first-i64") (result i64)
(call_indirect (type $over-i64) (i64.const 64) (i32.const 5))
)
(func (export "type-first-f32") (result f32)
(call_indirect (type $over-f32) (f32.const 1.32) (i32.const 6))
)
(func (export "type-first-f64") (result f64)
(call_indirect (type $over-f64) (f64.const 1.64) (i32.const 7))
)
(func (export "type-second-i32") (result i32)
(call_indirect (type $f32-i32) (f32.const 32.1) (i32.const 32) (i32.const 8))
)
(func (export "type-second-i64") (result i64)
(call_indirect (type $i32-i64) (i32.const 32) (i64.const 64) (i32.const 9))
)
(func (export "type-second-f32") (result f32)
(call_indirect (type $f64-f32) (f64.const 64) (f32.const 32) (i32.const 10))
)
(func (export "type-second-f64") (result f64)
(call_indirect (type $i64-f64) (i64.const 64) (f64.const 64.1) (i32.const 11))
)
)
(assert_return (invoke "type-i32") (i32.const 0x132))
(assert_return (invoke "type-i64") (i64.const 0x164))
(assert_return (invoke "type-f32") (f32.const 0xf32))
(assert_return (invoke "type-f64") (f64.const 0xf64))
(assert_return (invoke "type-index") (i64.const 100))
(assert_return (invoke "type-first-i32") (i32.const 32))
(assert_return (invoke "type-first-i64") (i64.const 64))
(assert_return (invoke "type-first-f32") (f32.const 1.32))
(assert_return (invoke "type-first-f64") (f64.const 1.64))
(assert_return (invoke "type-second-i32") (i32.const 32))
(assert_return (invoke "type-second-i64") (i64.const 64))
(assert_return (invoke "type-second-f32") (f32.const 32))
(assert_return (invoke "type-second-f64") (f64.const 64.1))

View File

@@ -0,0 +1,116 @@
(module (func))
(module
(func (export "if-without-result") (param i32) (param i32) (result i32)
(if
(i32.eq
(local.get 0)
(local.get 1)
)
(then (unreachable))
)
(local.get 0)
)
)
(assert_return (invoke "if-without-result" (i32.const 2) (i32.const 3)) (i32.const 2))
(module
(func (export "block") (param i32) (param i32) (result i32)
(block (result i32)
local.get 0
)
)
)
(assert_return (invoke "block" (i32.const 10) (i32.const 20)) (i32.const 10))
(module
(func (export "br_block") (param i32) (param i32) (result i32)
local.get 1
(block (result i32)
local.get 0
local.get 0
br 0
unreachable
)
i32.add
)
)
(assert_return (invoke "br_block" (i32.const 5) (i32.const 7)) (i32.const 12))
;; Tests discarding values on the value stack, while
;; carrying over the result using a conditional branch.
(module
(func (export "brif_block") (param i32) (param i32) (result i32)
local.get 1
(block (result i32)
local.get 0
local.get 0
br_if 0
unreachable
)
i32.add
)
)
(assert_return (invoke "brif_block" (i32.const 5) (i32.const 7)) (i32.const 12))
;; Tests that br_if keeps values in the case if the branch
;; hasn't been taken.
(module
(func (export "brif_block_passthru") (param i32) (param i32) (result i32)
(block (result i32)
local.get 1
local.get 0
br_if 0
local.get 1
i32.add
)
)
)
(assert_return (invoke "brif_block_passthru" (i32.const 0) (i32.const 3)) (i32.const 6))
(module
(func (export "i32.div_s") (param i32) (param i32) (result i32)
(i32.div_s (local.get 0) (local.get 1))
)
)
(module
(func (export "br_table") (param $i i32) (result i32)
(return
(block $2 (result i32)
(i32.add (i32.const 10)
(block $1 (result i32)
(i32.add (i32.const 100)
(block $0 (result i32)
(i32.add (i32.const 1000)
(block $default (result i32)
(br_table $0 $1 $2 $default
(i32.mul (i32.const 2) (local.get $i))
(i32.and (i32.const 3) (local.get $i))
)
)
)
)
)
)
)
)
)
)
)
(assert_return (invoke "br_table" (i32.const 0)) (i32.const 110))
(assert_return (invoke "br_table" (i32.const 1)) (i32.const 12))
(assert_return (invoke "br_table" (i32.const 2)) (i32.const 4))
(assert_return (invoke "br_table" (i32.const 3)) (i32.const 1116))
(assert_return (invoke "br_table" (i32.const 4)) (i32.const 118))
(assert_return (invoke "br_table" (i32.const 5)) (i32.const 20))
(assert_return (invoke "br_table" (i32.const 6)) (i32.const 12))
(assert_return (invoke "br_table" (i32.const 7)) (i32.const 1124))
(assert_return (invoke "br_table" (i32.const 8)) (i32.const 126))

View File

@@ -0,0 +1,31 @@
(module
(func (export "i32.div_s") (param i32) (param i32) (result i32)
(i32.div_s (local.get 0) (local.get 1))
)
)
(assert_return (invoke "i32.div_s" (i32.const -1) (i32.const -1)) (i32.const 1))
(module
(func (export "i32.rem_s") (param i32) (param i32) (result i32)
(i32.rem_s (local.get 0) (local.get 1))
)
)
(assert_return (invoke "i32.rem_s" (i32.const 123121) (i32.const -1)) (i32.const 0))
(module
(func (export "i64.div_s") (param i64) (param i64) (result i64)
(i64.div_s (local.get 0) (local.get 1))
)
)
(assert_return (invoke "i64.div_s" (i64.const -1) (i64.const -1)) (i64.const 1))
(module
(func (export "i64.rem_s") (param i64) (param i64) (result i64)
(i64.rem_s (local.get 0) (local.get 1))
)
)
(assert_return (invoke "i64.rem_s" (i64.const 123121) (i64.const -1)) (i64.const 0))

View File

@@ -0,0 +1,3 @@
(module (func (export "empty")))
(invoke "empty")

97
misc_testsuite/fib.wast Normal file
View File

@@ -0,0 +1,97 @@
(module
(func $fib (export "fib") (param $n i32) (result i32)
(if (result i32)
(i32.eq
(i32.const 0)
(local.get $n)
)
(then
(i32.const 1)
)
(else
(if (result i32)
(i32.eq
(i32.const 1)
(local.get $n)
)
(then
(i32.const 1)
)
(else
(i32.add
;; fib(n - 1)
(call $fib
(i32.add
(local.get $n)
(i32.const -1)
)
)
;; fib(n - 2)
(call $fib
(i32.add
(local.get $n)
(i32.const -2)
)
)
)
)
)
)
)
)
)
(assert_return (invoke "fib" (i32.const 0)) (i32.const 1))
(assert_return (invoke "fib" (i32.const 1)) (i32.const 1))
(assert_return (invoke "fib" (i32.const 2)) (i32.const 2))
(assert_return (invoke "fib" (i32.const 3)) (i32.const 3))
(assert_return (invoke "fib" (i32.const 4)) (i32.const 5))
(assert_return (invoke "fib" (i32.const 5)) (i32.const 8))
(assert_return (invoke "fib" (i32.const 6)) (i32.const 13))
(assert_return (invoke "fib" (i32.const 7)) (i32.const 21))
(assert_return (invoke "fib" (i32.const 8)) (i32.const 34))
(assert_return (invoke "fib" (i32.const 9)) (i32.const 55))
(assert_return (invoke "fib" (i32.const 10)) (i32.const 89))
;; Generated by Rust.
(module
(func $fib (export "fib") (param $p0 i32) (result i32)
(local $l1 i32)
(local.set $l1
(i32.const 1))
(block $B0
(br_if $B0
(i32.lt_u
(local.get $p0)
(i32.const 2)))
(local.set $l1
(i32.const 1))
(loop $L1
(local.set $l1
(i32.add
(call $fib
(i32.add
(local.get $p0)
(i32.const -1)))
(local.get $l1)))
(br_if $L1
(i32.gt_u
(local.tee $p0
(i32.add
(local.get $p0)
(i32.const -2)))
(i32.const 1)))))
(local.get $l1))
)
(assert_return (invoke "fib" (i32.const 0)) (i32.const 1))
(assert_return (invoke "fib" (i32.const 1)) (i32.const 1))
(assert_return (invoke "fib" (i32.const 2)) (i32.const 2))
(assert_return (invoke "fib" (i32.const 3)) (i32.const 3))
(assert_return (invoke "fib" (i32.const 4)) (i32.const 5))
(assert_return (invoke "fib" (i32.const 5)) (i32.const 8))
(assert_return (invoke "fib" (i32.const 6)) (i32.const 13))
(assert_return (invoke "fib" (i32.const 7)) (i32.const 21))
(assert_return (invoke "fib" (i32.const 8)) (i32.const 34))
(assert_return (invoke "fib" (i32.const 9)) (i32.const 55))
(assert_return (invoke "fib" (i32.const 10)) (i32.const 89))