Merge the jdk-21+35-mmtk branch into master #307
Draft
Conversation
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
Wenyu says we don't do class unloading. This is fine.
Signed-off-by: ArberSephirotheca <[email protected]>
OpenJDK no longer reserves 4 words for every frame, but instead let each GC barrier set decide the reserved size. We reserve 3 words for MMTk's C1 barrier set. See: openjdk/jdk@36a0822
This reverts commit 6086363.
This follows the upstream change
This changes paths build options, etc., to make the CI scripts work with OpenJDK 21. We now use a single source of truth for the OpenJDK path instead of defining OPENJDK_PATH in multiple scripts.
Use jdk21 workarounds for Cassandra and H2O
Point to the newer version of dacapo
We just use the name defined in running-ng, i.e. "dacapochopin". This allows us to use modifiers such as "dacapochopin_jdk21" which expects the benchmark suite name "dacapochopin".
Also fixed ci-style.sh and ci-check-lineends.sh to fail if any file has line-end problems.
Update contents for OpenJDK 21 and recent changes in mmtk-openjdk.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We merge the branch for OpenJDK 21 into
master. From now on, themasterbranch of themmtk-openjdkrepository will directly target OpenJDK 21. Thejdk-21+35-mmtkbranch will be decommissioned, and will remain its current state (i.e. the state just before merging intomaster), and will only be looked up when any developers are interested in the history of the development of the OpenJDK binding.The following things work:
mmtk-openjdkbinding work.mmtk-corerepo work.One important thing that doesn't work immediately is the performance regression CI. It requires a change in the
ci-perf-kitrepo and also needs related changes in the CI scripts inmmtk-core. This PR is for OpenJDK, and will not trigger the performance regression CI. This leaves us a small window to updatemmtk-coreandci-perf-kitafter this PR is merged.This PR should not be merged with "squash merge". Instead we should make a proper merge commit so that the
jdk-21+35-mmtkbranch will be considered as an ancestor of themasterbranch from Git's point of view. GitHub will also consider the branchjdk-21+35-mmtkas "merged".Major changes compared to the OpenJDK 11 binding
The OpenJDK repository is now https://github.com/mmtk/jdk. We made this change to align with the naming convention of the repositories of the upstream. The old repository https://github.com/mmtk/openjdk will be decommissioned.
We also made the following changes in the mmtk-openjdk repo:
jdkdirectory instead ofopenjdk, and remove the-normalpart from the OpenJDK CONF string. We also slightly refactored the CI scripts to reduce the repetition of the path "repos/jdk" which used to be "repos/openjdk".