Skip to content
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

Implement f32/f64 comparison operators #449

Merged
merged 3 commits into from
Aug 10, 2020
Merged

Implement f32/f64 comparison operators #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3010a42
Add f32/f64 comparison operators
axic Jul 31, 2020
1dfdeb3
test: Add tests for f32/f64 comparison operators
chfast Aug 10, 2020
abc3358
ci: Update spectest expectations
chfast Aug 10, 2020
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
16 changes: 8 additions & 8 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,9 @@ jobs:
- benchmark:
min_time: "0.01"
- spectest:
expected_passed: 5589
expected_passed: 10414
expected_failed: 9
expected_skipped: 6215
expected_skipped: 1390

sanitizers-macos:
executor: macos
Expand All @@ -289,9 +289,9 @@ jobs:
- benchmark:
min_time: "0.01"
- spectest:
expected_passed: 5589
expected_passed: 10414
expected_failed: 9
expected_skipped: 6215
expected_skipped: 1390

benchmark:
machine:
Expand Down Expand Up @@ -397,13 +397,13 @@ jobs:
at: ~/build
- spectest:
skip_validation: true
expected_passed: 4647
expected_passed: 9472
expected_failed: 9
expected_skipped: 7157
expected_skipped: 2332
- spectest:
expected_passed: 5589
expected_passed: 10414
expected_failed: 9
expected_skipped: 6215
expected_skipped: 1390
- collect_coverage_data

workflows:
Expand Down
75 changes: 63 additions & 12 deletions lib/fizzy/execute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,6 +1151,69 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, span<const Value>
comparison_op(stack, std::greater_equal<uint64_t>());
break;
}

case Instr::f32_eq:
{
comparison_op(stack, std::equal_to<float>());
break;
}
case Instr::f32_ne:
{
comparison_op(stack, std::not_equal_to<float>());
break;
}
case Instr::f32_lt:
{
comparison_op(stack, std::less<float>());
break;
}
case Instr::f32_gt:
{
comparison_op<float>(stack, std::greater<float>());
break;
}
case Instr::f32_le:
{
comparison_op(stack, std::less_equal<float>());
break;
}
case Instr::f32_ge:
{
comparison_op(stack, std::greater_equal<float>());
break;
}

case Instr::f64_eq:
{
comparison_op(stack, std::equal_to<double>());
break;
}
case Instr::f64_ne:
{
comparison_op(stack, std::not_equal_to<double>());
break;
}
case Instr::f64_lt:
{
comparison_op(stack, std::less<double>());
break;
}
case Instr::f64_gt:
{
comparison_op<double>(stack, std::greater<double>());
break;
}
case Instr::f64_le:
{
comparison_op(stack, std::less_equal<double>());
break;
}
case Instr::f64_ge:
{
comparison_op(stack, std::greater_equal<double>());
break;
}

case Instr::i32_clz:
{
unary_op(stack, clz32);
Expand Down Expand Up @@ -1502,18 +1565,6 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, span<const Value>
case Instr::f64_load:
case Instr::f32_store:
case Instr::f64_store:
case Instr::f32_eq:
case Instr::f32_ne:
case Instr::f32_lt:
case Instr::f32_gt:
case Instr::f32_le:
case Instr::f32_ge:
case Instr::f64_eq:
case Instr::f64_ne:
case Instr::f64_lt:
case Instr::f64_gt:
case Instr::f64_le:
case Instr::f64_ge:
case Instr::f32_abs:
case Instr::f32_neg:
case Instr::f32_ceil:
Expand Down
138 changes: 138 additions & 0 deletions test/unittests/execute_floating_point_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,144 @@ TEST(execute_floating_point, f64_add)
EXPECT_THAT(execute(*instance, 0, {1.0011, 6.0066}), Result(7.0077));
}

template <typename T>
class execute_floating_point_types : public testing::Test
{
};

/// Compile-time information about a Wasm type.
template <typename T>
struct WasmTypeTraits;

template <>
struct WasmTypeTraits<float>
{
static constexpr auto name = "f32";
};
template <>
struct WasmTypeTraits<double>
{
static constexpr auto name = "f64";
};

struct WasmTypeName
{
template <typename T>
static std::string GetName(int)
{
return WasmTypeTraits<T>::name;
}
};

using FloatingPointTypes = testing::Types<float, double>;
TYPED_TEST_SUITE(execute_floating_point_types, FloatingPointTypes, WasmTypeName);

