Skip to content

Merge with mmtk/mmtk-openjdk@master #234

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 12 commits into from
Aug 22, 2023
Merged

Merge with mmtk/mmtk-openjdk@master #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
94f50cd
Rename alloc bit to valid object bit (VO bit) (#214)
wks Apr 16, 2023
47a85ed
Fix invalid register values in `arraycopy_epilogue` barrier (#216)
wenyuzhao Apr 20, 2023
b80877c
Remove deprecated const. (#217)
wks Apr 28, 2023
52680f9
Update MMTk core PR #817 (alternative approach) (#220)
wks May 26, 2023
21a3c45
Update to mmtk-core PR #838 (#221)
qinsoon May 29, 2023
54a249e
Rename ambiguous `scan_thread_root{,s}` functions (#222)
k-sareen Jun 7, 2023
b86ed3f
Update to MMTk core PR #875 (#225)
qinsoon Aug 9, 2023
48a8277
Show the version after cd (#227)
wks Aug 11, 2023
511e726
Add features for genimmix and stickyimmix (#228)
qinsoon Aug 15, 2023
91e163a
Pass hotspot command line flags to mmtk-core (#229)
wenyuzhao Aug 18, 2023
129c889
Fix unaligned edge access (#232)
wks Aug 22, 2023
dc6a36d
Merge remote-tracking branch 'origin/master' into jdk-21+24-mmtk-sv39
caizixian Aug 22, 2023
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
2 changes: 1 addition & 1 deletion .github/scripts/ci-test-global-alloc-bit.sh → .github/scripts/ci-test-vo-bit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -xe
unset JAVA_TOOL_OPTIONS

export MMTK_EXTREME_ASSERTIONS=0
export GLOBAL_ALLOC_BIT=1
export VO_BIT=1
. $(dirname "$0")/ci-build.sh

cd $OPENJDK_PATH
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/ci-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ cd $cur
cd $cur
./ci-test-assertions.sh
cd $cur
./ci-test-global-alloc-bit.sh
./ci-test-vo-bit.sh
cd $cur
./ci-test-malloc-mark-sweep.sh
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
run: |
./.github/scripts/ci-build.sh
./.github/scripts/ci-test-only-normal.sh
- name: DaCapo Tests with global allocation bit
run: ./.github/scripts/ci-test-global-alloc-bit.sh
- name: DaCapo Tests with valid object bit (VO bit)
run: ./.github/scripts/ci-test-vo-bit.sh
- name: DaCapo Tests with malloc Mark-Sweep
run: ./.github/scripts/ci-test-malloc-mark-sweep.sh

Expand Down
10 changes: 6 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,14 @@ building OpenJDK, we can change its location to be in the object's header:
$ MARK_IN_HEADER=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
```

### Alloc bit
To support the `global_alloc_bit` feature in mmtk-core, you can set the environment variable `GLOBAL_ALLOC_BIT=1` when
building OpenJDK. This will set the feature for mmtk-core, as well as compiling the fastpath for the alloc bit.
### Valid object bit

To support the `vo_bit` (valid object bit) feature in mmtk-core, you can set the
environment variable `VO_BIT=1` when building OpenJDK. This will set the feature
for mmtk-core, as well as compiling the fastpath for the VO bit.

```console
$ GLOBAL_ALLOC_BIT=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
$ VO_BIT=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
```

## Test
Expand Down
Loading