Skip to content

Convert remaining NaN tests to use new assert types #448

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

Closed
wants to merge 2 commits into from
Closed

Convert remaining NaN tests to use new assert types #448

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
3e8074a
Use `assert_return_canonical_nan` and `assert_return_arithmetic_nan` …
Cellule Mar 27, 2017
ab0298d
assert_return_arithmetic_nan, use bare_nan for comparison instead of …
Cellule Mar 27, 2017
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
12 changes: 6 additions & 6 deletions interpreter/host/run.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ let run_assertion ass =
assert_result ass.at (got_vs = expect_vs) got_vs print_result expect_vs

| AssertReturnCanonicalNaN act ->
trace ("Asserting return...");
trace ("Asserting return canonical nan...");
let got_vs = run_action act in
let is_canonical_nan =
match got_vs with
Expand All @@ -367,15 +367,15 @@ let run_assertion ass =
in assert_result ass.at is_canonical_nan got_vs print_endline "nan"

| AssertReturnArithmeticNaN act ->
trace ("Asserting return...");
trace ("Asserting return arithmetic nan...");
let got_vs = run_action act in
let is_arithmetic_nan =
(* Accept any NaN that's one everywhere pos_nan is one *)
match got_vs with
| [Values.F32 got_f32] -> let pos_nan = F32.to_bits F32.pos_nan in
Int32.logand (F32.to_bits got_f32) pos_nan = pos_nan
| [Values.F64 got_f64] -> let pos_nan = F64.to_bits F64.pos_nan in
Int64.logand (F64.to_bits got_f64) pos_nan = pos_nan
| [Values.F32 got_f32] -> let bare_nan = F32.to_bits F32.bare_nan in
Int32.logand (F32.to_bits got_f32) bare_nan = bare_nan
| [Values.F64 got_f64] -> let bare_nan = F64.to_bits F64.bare_nan in
Int64.logand (F64.to_bits got_f64) bare_nan = bare_nan
| _ -> false
in assert_result ass.at is_arithmetic_nan got_vs print_endline "nan"

Expand Down
1 change: 1 addition & 0 deletions interpreter/spec/float.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ sig
type bits
val pos_nan : t
val neg_nan : t
val bare_nan : t
val of_float : float -> t
val to_float : t -> float
val of_string : string -> t
Expand Down
24 changes: 12 additions & 12 deletions test/core/conversions.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
(assert_return (invoke "f64.promote_f32" (f32.const 0x1.8f867ep+125)) (f64.const 6.6382536710104395e+37))
(assert_return (invoke "f64.promote_f32" (f32.const infinity)) (f64.const infinity))
(assert_return (invoke "f64.promote_f32" (f32.const -infinity)) (f64.const -infinity))
(assert_return (invoke "f64.promote_f32" (f32.const nan)) (f64.const nan))
(assert_return_canonical_nan (invoke "f64.promote_f32" (f32.const nan)))

(assert_return (invoke "f32.demote_f64" (f64.const 0.0)) (f32.const 0.0))
(assert_return (invoke "f32.demote_f64" (f64.const -0.0)) (f32.const -0.0))
Expand Down Expand Up @@ -364,7 +364,7 @@
(assert_return (invoke "f32.demote_f64" (f64.const 0x1.cb98354d521ffp-127)) (f32.const 0x1.cb9834p-127))
(assert_return (invoke "f32.demote_f64" (f64.const -0x1.6972b30cfb562p+1)) (f32.const -0x1.6972b4p+1))
(assert_return (invoke "f32.demote_f64" (f64.const -0x1.bedbe4819d4c4p+112)) (f32.const -0x1.bedbe4p+112))
(assert_return (invoke "f32.demote_f64" (f64.const nan)) (f32.const nan))
(assert_return_canonical_nan (invoke "f32.demote_f64" (f64.const nan)))
(assert_return (invoke "f32.demote_f64" (f64.const 0x1p-1022)) (f32.const 0.0))
(assert_return (invoke "f32.demote_f64" (f64.const -0x1p-1022)) (f32.const -0.0))
(assert_return (invoke "f32.demote_f64" (f64.const 0x1.0p-150)) (f32.const 0.0))
Expand All @@ -375,28 +375,28 @@
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0)) (f32.const 0.0))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x80000000)) (f32.const -0.0))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 1)) (f32.const 0x1p-149))
(assert_return (invoke "f32.reinterpret_i32" (i32.const -1)) (f32.const -nan:0x7fffff))
(assert_return_arithmetic_nan (invoke "f32.reinterpret_i32" (i32.const -1)))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 123456789)) (f32.const 0x1.b79a2ap-113))
(assert_return (invoke "f32.reinterpret_i32" (i32.const -2147483647)) (f32.const -0x1p-149))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7f800000)) (f32.const infinity))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0xff800000)) (f32.const -infinity))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7fc00000)) (f32.const nan))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0xffc00000)) (f32.const -nan))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0x7fa00000)) (f32.const nan:0x200000))
(assert_return (invoke "f32.reinterpret_i32" (i32.const 0xffa00000)) (f32.const -nan:0x200000))
(assert_return_canonical_nan (invoke "f32.reinterpret_i32" (i32.const 0x7fc00000)))
(assert_return_canonical_nan (invoke "f32.reinterpret_i32" (i32.const 0xffc00000)))
(assert_return_arithmetic_nan (invoke "f32.reinterpret_i32" (i32.const 0x7fa00000)))
(assert_return_arithmetic_nan (invoke "f32.reinterpret_i32" (i32.const 0xffa00000)))

