From b6fcbc67fb0a009b6151f6d04e7f35d29d37532e Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 18 Mar 2025 03:56:08 +0000 Subject: [PATCH 1/7] Use buffer size exported from MMTk core --- mmtk/src/scanning.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index 528b940d..c150d41d 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -12,7 +12,7 @@ use mmtk::MutatorContext; pub struct VMScanning {} -pub(crate) const WORK_PACKET_CAPACITY: usize = 4096; +pub(crate) const WORK_PACKET_CAPACITY: usize = mmtk::util::constants::BUFFER_SIZE; extern "C" fn report_slots_and_renew_buffer>( ptr: *mut Address, From 02b5b14978cb52e25fd289aedf5cc19c4ef82a4f Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 10:48:29 +1100 Subject: [PATCH 2/7] Use updated location of constant --- mmtk/src/scanning.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index c150d41d..1bcd8ad5 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -12,7 +12,7 @@ use mmtk::MutatorContext; pub struct VMScanning {} -pub(crate) const WORK_PACKET_CAPACITY: usize = mmtk::util::constants::BUFFER_SIZE; +pub(crate) const WORK_PACKET_CAPACITY: usize = mmtk::scheduler::gc_work::EDGES_WORK_BUFFER_SIZE; extern "C" fn report_slots_and_renew_buffer>( ptr: *mut Address, From 09730ddcbbc926b3c8a8dd0fd618cb09fedf1b2c Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 11:09:25 +1100 Subject: [PATCH 3/7] Update Cargo.toml --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index aaba99ed..88d7082c 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -35,7 +35,7 @@ probe = "0.5" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "0b3ec9b8f95b9c535419f570be02851578cdda98" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } From fd74d5b3377aca1da1f1cd7017d87f89849e3086 Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 11:13:11 +1100 Subject: [PATCH 4/7] Update Cargo.toml --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 88d7082c..616e51ff 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -40,7 +40,7 @@ mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "0b3ec9b8f95b9c535 # mmtk = { path = "../repos/mmtk-core" } [build-dependencies] -built = { version = "0.7.1", features = ["git2"] } +built = { version = "0.7.7", features = ["git2"] } [features] default = [] From b05b8b6b25316db10676a0a48245aa7c92be7456 Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 15:34:09 +1100 Subject: [PATCH 5/7] Update Cargo.toml --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 616e51ff..bc1a52a2 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -35,7 +35,7 @@ probe = "0.5" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "0b3ec9b8f95b9c535419f570be02851578cdda98" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f67a0d2fc0bf3d18d34348949dff969d4d202bbc" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } From fb9a1b37ae70a60586b660d3d0196034764a1cd5 Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 15:41:05 +1100 Subject: [PATCH 6/7] Update scanning.rs --- mmtk/src/scanning.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index 1bcd8ad5..3b0c4aac 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -12,7 +12,7 @@ use mmtk::MutatorContext; pub struct VMScanning {} -pub(crate) const WORK_PACKET_CAPACITY: usize = mmtk::scheduler::gc_work::EDGES_WORK_BUFFER_SIZE; +pub(crate) const WORK_PACKET_CAPACITY: usize = mmtk::scheduler::EDGES_WORK_BUFFER_SIZE; extern "C" fn report_slots_and_renew_buffer>( ptr: *mut Address, From 1a894efdb5a4e9fa0932a7231710ddd5c20f624a Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Tue, 25 Mar 2025 16:22:19 +1100 Subject: [PATCH 7/7] Update Cargo.toml --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index bc1a52a2..f98af1dc 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -2,7 +2,7 @@ name = "mmtk_openjdk" version = "0.30.0" authors = [" <>"] -rust-version = "1.73.0" +rust-version = "1.74.1" build = "build.rs" edition = "2021"