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

Use floats for wasmtime::component::Val::Float* #5510

Merged
merged 1 commit into from
Jan 3, 2023
Merged

Use floats for wasmtime::component::Val::Float* #5510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/fuzzing/src/generators/component_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ pub fn arbitrary_val(ty: &component::Type, input: &mut Unstructured) -> arbitrar
Type::U32 => Val::U32(input.arbitrary()?),
Type::S64 => Val::S64(input.arbitrary()?),
Type::U64 => Val::U64(input.arbitrary()?),
Type::Float32 => Val::Float32(input.arbitrary::<f32>()?.to_bits()),
Type::Float64 => Val::Float64(input.arbitrary::<f64>()?.to_bits()),
Type::Float32 => Val::Float32(input.arbitrary()?),
Type::Float64 => Val::Float64(input.arbitrary()?),
Type::Char => Val::Char(input.arbitrary()?),
Type::String => Val::String(input.arbitrary()?),
Type::List(list) => {
Expand Down
28 changes: 14 additions & 14 deletions crates/wasmtime/src/component/values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::ops::Deref;
use wasmtime_component_util::{DiscriminantSize, FlagsSize};
use wasmtime_environ::component::VariantInfo;

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct List {
ty: types::List,
values: Box<[Val]>,
Expand Down Expand Up @@ -57,7 +57,7 @@ impl fmt::Debug for List {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct Record {
ty: types::Record,
values: Box<[Val]>,
Expand Down Expand Up @@ -127,7 +127,7 @@ impl fmt::Debug for Record {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct Tuple {
ty: types::Tuple,
values: Box<[Val]>,
Expand Down Expand Up @@ -176,7 +176,7 @@ impl fmt::Debug for Tuple {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct Variant {
ty: types::Variant,
discriminant: u32,
Expand Down Expand Up @@ -284,7 +284,7 @@ impl fmt::Debug for Enum {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct Union {
ty: types::Union,
discriminant: u32,
Expand Down Expand Up @@ -336,7 +336,7 @@ impl fmt::Debug for Union {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct OptionVal {
ty: types::OptionType,
discriminant: u32,
Expand Down Expand Up @@ -378,7 +378,7 @@ impl fmt::Debug for OptionVal {
}
}

#[derive(PartialEq, Eq, Clone)]
#[derive(PartialEq, Clone)]
pub struct ResultVal {
ty: types::ResultType,
discriminant: u32,
Expand Down Expand Up @@ -487,7 +487,7 @@ impl fmt::Debug for Flags {
}

/// Represents possible runtime values which a component function can either consume or produce
#[derive(Debug, PartialEq, Eq, Clone)]
#[derive(Debug, Clone, PartialEq)]
#[allow(missing_docs)]
pub enum Val {
Bool(bool),
Expand All @@ -499,8 +499,8 @@ pub enum Val {
U32(u32),
S64(i64),
U64(u64),
Float32(u32),
Float64(u64),
Float32(f32),
Float64(f64),
Char(char),
String(Box<str>),
List(List),
Expand Down Expand Up @@ -560,8 +560,8 @@ impl Val {
Type::U32 => Val::U32(u32::lift(store, options, next(src))?),
Type::S64 => Val::S64(i64::lift(store, options, next(src))?),
Type::U64 => Val::U64(u64::lift(store, options, next(src))?),
Type::Float32 => Val::Float32(u32::lift(store, options, next(src))?),
Type::Float64 => Val::Float64(u64::lift(store, options, next(src))?),
Type::Float32 => Val::Float32(f32::lift(store, options, next(src))?),
Type::Float64 => Val::Float64(f64::lift(store, options, next(src))?),
Type::Char => Val::Char(char::lift(store, options, next(src))?),
Type::String => {
Val::String(Box::<str>::lift(store, options, &[*next(src), *next(src)])?)
Expand Down Expand Up @@ -688,8 +688,8 @@ impl Val {
Type::U32 => Val::U32(u32::load(mem, bytes)?),
Type::S64 => Val::S64(i64::load(mem, bytes)?),
Type::U64 => Val::U64(u64::load(mem, bytes)?),
Type::Float32 => Val::Float32(u32::load(mem, bytes)?),
Type::Float64 => Val::Float64(u64::load(mem, bytes)?),
Type::Float32 => Val::Float32(f32::load(mem, bytes)?),
Type::Float64 => Val::Float64(f64::load(mem, bytes)?),
Type::Char => Val::Char(char::load(mem, bytes)?),
Type::String => Val::String(Box::<str>::load(mem, bytes)?),
Type::List(handle) => {
Expand Down
8 changes: 4 additions & 4 deletions crates/wast/src/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pub fn val(v: &WastVal<'_>, ty: &Type) -> Result<Val> {
WastVal::S32(b) => Val::S32(*b),
WastVal::U64(b) => Val::U64(*b),
WastVal::S64(b) => Val::S64(*b),
WastVal::Float32(b) => Val::Float32(b.bits),
WastVal::Float64(b) => Val::Float64(b.bits),
WastVal::Float32(b) => Val::Float32(f32::from_bits(b.bits)),
WastVal::Float64(b) => Val::Float64(f64::from_bits(b.bits)),
WastVal::Char(b) => Val::Char(*b),
WastVal::String(s) => Val::String(s.to_string().into()),
WastVal::List(vals) => match ty {
Expand Down Expand Up @@ -173,11 +173,11 @@ pub fn match_val(expected: &WastVal<'_>, actual: &Val) -> Result<()> {
_ => mismatch(expected, actual),
},
WastVal::Float32(e) => match actual {
Val::Float32(a) => core::match_f32(*a, &NanPattern::Value(*e)),
Val::Float32(a) => core::match_f32(a.to_bits(), &NanPattern::Value(*e)),
_ => mismatch(expected, actual),
},
WastVal::Float64(e) => match actual {
Val::Float64(a) => core::match_f64(*a, &NanPattern::Value(*e)),
Val::Float64(a) => core::match_f64(a.to_bits(), &NanPattern::Value(*e)),
_ => mismatch(expected, actual),
},
WastVal::Char(e) => match actual {
Expand Down
34 changes: 13 additions & 21 deletions tests/all/component_model/dynamic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ fn primitives() -> Result<()> {
(Val::S64(-31415926535897), "s64", Param(Type::I64, Some(0))),
(Val::U64(31415926535897), "u64", Param(Type::I64, Some(0))),
(
Val::Float32(3.14159265_f32.to_bits()),
Val::Float32(3.14159265),
"float32",
Param(Type::F32, Some(0)),
),
(
Val::Float64(3.14159265_f64.to_bits()),
Val::Float64(3.14159265),
"float64",
Param(Type::F64, Some(0)),
),
Expand Down Expand Up @@ -59,10 +59,7 @@ fn primitives() -> Result<()> {
let err = func
.call_and_post_return(
&mut store,
&[
Val::Float64(3.14159265_f64.to_bits()),
Val::Float64(3.14159265_f64.to_bits()),
],
&[Val::Float64(3.14159265), Val::Float64(3.14159265)],
&mut output,
)
.unwrap_err();
Expand Down Expand Up @@ -135,7 +132,7 @@ fn lists() -> Result<()> {
.new_val(Box::new([
Val::U32(32343),
Val::U32(79023439),
Val::Float32(3.14159265_f32.to_bits()),
Val::Float32(3.14159265),
]))
.unwrap_err();

Expand Down Expand Up @@ -167,7 +164,7 @@ fn records() -> Result<()> {
let inner_type = &ty.unwrap_record().fields().nth(2).unwrap().ty;
let input = ty.unwrap_record().new_val([
("A", Val::U32(32343)),
("B", Val::Float64(3.14159265_f64.to_bits())),
("B", Val::Float64(3.14159265)),
(
"C",
inner_type
Expand All @@ -186,7 +183,7 @@ fn records() -> Result<()> {
.unwrap_record()
.new_val([
("A", Val::S32(32343)),
("B", Val::Float64(3.14159265_f64.to_bits())),
("B", Val::Float64(3.14159265)),
(
"C",
inner_type
Expand All @@ -204,7 +201,7 @@ fn records() -> Result<()> {
.unwrap_record()
.new_val([
("A", Val::U32(32343)),
("B", Val::Float64(3.14159265_f64.to_bits())),
("B", Val::Float64(3.14159265)),
(
"C",
inner_type
Expand All @@ -224,10 +221,7 @@ fn records() -> Result<()> {

let err = ty
.unwrap_record()
.new_val([
("A", Val::U32(32343)),
("B", Val::Float64(3.14159265_f64.to_bits())),
])
.new_val([("A", Val::U32(32343)), ("B", Val::Float64(3.14159265))])
.unwrap_err();

assert!(
Expand Down Expand Up @@ -259,7 +253,7 @@ fn variants() -> Result<()> {
let ty = &func.params(&store)[0];
let input = ty
.unwrap_variant()
.new_val("B", Some(Val::Float64(3.14159265_f64.to_bits())))?;
.new_val("B", Some(Val::Float64(3.14159265)))?;
let mut output = [Val::Bool(false)];
func.call_and_post_return(&mut store, &[input.clone()], &mut output)?;

Expand Down Expand Up @@ -481,14 +475,14 @@ fn everything() -> Result<()> {
"J",
j_type
.unwrap_variant()
.new_val("L", Some(Val::Float64(3.14159265_f64.to_bits())))?,
.new_val("L", Some(Val::Float64(3.14159265)))?,
),
("P", Val::S8(42)),
("Q", Val::S16(4242)),
("R", Val::S32(42424242)),
("S", Val::S64(424242424242424242)),
("T", Val::Float32(3.14159265_f32.to_bits())),
("U", Val::Float64(3.14159265_f64.to_bits())),
("T", Val::Float32(3.14159265)),
("U", Val::Float64(3.14159265)),
("V", Val::String(Box::from("wow, nice types"))),
("W", Val::Char('🦀')),
(
Expand All @@ -499,9 +493,7 @@ fn everything() -> Result<()> {
),
(
"Z",
z_type
.unwrap_union()
.new_val(1, Val::Float64(3.14159265_f64.to_bits()))?,
z_type.unwrap_union().new_val(1, Val::Float64(3.14159265))?,
),
(
"AA",
Expand Down