Skip to content

Commit 776baab

Browse files
authored
Merge with mmtk/mmtk-openjdk@master (#234)
1 parent 522a713 commit 776baab

26 files changed

+470
-228
lines changed

.github/scripts/ci-test-global-alloc-bit.sh renamed to .github/scripts/ci-test-vo-bit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -xe
55
unset JAVA_TOOL_OPTIONS
66

77
export MMTK_EXTREME_ASSERTIONS=0
8-
export GLOBAL_ALLOC_BIT=1
8+
export VO_BIT=1
99
. $(dirname "$0")/ci-build.sh
1010

1111
cd $OPENJDK_PATH

.github/scripts/ci-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ cd $cur
1010
cd $cur
1111
./ci-test-assertions.sh
1212
cd $cur
13-
./ci-test-global-alloc-bit.sh
13+
./ci-test-vo-bit.sh
1414
cd $cur
1515
./ci-test-malloc-mark-sweep.sh

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
run: |
2525
./.github/scripts/ci-build.sh
2626
./.github/scripts/ci-test-only-normal.sh
27-
- name: DaCapo Tests with global allocation bit
28-
run: ./.github/scripts/ci-test-global-alloc-bit.sh
27+
- name: DaCapo Tests with valid object bit (VO bit)
28+
run: ./.github/scripts/ci-test-vo-bit.sh
2929
- name: DaCapo Tests with malloc Mark-Sweep
3030
run: ./.github/scripts/ci-test-malloc-mark-sweep.sh
3131

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,14 @@ building OpenJDK, we can change its location to be in the object's header:
197197
$ MARK_IN_HEADER=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
198198
```
199199

200-
### Alloc bit
201-
To support the `global_alloc_bit` feature in mmtk-core, you can set the environment variable `GLOBAL_ALLOC_BIT=1` when
202-
building OpenJDK. This will set the feature for mmtk-core, as well as compiling the fastpath for the alloc bit.
200+
### Valid object bit
201+
202+
To support the `vo_bit` (valid object bit) feature in mmtk-core, you can set the
203+
environment variable `VO_BIT=1` when building OpenJDK. This will set the feature
204+
for mmtk-core, as well as compiling the fastpath for the VO bit.
203205

204206
```console
205-
$ GLOBAL_ALLOC_BIT=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
207+
$ VO_BIT=1 make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk
206208
```
207209

208210
## Test

0 commit comments

Comments
 (0)