From 06f357ba4b299c2953f19d99155f0e97e6a227a5 Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Fri, 29 Aug 2025 03:56:40 +0000 Subject: [PATCH 1/3] Enable compressed pointers for Compressor --- .github/configs/base.yml | 4 +--- .github/scripts/ci-test-minimal.sh | 4 +--- .github/scripts/ci-test-vo-bit.sh | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/configs/base.yml b/.github/configs/base.yml index 505202f5..133216fe 100644 --- a/.github/configs/base.yml +++ b/.github/configs/base.yml @@ -99,9 +99,7 @@ configs: - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-StickyImmix" - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkSweep" - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkCompact" - # TODO: We need to disable compressed oops for Compressor temporarily until it supports - # discontiguous spaces. - - "jdk11-master|ms|s|fail_on_oom|tph|preserve|no_compressed_oops|mmtk_gc-Compressor" + - "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-Compressor" benchmarks: dacapo-23.9-RC3-chopin-ci: diff --git a/.github/scripts/ci-test-minimal.sh b/.github/scripts/ci-test-minimal.sh index f0a74ad9..ee224324 100755 --- a/.github/scripts/ci-test-minimal.sh +++ b/.github/scripts/ci-test-minimal.sh @@ -23,9 +23,7 @@ MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4 MMTK_PLAN=StickyImmix runbms_dacapo2006_with_heap_multiplier fop 4 MMTK_PLAN=GenCopy runbms_dacapo2006_with_heap_multiplier fop 4 MMTK_PLAN=MarkCompact runbms_dacapo2006_with_heap_multiplier fop 4 -# TODO: Need to temporarily disable compressed oops for the Compressor until it supports -# discontiguous spaces. -MMTK_PLAN=Compressor runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers +MMTK_PLAN=Compressor runbms_dacapo2006_with_heap_multiplier fop 4 MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8 MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000 # Test heap resizing diff --git a/.github/scripts/ci-test-vo-bit.sh b/.github/scripts/ci-test-vo-bit.sh index 01f98c8e..1d7e3fce 100755 --- a/.github/scripts/ci-test-vo-bit.sh +++ b/.github/scripts/ci-test-vo-bit.sh @@ -46,9 +46,7 @@ run_subset 8 # --- Compressor --- export MMTK_PLAN=Compressor -# TODO: Need to temporarily disable compressed oops for the Compressor until it -# supports discontiguous spaces. -run_subset 4 "-XX:-UseCompressedOops -XX:-UseCompressedClassPointers" +run_subset 4 # --- NoGC --- From 50a16e9135ca99e45b70499a05a65ea6d35e210e Mon Sep 17 00:00:00 2001 From: Kunal Sareen Date: Fri, 29 Aug 2025 03:59:59 +0000 Subject: [PATCH 2/3] Point MMTk to Compressor PR --- mmtk/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 6a33a938..8bb7c98b 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 = "7d798ad8a71aa6df80f58f5e565e4f9274d06871" } +mmtk = { git = "https://github.com/no-defun-allowed/mmtk-core.git", rev = "87e2fe38a958bfb3cda39146d40ba9d10336022c" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } From 15dacdd9801858df7ac5f624a522574ec4542bae Mon Sep 17 00:00:00 2001 From: Yi Lin Date: Mon, 8 Sep 2025 03:59:50 +0000 Subject: [PATCH 3/3] Update mmtk-core --- mmtk/Cargo.lock | 5 +++-- mmtk/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index c74bc311..f8edebcc 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.31.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=7d798ad8a71aa6df80f58f5e565e4f9274d06871#7d798ad8a71aa6df80f58f5e565e4f9274d06871" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=a061e0519bee0b7fb3b8d768f37885537654486e#a061e0519bee0b7fb3b8d768f37885537654486e" dependencies = [ "atomic", "atomic-traits", @@ -485,6 +485,7 @@ dependencies = [ "num_cpus", "portable-atomic", "probe", + "rayon-core", "regex", "rustversion", "spin", @@ -497,7 +498,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.31.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=7d798ad8a71aa6df80f58f5e565e4f9274d06871#7d798ad8a71aa6df80f58f5e565e4f9274d06871" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=a061e0519bee0b7fb3b8d768f37885537654486e#a061e0519bee0b7fb3b8d768f37885537654486e" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 8bb7c98b..c0983082 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/no-defun-allowed/mmtk-core.git", rev = "87e2fe38a958bfb3cda39146d40ba9d10336022c" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a061e0519bee0b7fb3b8d768f37885537654486e" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" }