Refactor CI test scripts #263
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,9 @@ set -ex | |
| OPENJDK_URL=`cargo read-manifest --manifest-path=$BINDING_PATH/mmtk/Cargo.toml | python3 -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["openjdk"]["openjdk_repo"])'` | ||
| OPENJDK_VERSION=`cargo read-manifest --manifest-path=$BINDING_PATH/mmtk/Cargo.toml | python3 -c 'import json,sys; print(json.load(sys.stdin)["metadata"]["openjdk"]["openjdk_version"])'` | ||
|
|
||
| # Use default openjdk path if it is not set (this is only need when MMTk core calls the script) | ||
| OPENJDK_PATH=${OPENJDK_PATH:="$BINDING_PATH/repos/openjdk"} | ||
|
|
||
| rm -rf $OPENJDK_PATH | ||
| git clone $OPENJDK_URL $OPENJDK_PATH | ||
| git -C $OPENJDK_PATH checkout $OPENJDK_VERSION | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,10 @@ rustup component add clippy --toolchain $RUSTUP_TOOLCHAIN | |
| rustup component add rustfmt --toolchain $RUSTUP_TOOLCHAIN | ||
| rustup override set $RUSTUP_TOOLCHAIN | ||
|
|
||
| # Install running | ||
| pip3 install running-ng | ||
|
|
||
| # Install dependencies | ||
| sudo apt-get update -y | ||
| sudo apt-get install dos2unix | ||
| sudo apt-get install build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libcups2-dev libasound2-dev libxrandr-dev | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,57 +4,53 @@ set -xe | |
|
|
||
| unset JAVA_TOOL_OPTIONS | ||
|
|
||
| run_subset() { | ||
| heap_multiplier=$1 | ||
|
|
||
| runbms_dacapo2006_with_heap_multiplier fop $heap_multiplier | ||
| runbms_dacapo2006_with_heap_multiplier luindex $heap_multiplier | ||
| } | ||
|
|
||
| # -- SemiSpace -- | ||
| export MMTK_PLAN=SemiSpace | ||
|
Collaborator
There was a problem hiding this comment. I thought the idea was to move away from using environment variables since OpenJDK has support for passing MMTk options |
||
|
|
||
| run_subset 4 | ||
|
|
||
| # --- Immix --- | ||
| export MMTK_PLAN=Immix | ||
|
|
||
| run_subset 4 | ||
|
|
||
| # --- GenImmix --- | ||
| export MMTK_PLAN=GenImmix | ||
|
|
||
| run_subset 4 | ||
|
|
||
| # --- StickyImmix --- | ||
| export MMTK_PLAN=StickyImmix | ||
|
|
||
| run_subset 4 | ||
|
|
||
| # -- GenCopy -- | ||
| export MMTK_PLAN=GenCopy | ||
|
|
||
| run_subset 4 | ||
|
|
||
| # -- NoGC -- | ||
| export MMTK_PLAN=NoGC | ||
|
|
||
| runbms_dacapo2006_with_heap_size fop 1000 1000 | ||
| runbms_dacapo2006_with_heap_size luindex 1000 1000 | ||
|
|
||
| # --- MarkSweep --- | ||
| export MMTK_PLAN=MarkSweep | ||
|
|
||
| run_subset 8 | ||
|
|
||
| # -- PageProtect -- | ||
| sudo sysctl -w vm.max_map_count=655300 | ||
| export MMTK_PLAN=PageProtect | ||
|
|
||
| # Note: Disable compressed pointers as it does not work well with GC plans that uses virtual memory excessively. | ||
| runbms_dacapo2006_with_heap_size fop 4000 4000 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers | ||
| runbms_dacapo2006_with_heap_size luindex 4000 4000 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,25 +2,11 @@ set -xe | |
|
|
||
| . $(dirname "$0")/common.sh | ||
|
|
||
| run_test() { | ||
| export MMTK_PLAN=MarkSweep | ||
|
|
||
| # Malloc marksweep is horribly slow. We just run fop. | ||
| runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers | ||
|
|
||
| unset MMTK_PLAN | ||
| } | ||
|
|
@@ -29,17 +15,4 @@ unset JAVA_TOOL_OPTIONS | |
| unset MMTK_PLAN | ||
|
|
||
| # --- Normal test --- | ||
| run_test | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| set -xe | ||
|
|
||
| . $(dirname "$0")/common.sh | ||
|
|
||
| unset JAVA_TOOL_OPTIONS | ||
|
|
||
| run_subset() { | ||
| heap_multiplier=$1 | ||
|
|
||
| runbms_dacapo2006_with_heap_multiplier antlr $heap_multiplier | ||
| runbms_dacapo2006_with_heap_multiplier fop $heap_multiplier | ||
| runbms_dacapo2006_with_heap_multiplier luindex $heap_multiplier | ||
| } | ||
|
|
||
| # --- Immix --- | ||
| # export MMTK_PLAN=Immix | ||
| # run_subset 4 | ||
|
|
||
| # --- GenImmix --- | ||
| # export MMTK_PLAN=GenImmix | ||
| # run_subset 4 | ||
|
|
||
| # --- StickyImmix --- | ||
| # export MMTK_PLAN=StickyImmix | ||
| # run_subset 4 | ||
|
|
||
| # --- MarkSweep --- | ||
| export MMTK_PLAN=MarkSweep | ||
|
|
||
| run_subset 8 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This variable is unused