From 2fd5e3a5b41ddbbe02e316beb949bd01727cf41d Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Fri, 10 Feb 2023 14:10:02 +0800 Subject: [PATCH 1/4] Update dependencies. --- Cargo.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 833d0a45fa..28937e2ea5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,19 +23,19 @@ doctest = false mmtk-macros = { version = "0.16.0", path = "macros/" } libc = "0.2" -jemalloc-sys = { version = "0.3.2", features = ["disable_initial_exec_tls"], optional = true } +jemalloc-sys = { version = "0.5.3", features = ["disable_initial_exec_tls"], optional = true } mimalloc-sys = { version = "0.1.6", optional = true } lazy_static = "1.1" log = { version = "0.4", features = ["max_level_trace", "release_max_level_off"] } crossbeam = "0.8.1" num_cpus = "1.8" -enum-map = "=2.1" +enum-map = "2.4.2" downcast-rs = "1.1.1" -atomic-traits = "0.2.0" +atomic-traits = "0.3.0" atomic = "0.5.1" num-traits = "0.2" -spin = "0.5.2" -env_logger = "0.8.2" +spin = "0.9.5" +env_logger = "0.10.0" pfm = { version = "0.1.0-beta.1", optional = true } atomic_refcell = "0.1.7" strum = "0.24" @@ -46,11 +46,11 @@ sys-info = "0.9" regex = "1.7.0" [dev-dependencies] -rand = "0.7.3" +rand = "0.8.5" paste = "1.0.8" [build-dependencies] -built = { version = "0.5.1", features = ["git2"] } +built = { version = "0.6.0", features = ["git2"] } [features] default = [] From 174e7c77c46efdd1b7f18424c77de4a54a7a5c0d Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Fri, 10 Feb 2023 14:25:38 +0800 Subject: [PATCH 2/4] Update rust-version in Cargo.toml enum-map-derive requires 1.61 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 28937e2ea5..d70a04e967 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/mmtk/mmtk-core" readme = "README.md" categories = ["memory-management"] keywords = ["gc", "garbage", "collection", "garbage-collection", "allocation"] -rust-version = "1.57.0" +rust-version = "1.61.0" build = "build.rs" [lib] From 784d2349594ddc726eabe75bfd5a2040809040dc Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Fri, 17 Feb 2023 01:58:46 +0000 Subject: [PATCH 3/4] Test bindings with the Rust version in mmtk-core. --- .github/workflows/post-review-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/post-review-ci.yml b/.github/workflows/post-review-ci.yml index 5ce6787aa4..c47c0659e2 100644 --- a/.github/workflows/post-review-ci.yml +++ b/.github/workflows/post-review-ci.yml @@ -39,6 +39,7 @@ jobs: rm -rf mmtk-v8/repos/* mkdir -p mmtk-v8/repos/mmtk-core cp -r mmtk-core/* mmtk-v8/repos/mmtk-core + cp mmtk-core/rust-toolchain mmtk-v8/mmtk - name: Setup run: | cd mmtk-v8 @@ -76,7 +77,9 @@ jobs: sed -i 's/^mmtk[[:space:]]=/#ci:mmtk=/g' mmtk/Cargo.toml sed -i 's/^#[[:space:]]mmtk/mmtk/g' mmtk/Cargo.toml - name: Overwrite MMTk core in openjdk binding - run: cp -r mmtk-core mmtk-openjdk/repos/ + run: | + cp -r mmtk-core mmtk-openjdk/repos/ + cp mmtk-core/rust-toolchain mmtk-openjdk/mmtk - name: Test run: | cd mmtk-openjdk @@ -109,6 +112,7 @@ jobs: - name: Overwrite MMTk core in JikesRVM binding run: | cp -r mmtk-core mmtk-jikesrvm/repos + cp mmtk-core/rust-toolchain mmtk-jikesrvm/mmtk - name: Test run: | cd mmtk-jikesrvm @@ -142,6 +146,7 @@ jobs: run: | mkdir -p mmtk-julia/repos/mmtk-core cp -r mmtk-core/* mmtk-julia/repos/mmtk-core + cp mmtk-core/rust-toolchain mmtk-julia/mmtk - name: debug run: | ls mmtk-julia From 51f091ea9403d5117d84fc7eb3caa1c8712baa93 Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Fri, 17 Feb 2023 02:14:14 +0000 Subject: [PATCH 4/4] Copy the toolchain version before bindings' setup --- .github/workflows/post-review-ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/post-review-ci.yml b/.github/workflows/post-review-ci.yml index c47c0659e2..fca0340b82 100644 --- a/.github/workflows/post-review-ci.yml +++ b/.github/workflows/post-review-ci.yml @@ -34,12 +34,14 @@ jobs: repository: ${{ needs.binding-refs.outputs.v8_binding_repo }} path: mmtk-v8 ref: ${{ needs.binding-refs.outputs.v8_binding_ref }} + - name: Use mmtk-core Rust toolchain for bindings + run: | + cp mmtk-core/rust-toolchain mmtk-v8/mmtk - name: Overwrite MMTk core in V8 binding run: | rm -rf mmtk-v8/repos/* mkdir -p mmtk-v8/repos/mmtk-core cp -r mmtk-core/* mmtk-v8/repos/mmtk-core - cp mmtk-core/rust-toolchain mmtk-v8/mmtk - name: Setup run: | cd mmtk-v8 @@ -69,6 +71,9 @@ jobs: repository: ${{ needs.binding-refs.outputs.openjdk_binding_repo }} path: mmtk-openjdk ref: ${{ needs.binding-refs.outputs.openjdk_binding_ref }} + - name: Use mmtk-core Rust toolchain for bindings + run: | + cp mmtk-core/rust-toolchain mmtk-openjdk/mmtk - name: Setup run: | cd mmtk-openjdk @@ -79,7 +84,6 @@ jobs: - name: Overwrite MMTk core in openjdk binding run: | cp -r mmtk-core mmtk-openjdk/repos/ - cp mmtk-core/rust-toolchain mmtk-openjdk/mmtk - name: Test run: | cd mmtk-openjdk @@ -102,6 +106,9 @@ jobs: repository: ${{ needs.binding-refs.outputs.jikesrvm_binding_repo }} path: mmtk-jikesrvm ref: ${{ needs.binding-refs.outputs.jikesrvm_binding_ref }} + - name: Use mmtk-core Rust toolchain for bindings + run: | + cp mmtk-core/rust-toolchain mmtk-jikesrvm/mmtk - name: Setup run: | cd mmtk-jikesrvm @@ -112,7 +119,6 @@ jobs: - name: Overwrite MMTk core in JikesRVM binding run: | cp -r mmtk-core mmtk-jikesrvm/repos - cp mmtk-core/rust-toolchain mmtk-jikesrvm/mmtk - name: Test run: | cd mmtk-jikesrvm @@ -135,6 +141,9 @@ jobs: repository: ${{ needs.binding-refs.outputs.julia_binding_repo }} path: mmtk-julia ref: ${{ needs.binding-refs.outputs.julia_binding_ref }} + - name: Use mmtk-core Rust toolchain for bindings + run: | + cp mmtk-core/rust-toolchain mmtk-julia/mmtk - name: Setup run: | cd mmtk-julia @@ -146,7 +155,6 @@ jobs: run: | mkdir -p mmtk-julia/repos/mmtk-core cp -r mmtk-core/* mmtk-julia/repos/mmtk-core - cp mmtk-core/rust-toolchain mmtk-julia/mmtk - name: debug run: | ls mmtk-julia