TYPED_TEST(execute_floating_point_types, compare)
{
using Limits = typename FP<TypeParam>::Limits;

/* wat2wasm
(func (param f32 f32) (result i32) (f32.eq (local.get 0) (local.get 1)))
(func (param f32 f32) (result i32) (f32.ne (local.get 0) (local.get 1)))
(func (param f32 f32) (result i32) (f32.lt (local.get 0) (local.get 1)))
(func (param f32 f32) (result i32) (f32.gt (local.get 0) (local.get 1)))
(func (param f32 f32) (result i32) (f32.le (local.get 0) (local.get 1)))
(func (param f32 f32) (result i32) (f32.ge (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.eq (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.ne (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.lt (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.gt (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.le (local.get 0) (local.get 1)))
(func (param f64 f64) (result i32) (f64.ge (local.get 0) (local.get 1)))
*/
const auto wasm = from_hex(
"0061736d01000000010d0260027d7d017f60027c7c017f030d0c0000000000000101010101010a610c07002000"
"20015b0b0700200020015c0b0700200020015d0b0700200020015e0b0700200020015f0b070020002001600b07"
"0020002001610b070020002001620b070020002001630b070020002001640b070020002001650b070020002001"
"660b");
auto inst = instantiate(parse(wasm));

constexpr FuncIdx func_offset = std::is_same_v<TypeParam, float> ? 0 : 6;
constexpr auto eq = func_offset + 0;
constexpr auto ne = func_offset + 1;
constexpr auto lt = func_offset + 2;
constexpr auto gt = func_offset + 3;
constexpr auto le = func_offset + 4;
constexpr auto ge = func_offset + 5;

// The values to be used as test cases.
// They must be strictly ordered (ordered_values[i] < ordered_values[j] for i<j) or NaNs.
// This allows determining the relation of any pair of values only knowing values' position
// in the array.
const TypeParam ordered_values[] = {
-Limits::infinity(),
-Limits::max(),
std::nextafter(-Limits::max(), TypeParam{0}),
std::nextafter(-TypeParam{1.0}, -Limits::infinity()),
-TypeParam{1.0},
std::nextafter(-TypeParam{1.0}, TypeParam{0}),
std::nextafter(-Limits::min(), -Limits::infinity()),
-Limits::min(),
std::nextafter(-Limits::min(), TypeParam{0}),
std::nextafter(-Limits::denorm_min(), -Limits::infinity()),
-Limits::denorm_min(),
TypeParam{0},
Limits::denorm_min(),
std::nextafter(Limits::denorm_min(), Limits::infinity()),
std::nextafter(Limits::min(), TypeParam{0}),
Limits::min(),
std::nextafter(Limits::min(), Limits::infinity()),
std::nextafter(TypeParam{1.0}, TypeParam{0}),
TypeParam{1.0},
std::nextafter(TypeParam{1.0}, Limits::infinity()),
std::nextafter(Limits::max(), TypeParam{0}),
Limits::max(),
Limits::infinity(),

// NaNs.
FP<TypeParam>::nan(FP<TypeParam>::canon),
FP<TypeParam>::nan(FP<TypeParam>::canon + 1),
FP<TypeParam>::nan(1),
};

// Check every pair from cartesian product of ordered_values.
for (size_t i = 0; i < std::size(ordered_values); ++i)
{
for (size_t j = 0; j < std::size(ordered_values); ++j)
{
const auto a = ordered_values[i];
const auto b = ordered_values[j];
if (std::isnan(a) || std::isnan(b))
{
EXPECT_THAT(execute(*inst, eq, {a, b}), Result(0)) << a << "==" << b;
EXPECT_THAT(execute(*inst, ne, {a, b}), Result(1)) << a << "!=" << b;
EXPECT_THAT(execute(*inst, lt, {a, b}), Result(0)) << a << "<" << b;
EXPECT_THAT(execute(*inst, gt, {a, b}), Result(0)) << a << ">" << b;
EXPECT_THAT(execute(*inst, le, {a, b}), Result(0)) << a << "<=" << b;
EXPECT_THAT(execute(*inst, ge, {a, b}), Result(0)) << a << ">=" << b;
}
else
{
EXPECT_THAT(execute(*inst, eq, {a, b}), Result(uint32_t{i == j})) << a << "==" << b;
EXPECT_THAT(execute(*inst, ne, {a, b}), Result(uint32_t{i != j})) << a << "!=" << b;
EXPECT_THAT(execute(*inst, lt, {a, b}), Result(uint32_t{i < j})) << a << "<" << b;
EXPECT_THAT(execute(*inst, gt, {a, b}), Result(uint32_t{i > j})) << a << ">" << b;
EXPECT_THAT(execute(*inst, le, {a, b}), Result(uint32_t{i <= j})) << a << "<=" << b;
EXPECT_THAT(execute(*inst, ge, {a, b}), Result(uint32_t{i >= j})) << a << ">=" << b;
}
}
}

// Negative zero. This is separate set of checks because -0.0 cannot be placed
// in the ordered_values array as -0.0 == 0.0.
EXPECT_THAT(execute(*inst, eq, {TypeParam{-0.0}, TypeParam{0.0}}), Result(1));
EXPECT_THAT(execute(*inst, ne, {TypeParam{-0.0}, TypeParam{0.0}}), Result(0));
EXPECT_THAT(execute(*inst, lt, {TypeParam{-0.0}, TypeParam{0.0}}), Result(0));
EXPECT_THAT(execute(*inst, gt, {TypeParam{-0.0}, TypeParam{0.0}}), Result(0));
EXPECT_THAT(execute(*inst, le, {TypeParam{-0.0}, TypeParam{0.0}}), Result(1));
EXPECT_THAT(execute(*inst, ge, {TypeParam{-0.0}, TypeParam{0.0}}), Result(1));
}


template <typename SrcT, typename DstT>
struct ConversionPairWasmTraits;
Expand Down