(assert_return (invoke "f64.reinterpret_i64" (i64.const 0)) (f64.const 0.0))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 1)) (f64.const 0x0.0000000000001p-1022))
(assert_return (invoke "f64.reinterpret_i64" (i64.const -1)) (f64.const -nan:0xfffffffffffff))
(assert_return_arithmetic_nan (invoke "f64.reinterpret_i64" (i64.const -1)))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x8000000000000000)) (f64.const -0.0))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 1234567890)) (f64.const 0x0.00000499602d2p-1022))
(assert_return (invoke "f64.reinterpret_i64" (i64.const -9223372036854775807)) (f64.const -0x0.0000000000001p-1022))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff0000000000000)) (f64.const infinity))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff0000000000000)) (f64.const -infinity))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff8000000000000)) (f64.const nan))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff8000000000000)) (f64.const -nan))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0x7ff4000000000000)) (f64.const nan:0x4000000000000))
(assert_return (invoke "f64.reinterpret_i64" (i64.const 0xfff4000000000000)) (f64.const -nan:0x4000000000000))
(assert_return_canonical_nan (invoke "f64.reinterpret_i64" (i64.const 0x7ff8000000000000)))
(assert_return_canonical_nan (invoke "f64.reinterpret_i64" (i64.const 0xfff8000000000000)))
(assert_return_arithmetic_nan (invoke "f64.reinterpret_i64" (i64.const 0x7ff4000000000000)))
(assert_return_arithmetic_nan (invoke "f64.reinterpret_i64" (i64.const 0xfff4000000000000)))

(assert_return (invoke "i32.reinterpret_f32" (f32.const 0.0)) (i32.const 0))
(assert_return (invoke "i32.reinterpret_f32" (f32.const -0.0)) (i32.const 0x80000000))
Expand Down
80 changes: 40 additions & 40 deletions test/core/f32.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,42 +2302,42 @@
(assert_return (invoke "copysign" (f32.const -infinity) (f32.const nan)) (f32.const infinity))
(assert_return (invoke "copysign" (f32.const infinity) (f32.const -nan)) (f32.const -infinity))
(assert_return (invoke "copysign" (f32.const infinity) (f32.const nan)) (f32.const infinity))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x0p+0)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x0p+0)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x0p+0)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-149)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-149)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-149)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-126)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-126)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-126)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p-1)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p-1)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p-1)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1p+0)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1p+0)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1p+0)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -infinity)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const infinity)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -infinity)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const infinity)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const -nan)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const -nan) (f32.const nan)) (f32.const nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const -nan)) (f32.const -nan))
(assert_return (invoke "copysign" (f32.const nan) (f32.const nan)) (f32.const nan))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x0p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x0p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x0p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x0p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1p-149)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1p-149)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1p-149)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1p-149)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1p-126)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1p-126)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1p-126)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1p-126)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1p-1)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1p-1)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1p-1)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1p-1)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1p+0)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1.921fb6p+2)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1.921fb6p+2)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1.921fb6p+2)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1.921fb6p+2)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -0x1.fffffep+127)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const 0x1.fffffep+127)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -0x1.fffffep+127)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const 0x1.fffffep+127)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -infinity)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const infinity)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -infinity)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const infinity)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const -nan)))
(assert_return_canonical_nan (invoke "copysign" (f32.const -nan) (f32.const nan)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const -nan)))
(assert_return_canonical_nan (invoke "copysign" (f32.const nan) (f32.const nan)))
(assert_return (invoke "sqrt" (f32.const -0x0p+0)) (f32.const -0x0p+0))
(assert_return (invoke "sqrt" (f32.const 0x0p+0)) (f32.const 0x0p+0))
(assert_return_canonical_nan (invoke "sqrt" (f32.const -0x1p-149)))
Expand Down Expand Up @@ -2444,8 +2444,8 @@
(assert_return (invoke "abs" (f32.const 0x1.fffffep+127)) (f32.const 0x1.fffffep+127))
(assert_return (invoke "abs" (f32.const -infinity)) (f32.const infinity))
(assert_return (invoke "abs" (f32.const infinity)) (f32.const infinity))
(assert_return (invoke "abs" (f32.const -nan)) (f32.const nan))
(assert_return (invoke "abs" (f32.const nan)) (f32.const nan))
(assert_return_canonical_nan (invoke "abs" (f32.const -nan)))
(assert_return_canonical_nan (invoke "abs" (f32.const nan)))
(assert_return (invoke "neg" (f32.const -0x0p+0)) (f32.const 0x0p+0))
(assert_return (invoke "neg" (f32.const 0x0p+0)) (f32.const -0x0p+0))
(assert_return (invoke "neg" (f32.const -0x1p-149)) (f32.const 0x1p-149))
Expand All @@ -2462,5 +2462,5 @@
(assert_return (invoke "neg" (f32.const 0x1.fffffep+127)) (f32.const -0x1.fffffep+127))
(assert_return (invoke "neg" (f32.const -infinity)) (f32.const infinity))
(assert_return (invoke "neg" (f32.const infinity)) (f32.const -infinity))
(assert_return (invoke "neg" (f32.const -nan)) (f32.const nan))
(assert_return (invoke "neg" (f32.const nan)) (f32.const -nan))
(assert_return_canonical_nan (invoke "neg" (f32.const -nan)))
(assert_return_canonical_nan (invoke "neg" (f32.const nan)))
Loading