T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to the latest spec_testsuite and dependencies. (#803)

Browse Source 
* Update to the latest spec_testsuite and dependencies.

Update to target-lexicon 0.10, cranelift 0.54, wast 0.6, faerie 0.14,
and the latest spec_testsuite.

For wast and cranelift-wasm, update the code for API changes.

* Factor out the code for matching f32, f64, and v128.

This takes the idea from #802 to split out `f32_matches`, `f64_matches`,
and `v128_matches` functions, which better factor out the matching
functionality between scalar and vector.
This commit is contained in:
Dan Gohman
2020-01-10 13:57:38 -08:00
committed by GitHub
parent 28a938a62f
commit ef2177ed3a
22 changed files with 167 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/api/Cargo.toml
View File

@@ -16,8 +16,8 @@ crate-type = ["lib", "staticlib", "cdylib"]
wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }
wasmparser = { version = "0.45.1", default-features = false }
target-lexicon = { version = "0.9.0", default-features = false }
wasmparser = { version = "0.47.0", default-features = false }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0.19"
region = "2.0.0"
libc = "0.2"

2
crates/api/c-examples/wasm-c-api

Submodule crates/api/c-examples/wasm-c-api updated: 8782d5b456...d9a80099d4

6
crates/debug/Cargo.toml
View File

@@ -13,10 +13,10 @@ edition = "2018"
[dependencies]
gimli = "0.19.0"
wasmparser = "0.45.1"
faerie = "0.13.0"
wasmparser = "0.47.0"
faerie = "0.14.0"
wasmtime-environ = { path = "../environ", version = "0.9.0" }
target-lexicon = { version = "0.9.0", default-features = false }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0"
thiserror = "1.0.4"
more-asserts = "0.2.1"

12
crates/environ/Cargo.toml
View File

@@ -13,10 +13,10 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
cranelift-codegen = { version = "0.52.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.52.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.52.0", features = ["enable-serde"] }
wasmparser = "0.45.1"
cranelift-codegen = { version = "0.53", features = ["enable-serde"] }
cranelift-entity = { version = "0.53", features = ["enable-serde"] }
cranelift-wasm = { version = "0.53", features = ["enable-serde"] }
wasmparser = "0.47.0"
lightbeam = { path = "../lightbeam", optional = true, version = "0.9.0" }
indexmap = "1.0.2"
rayon = "1.2.1"
@@ -43,10 +43,10 @@ errno = "0.2.4"
[dev-dependencies]
tempfile = "3"
target-lexicon = { version = "0.9.0", default-features = false }
target-lexicon = { version = "0.10.0", default-features = false }
pretty_env_logger = "0.3.0"
rand = { version = "0.7.0", default-features = false, features = ["small_rng"] }
cranelift-codegen = { version = "0.52.0", features = ["enable-serde", "all-arch"] }
cranelift-codegen = { version = "0.53", features = ["enable-serde", "all-arch"] }
filetime = "0.2.7"
[badges]

4
crates/environ/src/func_environ.rs
View File

