Skip to content

Expose test scripts for minimal/extended tests for mmtk-core #266

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
merged 7 commits into from
Jan 25, 2024
Merged

Expose test scripts for minimal/extended tests for mmtk-core #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45cff6a
Start a PR
qinsoon Jan 18, 2024
0fc3637
Add a script for minimal tests
qinsoon Jan 19, 2024
373f691
unset MMTK_PLAN
qinsoon Jan 19, 2024
80cd417
Remove unused workflows
qinsoon Jan 19, 2024
d1afb3c
No need to export MMTK_PLAN
qinsoon Jan 19, 2024
54fbff8
No need to export env var for building
qinsoon Jan 20, 2024
47a45f8
Update mmtk-core to de454f5b5ad9825e5dd0105e0bdc4ce05895a72a
mmtkgc-bot Jan 25, 2024
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
14 changes: 3 additions & 11 deletions .github/scripts/ci-test.sh → .github/scripts/ci-test-extended.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,16 @@ $cur/ci-test-only-normal-no-compressed-oops.sh
$cur/ci-test-only-weak-ref.sh

# Build with extreme assertions
export MMTK_EXTREME_ASSERTIONS=1
$cur/ci-build.sh
MMTK_EXTREME_ASSERTIONS=1 $cur/ci-build.sh
$cur/ci-test-assertions.sh
unset MMTK_EXTREME_ASSERTIONS

# Build with vo bit
export MMTK_VO_BIT=1
$cur/ci-build.sh
MMTK_VO_BIT=1 $cur/ci-build.sh
$cur/ci-test-vo-bit.sh
unset MMTK_VO_BIT=1

# Build with malloc mark sweep
export MMTK_EXTREME_ASSERTIONS=1
export MMTK_MALLOC_MARK_SWEEP=1
$cur/ci-build.sh
MMTK_EXTREME_ASSERTIONS=1 MMTK_MALLOC_MARK_SWEEP=1 $cur/ci-build.sh
$cur/ci-test-malloc-mark-sweep.sh
unset MMTK_EXTREME_ASSERTIONS
unset MMTK_MALLOC_MARK_SWEEP

# Build with mark in header - comment this out as it takes too long.
# export MMTK_MARK_IN_HEADER=1
Expand Down
36 changes: 36 additions & 0 deletions .github/scripts/ci-test-minimal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
set -ex

. $(dirname "$0")/common.sh
cur=$BINDING_PATH/.github/scripts

# This script is only used by MMTk core.
# OPENJDK_PATH is the default path set in ci-checkout.sh
export OPENJDK_PATH=$BINDING_PATH/repos/openjdk
export DEBUG_LEVEL=fastdebug
export TEST_JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java

# Download dacapo
export DACAPO_PATH=$BINDING_PATH/dacapo
mkdir -p $DACAPO_PATH
wget https://downloads.sourceforge.net/project/dacapobench/archive/2006-10-MR2/dacapo-2006-10-MR2.jar -O $DACAPO_PATH/dacapo-2006-10-MR2.jar

# Normal build
$cur/ci-build.sh
# Test
MMTK_PLAN=SemiSpace runbms_dacapo2006_with_heap_multiplier fop 4
MMTK_PLAN=Immix runbms_dacapo2006_with_heap_multiplier fop 4
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
MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8
MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000
# Test heap resizing
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_size fop 20 100
# Test no compressed oop
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers

# Build with vo bit
MMTK_VO_BIT=1 $cur/ci-build.sh
# Test
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4
72 changes: 0 additions & 72 deletions .github/workflows/test-core-extended.yml
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions .github/workflows/test-core-minimal.yml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mmtk/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ memoffset = "0.9.0"
# - 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 = "ef2bd6d043d8675badaa415db89be7b52439725f" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de454f5b5ad9825e5dd0105e0bdc4ce05895a72a" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }

Expand Down