Skip to content

Refactor cache system #292

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

Merged
sunfishcode merged 4 commits into from
Sep 6, 2019
Merged

Refactor cache system #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
661b7bc
Add stubs for constant relocation in RelocSink
abrown Jul 29, 2019
34676cd
Refactor usage of SecondaryMap impls (serde, PartialEq)
mrowqa Aug 22, 2019
3e4c1f0
Refactor: cascade of matches in cache system
mrowqa Aug 22, 2019
aff957e
Trace log access to cache system
mrowqa Aug 22, 2019
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
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ edition = "2018"
default-run = "wasmtime"

[dependencies]
cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
cranelift-native = "0.40.0"
cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
cranelift-codegen = { version = "0.41.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.41.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.41.0", features = ["enable-serde"] }
cranelift-native = "0.41.0"
wasmtime-api = { path = "wasmtime-api" }
wasmtime-debug = { path = "wasmtime-debug" }
wasmtime-environ = { path = "wasmtime-environ" }
Expand Down
2 changes: 1 addition & 1 deletion cranelift-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ topdir=$(dirname "$0")
cd "$topdir"

# All the cranelift-* crates have the same version number
version="0.38.0"
version="0.41.0"

# Update all of the Cargo.toml files.
echo "Updating crate versions to $version"
Expand Down
6 changes: 3 additions & 3 deletions fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ cargo-fuzz = true
[dependencies]
wasmtime-environ = { path = "../wasmtime-environ" }
wasmtime-jit = { path = "../wasmtime-jit" }
cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
cranelift-native = "0.40.0"
cranelift-codegen = { version = "0.41.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.41.0", features = ["enable-serde"] }
cranelift-native = "0.41.0"
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
wasmparser = { version = "0.36.0", default-features = false }
binaryen = "0.5.0"
Expand Down
10 changes: 5 additions & 5 deletions misc/wasmtime-py/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ name = "_wasmtime"
crate-type = ["cdylib"]

[dependencies]
cranelift-codegen = "0.40.0"
cranelift-native = "0.40.0"
cranelift-entity = "0.40.0"
cranelift-wasm = "0.40.0"
cranelift-frontend = "0.40.0"
cranelift-codegen = "0.41.0"
cranelift-native = "0.41.0"
cranelift-entity = "0.41.0"
cranelift-wasm = "0.41.0"
cranelift-frontend = "0.41.0"
wasmtime-environ = { path = "../../wasmtime-environ" }
wasmtime-interface-types = { path = "../../wasmtime-interface-types" }
wasmtime-jit = { path = "../../wasmtime-jit" }
Expand Down
8 changes: 8 additions & 0 deletions misc/wasmtime-py/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ impl binemit::RelocSink for RelocSink {
) {
panic!("trampoline compilation should not produce external symbol relocs");
}
fn reloc_constant(
&mut self,
_code_offset: binemit::CodeOffset,
_reloc: binemit::Reloc,
_constant_offset: ir::ConstantOffset,
) {
panic!("trampoline compilation should not produce constant relocs");
}
fn reloc_jt(
&mut self,
_offset: binemit::CodeOffset,
Expand Down
4 changes: 2 additions & 2 deletions misc/wasmtime-rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ test = false
doctest = false

[dependencies]
cranelift-codegen = "0.40.0"
cranelift-native = "0.40.0"
cranelift-codegen = "0.41.0"
cranelift-native = "0.41.0"
failure = "0.1.5"
wasmtime-interface-types = { path = "../../wasmtime-interface-types" }
wasmtime-jit = { path = "../../wasmtime-jit" }
Expand Down
10 changes: 5 additions & 5 deletions wasmtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ name = "wasmtime_api"
crate-type = ["lib", "staticlib", "cdylib"]

[dependencies]
cranelift-codegen = "0.40.0"
cranelift-native = "0.40.0"
cranelift-entity = "0.40.0"
cranelift-wasm = "0.40.0"
cranelift-frontend = "0.40.0"
cranelift-codegen = { version = "0.41.0", features = ["enable-serde"] }
cranelift-native = "0.41.0"
cranelift-entity = { version = "0.41.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.41.0", features = ["enable-serde"] }
cranelift-frontend = "0.41.0"
wasmtime-runtime = { path="../wasmtime-runtime" }
wasmtime-environ = { path="../wasmtime-environ" }
wasmtime-jit = { path="../wasmtime-jit" }
Expand Down
8 changes: 8 additions & 0 deletions wasmtime-api/src/trampoline/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,14 @@ impl binemit::RelocSink for RelocSink {
) {
panic!("trampoline compilation should not produce external symbol relocs");
}
fn reloc_constant(
&mut self,
_code_offset: binemit::CodeOffset,
_reloc: binemit::Reloc,
_constant_offset: ir::ConstantOffset,
) {
panic!("trampoline compilation should not produce constant relocs");
}
fn reloc_jt(
&mut self,
_offset: binemit::CodeOffset,
Expand Down
6 changes: 3 additions & 3 deletions wasmtime-debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ edition = "2018"
[dependencies]
gimli = "0.19.0"
wasmparser = { version = "0.36.0" }
cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
cranelift-codegen = { version = "0.41.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.41.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.41.0", features = ["enable-serde"] }
faerie = "0.10.1"
wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
target-lexicon = { version = "0.4.0", default-features = false }
Expand Down
7 changes: 4 additions & 3 deletions wasmtime-environ/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ readme = "README.md"
edition = "2018"

[dependencies]
cranelift-codegen = { version = "0.40.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.40.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.40.0", features = ["enable-serde"] }
cranelift-codegen = { version = "0.41.0", features = ["enable-serde"] }
cranelift-entity = { version = "0.41.0", features = ["enable-serde"] }
cranelift-wasm = { version = "0.41.0", features = ["enable-serde"] }
lightbeam = { path = "../lightbeam", optional = true }
failure = { version = "0.1.3", default-features = false }
failure_derive = { version = "0.1.3", default-features = false }
Expand All @@ -35,6 +35,7 @@ tempfile = "3"
target-lexicon = { version = "0.4.0", default-features = false }
pretty_env_logger = "0.3.0"
rand = { version = "0.7.0", features = ["small_rng"] }
cranelift-codegen = { version = "0.41.0", features = ["enable-serde", "all-arch"] }

[features]
default = ["std"]
Expand Down
Loading