@@ -362,6 +362,10 @@ impl<'module_environment> TargetEnvironment for FuncEnvironment<'module_environm
}
impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'module_environment> {
fn is_wasm_parameter(&self, func: &ir::Function, index: usize) -> bool {
func.signature.params[index].purpose == ir::ArgumentPurpose::Normal
}
fn make_table(&mut self, func: &mut ir::Function, index: TableIndex) -> WasmResult<ir::Table> {
let pointer_type = self.pointer_type();

2
crates/fuzzing/Cargo.toml
View File

@@ -14,7 +14,7 @@ arbitrary = "0.2.0"
binaryen = "0.8.2"
env_logger = { version = "0.7.1", optional = true }
log = "0.4.8"
wasmparser = "0.45.1"
wasmparser = "0.47.0"
wasmprinter = "0.2.0"
wasmtime = { path = "../api", version = "0.9.0" }
wasmtime-environ = { path = "../environ", version = "0.9.0" }

2
crates/interface-types/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.19"
walrus = "0.13"
wasmparser = { version = "0.45.1", default-features = false }
wasmparser = { version = "0.47.0", default-features = false }
wasm-webidl-bindings = "0.6"
wasmtime = { path = "../api", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }

14
crates/jit/Cargo.toml
View File

@@ -11,18 +11,18 @@ readme = "README.md"
edition = "2018"
[dependencies]
cranelift-codegen = { version = "0.52.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.52.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.52.0", features = ["enable-serde"] }
cranelift-native = "0.52.0"
cranelift-frontend = "0.52.0"
cranelift-codegen = { version = "0.53", features = ["enable-serde"] }
cranelift-entity = { version = "0.53", features = ["enable-serde"] }
cranelift-wasm = { version = "0.53", features = ["enable-serde"] }
cranelift-native = "0.53"
cranelift-frontend = "0.53"
wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
wasmtime-debug = { path = "../debug", version = "0.9.0" }
region = "2.0.0"
thiserror = "1.0.4"
target-lexicon = { version = "0.9.0", default-features = false }
wasmparser = { version = "0.45.1", default-features = false }
target-lexicon = { version = "0.10.0", default-features = false }
wasmparser = { version = "0.47.0", default-features = false }
more-asserts = "0.2.1"
anyhow = "1.0"

4
crates/lightbeam/Cargo.toml
View File

@@ -14,12 +14,12 @@ edition = "2018"
smallvec = "1.0.0"
dynasm = "0.5.2"
dynasmrt = "0.5.2"
wasmparser = "0.45.1"
wasmparser = "0.47.0"
memoffset = "0.5.3"
itertools = "0.8.2"
capstone = "0.6.0"
thiserror = "1.0.9"
cranelift-codegen = "0.52.0"
cranelift-codegen = "0.53"
multi_mut = "0.1"
either = "1.5"
typemap = "0.3"

4
crates/misc/py/Cargo.toml
View File

@@ -22,10 +22,10 @@ wasmtime-environ = { path = "../../environ", version = "0.9.0" }
wasmtime-interface-types = { path = "../../interface-types", version = "0.9.0" }
wasmtime-runtime = { path = "../../runtime", version = "0.9.0" }
wasmtime-wasi = { path = "../../wasi", version = "0.9.0" }
target-lexicon = { version = "0.9.0", default-features = false }
target-lexicon = { version = "0.10.0", default-features = false }
anyhow = "1.0.19"
region = "2.0.0"
wasmparser = "0.45.1"
wasmparser = "0.47.0"
pyo3 = { version = "0.8.0", features = ["extension-module"] }
[badges]

2
crates/obj/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
wasmtime-environ = { path = "../environ", version = "0.9.0" }
faerie = "0.13.0"
faerie = "0.14.0"
more-asserts = "0.2.1"
[badges]

2
crates/test-programs/Cargo.toml
View File

@@ -16,7 +16,7 @@ wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }
wasmtime-wasi = { path = "../wasi", version = "0.9.0" }
wasmtime = { path = "../api", version = "0.9.0" }
target-lexicon = "0.9.0"
target-lexicon = "0.10.0"
pretty_env_logger = "0.3.0"
tempfile = "3.1.0"
os_pipe = "0.9"

10
crates/wasi-c/Cargo.toml
View File

@@ -14,17 +14,17 @@ edition = "2018"
wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }
cranelift-codegen = { version = "0.52.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.52.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.52.0", features = ["enable-serde"] }
target-lexicon = "0.9.0"
cranelift-codegen = { version = "0.53", features = ["enable-serde"] }
cranelift-entity = { version = "0.53", features = ["enable-serde"] }
cranelift-wasm = { version = "0.53", features = ["enable-serde"] }
target-lexicon = "0.10.0"
log = { version = "0.4.8", default-features = false }
libc = "0.2.60"
more-asserts = "0.2.1"
[build-dependencies]
cmake = "0.1.35"
bindgen = "0.51.0"
bindgen = "0.52.0"
[badges]
maintenance = { status = "actively-developed" }

2
crates/wasi-common/wig/WASI

Submodule crates/wasi-common/wig/WASI updated: 9150e66a34...04d4eba571

8
crates/wasi/Cargo.toml
View File

