From c7861fe9f71e5d8ad8c290f1f1e79c0a7818ffd6 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Tue, 10 Dec 2024 01:51:50 +0000 Subject: [PATCH 1/4] Removing WITH_MMTK variable and using MMTK_PLAN only --- .github/scripts/Make.user | 1 - README.md | 8 ++++---- mmtk/Cargo.toml | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/scripts/Make.user b/.github/scripts/Make.user index f815ce1a..9ffb45b5 100644 --- a/.github/scripts/Make.user +++ b/.github/scripts/Make.user @@ -1,3 +1,2 @@ -WITH_MMTK=1 FORCE_ASSERTIONS=1 LLVM_ASSERTIONS=1 \ No newline at end of file diff --git a/README.md b/README.md index e6fc4653..221d727e 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ ``` git clone https://github.com/mmtk/mmtk-julia git clone https://github.com/mmtk/julia -(cd julia && git checkout dev && echo 'WITH_MMTK=1' > Make.user) +(cd julia && git checkout dev && echo 'MMTK_PLAN=Immix' > Make.user) # or MMTK_PLAN=StickyImmix to use Sticky Immix export JULIA_PATH=`pwd`/julia export MMTK_JULIA_DIR=`pwd`/mmtk-julia (cd mmtk-julia/mmtk && cargo build --features immix --release) # or drop "--release" for a debug build -MMTK_PLAN=Immix MMTK_BUILD=release MMTK_JULIA_DIR=`pwd`/mmtk-julia make -C julia # or "MMTK_BUILD=debug" +MMTK_BUILD=release MMTK_JULIA_DIR=`pwd`/mmtk-julia make -C julia # or "MMTK_BUILD=debug" ``` If you would like debugging information in your release build of MMTk, add `debug = true` under `[profile.release]` in `mmtk/Cargo.toml`. @@ -45,7 +45,7 @@ For a release build with debugging information, first add `debug = true` under ` To build Julia with MMTk, first ensure you have the prerequisites for building both [Julia](https://github.com/JuliaLang/julia/blob/master/doc/src/devdocs/build/build.md#required-build-tools-and-external-libraries) and [MMTk](https://github.com/mmtk/mmtk-core#requirements). -Next create a `Make.user` file in the top-level directory of the Julia repository consisting of the line `WITH_MMTK=1`. +Next create a `Make.user` file in the top-level directory of the Julia repository consisting of the line `MMTK_PLAN=Immix` or `MMTK_PLAN=StickyImmix`. Finally, set the following environment variables: @@ -60,7 +60,7 @@ Alternatively you can set the environment variables in your `Make.user` ``` export MMTK_BUILD := release export MMTK_JULIA_DIR := -export MMTK_PLAN := Immix +export MMTK_PLAN := Immix # or export MMTK_PLAN := StickyImmix ``` ### Heap Size diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 80bc6c64..be2b995c 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" # Metadata for the Julia repository [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. -julia_repo = "https://github.com/mmtk/julia.git" -julia_version = "e02662335575ef1dc486631ef348dc3c76787d46" +julia_repo = "https://github.com/udesou/julia.git" +julia_version = "118d962ee2bda4f18060fc6ff726c739acb3fa45" [lib] crate-type = ["cdylib"] From 018d6a23f3bca5dcc049eb8763980b9fb7e16d04 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Tue, 10 Dec 2024 16:03:40 +1100 Subject: [PATCH 2/4] Update Cargo.toml --- mmtk/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index be2b995c..9a5d4120 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" # Metadata for the Julia repository [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. -julia_repo = "https://github.com/udesou/julia.git" -julia_version = "118d962ee2bda4f18060fc6ff726c739acb3fa45" +julia_repo = "https://github.com/mmtk/julia.git" +julia_version = "6253fb93ca2870d68596967f0d97c047c88a583f" [lib] crate-type = ["cdylib"] From 5fa0634eb8f85bfa1fcfe32d4968816d8e8e21c5 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Wed, 11 Dec 2024 12:06:09 +1100 Subject: [PATCH 3/4] Update Cargo.toml --- mmtk/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 9a5d4120..85f850b2 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" # Metadata for the Julia repository [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. -julia_repo = "https://github.com/mmtk/julia.git" -julia_version = "6253fb93ca2870d68596967f0d97c047c88a583f" +julia_repo = "https://github.com/udesou/julia.git" +julia_version = "642cfa71bb11363a465dabd9135194e82aec3f07" [lib] crate-type = ["cdylib"] From 80398ee4dc08feecab57ca73b6f334d0105a1208 Mon Sep 17 00:00:00 2001 From: Eduardo Souza Date: Wed, 11 Dec 2024 15:10:37 +1100 Subject: [PATCH 4/4] Update Cargo.toml --- mmtk/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 85f850b2..fdf54880 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,8 +10,8 @@ edition = "2018" # Metadata for the Julia repository [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. -julia_repo = "https://github.com/udesou/julia.git" -julia_version = "642cfa71bb11363a465dabd9135194e82aec3f07" +julia_repo = "https://github.com/mmtk/julia.git" +julia_version = "32d38fb974b955bc2c610a72617cfc59265fa260" [lib] crate-type = ["cdylib"]