Skip to content

Commit b4ca3aa

Browse files
qinsoonmmtkgc-bot
andauthored
Expose test scripts for minimal/extended tests for mmtk-core (#266)
This PR removes unused workflow_dispatch for mmtk-core (see mmtk/mmtk-core#983), and adds a script to run minimal openjdk tests. --------- Co-authored-by: mmtkgc-bot <[email protected]>
1 parent 54f6688 commit b4ca3aa

File tree

6 files changed

+42
-160
lines changed

6 files changed

+42
-160
lines changed

.github/scripts/ci-test.sh renamed to .github/scripts/ci-test-extended.sh

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,16 @@ $cur/ci-test-only-normal-no-compressed-oops.sh
2222
$cur/ci-test-only-weak-ref.sh
2323

2424
# Build with extreme assertions
25-
export MMTK_EXTREME_ASSERTIONS=1
26-
$cur/ci-build.sh
25+
MMTK_EXTREME_ASSERTIONS=1 $cur/ci-build.sh
2726
$cur/ci-test-assertions.sh
28-
unset MMTK_EXTREME_ASSERTIONS
2927

3028
# Build with vo bit
31-
export MMTK_VO_BIT=1
32-
$cur/ci-build.sh
29+
MMTK_VO_BIT=1 $cur/ci-build.sh
3330
$cur/ci-test-vo-bit.sh
34-
unset MMTK_VO_BIT=1
3531

3632
# Build with malloc mark sweep
37-
export MMTK_EXTREME_ASSERTIONS=1
38-
export MMTK_MALLOC_MARK_SWEEP=1
39-
$cur/ci-build.sh
33+
MMTK_EXTREME_ASSERTIONS=1 MMTK_MALLOC_MARK_SWEEP=1 $cur/ci-build.sh
4034
$cur/ci-test-malloc-mark-sweep.sh
41-
unset MMTK_EXTREME_ASSERTIONS
42-
unset MMTK_MALLOC_MARK_SWEEP
4335

4436
# Build with mark in header - comment this out as it takes too long.
4537
# export MMTK_MARK_IN_HEADER=1

.github/scripts/ci-test-minimal.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
set -ex
2+
3+
. $(dirname "$0")/common.sh
4+
cur=$BINDING_PATH/.github/scripts
5+
6+
# This script is only used by MMTk core.
7+
# OPENJDK_PATH is the default path set in ci-checkout.sh
8+
export OPENJDK_PATH=$BINDING_PATH/repos/openjdk
9+
export DEBUG_LEVEL=fastdebug
10+
export TEST_JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
11+
12+
# Download dacapo
13+
export DACAPO_PATH=$BINDING_PATH/dacapo
14+
mkdir -p $DACAPO_PATH
15+
wget https://downloads.sourceforge.net/project/dacapobench/archive/2006-10-MR2/dacapo-2006-10-MR2.jar -O $DACAPO_PATH/dacapo-2006-10-MR2.jar
16+
17+
# Normal build
18+
$cur/ci-build.sh
19+
# Test
20+
MMTK_PLAN=SemiSpace runbms_dacapo2006_with_heap_multiplier fop 4
21+
MMTK_PLAN=Immix runbms_dacapo2006_with_heap_multiplier fop 4
22+
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4
23+
MMTK_PLAN=StickyImmix runbms_dacapo2006_with_heap_multiplier fop 4
24+
MMTK_PLAN=GenCopy runbms_dacapo2006_with_heap_multiplier fop 4
25+
MMTK_PLAN=MarkCompact runbms_dacapo2006_with_heap_multiplier fop 4
26+
MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8
27+
MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000
28+
# Test heap resizing
29+
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_size fop 20 100
30+
# Test no compressed oop
31+
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers
32+
33+
# Build with vo bit
34+
MMTK_VO_BIT=1 $cur/ci-build.sh
35+
# Test
36+
MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4

.github/workflows/test-core-extended.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.github/workflows/test-core-minimal.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

mmtk/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ memoffset = "0.9.0"
3232
# - change branch
3333
# - change repo name
3434
# But other changes including adding/removing whitespaces in commented lines may break the CI.
35-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ef2bd6d043d8675badaa415db89be7b52439725f" }
35+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de454f5b5ad9825e5dd0105e0bdc4ce05895a72a" }
3636
# Uncomment the following to build locally
3737
# mmtk = { path = "../repos/mmtk-core" }
3838

0 commit comments

Comments
 (0)