@@ -16,10 +16,10 @@ wasmtime-runtime = { path = "../runtime", version = "0.9.0" }
wasmtime-environ = { path = "../environ", version = "0.9.0" }
wasmtime-jit = { path = "../jit", version = "0.9.0" }
wasi-common = { path = "../wasi-common", version = "0.9.0" }
cranelift-codegen = { version = "0.52.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.52.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.52.0", features = ["enable-serde"] }
target-lexicon = "0.9.0"
cranelift-codegen = { version = "0.53", features = ["enable-serde"] }
cranelift-entity = { version = "0.53", features = ["enable-serde"] }
cranelift-wasm = { version = "0.53", features = ["enable-serde"] }
target-lexicon = "0.10.0"
log = { version = "0.4.8", default-features = false }
wig = { path = "../wasi-common/wig", version = "0.9.2" }

2
crates/wast/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0.19"
wasmtime = { path = "../api", version = "0.9.0" }
wast = "5.0.1"
wast = "6.0.0"
[badges]
maintenance = { status = "actively-developed" }

175
crates/wast/src/wast.rs
View File

@@ -191,10 +191,10 @@ impl WastContext {
Ok(Outcome::Ok(vec![global.get()]))
}
fn assert_return(&self, result: Outcome, results: &[Val]) -> Result<()> {
fn assert_return(&self, result: Outcome, results: &[wast::AssertExpression]) -> Result<()> {
let values = result.into_result()?;
for (v, e) in values.iter().zip(results) {
if values_equal(v, e)? {
if val_matches(v, e)? {
continue;
}
bail!("expected {:?}, got {:?}", e, v)
@@ -263,10 +263,6 @@ impl WastContext {
exec,
results,
} => {
let results = results
.iter()
.map(runtime_value)
.collect::<Result<Vec<_>>>()?;
let result = self.perform_execute(exec)?;
self.assert_return(result, &results)?;
}
@@ -286,92 +282,6 @@ impl WastContext {
let result = self.perform_invoke(call)?;
self.assert_trap(result, message)?;
}
AssertReturnCanonicalNan { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
match v {
Val::F32(x) => {
if !is_canonical_f32_nan(x) {
bail!("expected canonical NaN");
}
}
Val::F64(x) => {
if !is_canonical_f64_nan(x) {
bail!("expected canonical NaN");
}
}
other => bail!("expected float, got {:?}", other),
};
}
}
AssertReturnCanonicalNanF32x4 { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
let val = match v {
Val::V128(x) => x,
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_canonical_f32_nan(extract_lane_as_u32(val, l)?) {
bail!("expected f32x4 canonical NaN in lane {}", l)
}
}
}
}
AssertReturnCanonicalNanF64x2 { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
let val = match v {
Val::V128(x) => x,
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_canonical_f64_nan(extract_lane_as_u64(val, l)?) {
bail!("expected f64x2 canonical NaN in lane {}", l)
}
}
}
}
AssertReturnArithmeticNan { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
match v {
Val::F32(x) => {
if !is_arithmetic_f32_nan(x) {
bail!("expected arithmetic NaN");
}
}
Val::F64(x) => {
if !is_arithmetic_f64_nan(x) {
bail!("expected arithmetic NaN");
}
}
other => bail!("expected float, got {:?}", other),
}
}
}
AssertReturnArithmeticNanF32x4 { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
let val = match v {
Val::V128(x) => x,
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_arithmetic_f32_nan(extract_lane_as_u32(val, l)?) {
bail!("expected f32x4 arithmetic NaN in lane {}", l)
}
}
}
}
AssertReturnArithmeticNanF64x2 { span: _, invoke } => {
for v in self.perform_invoke(invoke)?.into_result()? {
let val = match v {
Val::V128(x) => x,
other => bail!("expected v128, got {:?}", other),
};
for l in 0..4 {
if !is_arithmetic_f64_nan(extract_lane_as_u64(val, l)?) {
bail!("expected f64x2 arithmetic NaN in lane {}", l)
}
}
}
}
AssertInvalid {
span: _,
mut module,
@@ -449,12 +359,20 @@ impl WastContext {
}
}
fn extract_lane_as_u32(bytes: u128, lane: usize) -> Result<u32> {
Ok((bytes >> (lane * 32)) as u32)
fn extract_lane_as_i8(bytes: u128, lane: usize) -> i8 {
(bytes >> (lane * 8)) as i8
}
fn extract_lane_as_u64(bytes: u128, lane: usize) -> Result<u64> {
Ok((bytes >> (lane * 64)) as u64)
fn extract_lane_as_i16(bytes: u128, lane: usize) -> i16 {
(bytes >> (lane * 16)) as i16
}
fn extract_lane_as_i32(bytes: u128, lane: usize) -> i32 {
(bytes >> (lane * 32)) as i32
}
fn extract_lane_as_i64(bytes: u128, lane: usize) -> i64 {
(bytes >> (lane * 64)) as i64
}
fn is_canonical_f32_nan(bits: u32) -> bool {
@@ -475,15 +393,64 @@ fn is_arithmetic_f64_nan(bits: u64) -> bool {
(bits & AF64_NAN) == AF64_NAN
}
fn values_equal(v1: &Val, v2: &Val) -> Result<bool> {
Ok(match (v1, v2) {
(Val::I32(a), Val::I32(b)) => a == b,
(Val::I64(a), Val::I64(b)) => a == b,
fn val_matches(actual: &Val, expected: &wast::AssertExpression) -> Result<bool> {
Ok(match (actual, expected) {
(Val::I32(a), wast::AssertExpression::I32(b)) => a == b,
(Val::I64(a), wast::AssertExpression::I64(b)) => a == b,
// Note that these float comparisons are comparing bits, not float
// values, so we're testing for bit-for-bit equivalence
(Val::F32(a), Val::F32(b)) => a == b,
(Val::F64(a), Val::F64(b)) => a == b,
(Val::V128(a), Val::V128(b)) => a == b,
_ => bail!("don't know how to compare {:?} and {:?} yet", v1, v2),
(Val::F32(a), wast::AssertExpression::F32(b)) => f32_matches(*a, b),
(Val::F64(a), wast::AssertExpression::F64(b)) => f64_matches(*a, b),
(Val::V128(a), wast::AssertExpression::V128(b)) => v128_matches(*a, b),
_ => bail!(
"don't know how to compare {:?} and {:?} yet",
actual,
expected
),
})
}
fn f32_matches(actual: u32, expected: &wast::NanPattern<wast::Float32>) -> bool {
match expected {
wast::NanPattern::CanonicalNan => is_canonical_f32_nan(actual),
wast::NanPattern::ArithmeticNan => is_arithmetic_f32_nan(actual),
wast::NanPattern::Value(expected_value) => actual == expected_value.bits,
}
}
fn f64_matches(actual: u64, expected: &wast::NanPattern<wast::Float64>) -> bool {
match expected {
wast::NanPattern::CanonicalNan => is_canonical_f64_nan(actual),
wast::NanPattern::ArithmeticNan => is_arithmetic_f64_nan(actual),
wast::NanPattern::Value(expected_value) => actual == expected_value.bits,
}
}
fn v128_matches(actual: u128, expected: &wast::V128Pattern) -> bool {
match expected {
wast::V128Pattern::I8x16(b) => b
.iter()
.enumerate()
.all(|(i, b)| *b == extract_lane_as_i8(actual, i)),
wast::V128Pattern::I16x8(b) => b
.iter()
.enumerate()
.all(|(i, b)| *b == extract_lane_as_i16(actual, i)),
wast::V128Pattern::I32x4(b) => b
.iter()
.enumerate()
.all(|(i, b)| *b == extract_lane_as_i32(actual, i)),
wast::V128Pattern::I64x2(b) => b
.iter()
.enumerate()
.all(|(i, b)| *b == extract_lane_as_i64(actual, i)),
wast::V128Pattern::F32x4(b) => b.iter().enumerate().all(|(i, b)| {
let a = extract_lane_as_i32(actual, i) as u32;
f32_matches(a, b)
}),
wast::V128Pattern::F64x2(b) => b.iter().enumerate().all(|(i, b)| {
let a = extract_lane_as_i64(actual, i) as u64;
f64_matches(a, b)
}),
}
}