Merge remote-tracking branch 'upstream/master' into jdk-20+15-mmtk-merge

Author: caizixian

.gitignore

@@ -1,10 +1,6 @@
 # will have compiled files and executables
 target/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 

CHANGELOG.md

@@ -1,3 +1,25 @@
+0.14.1 (2022-08-10)
+===
+
+* Fix a bug that MMTk gets initialized even when we are not using MMTk's GC.
+
+0.14.0 (2022-08-08)
+===
+
+* Remove incorrect `MMTkRootScanWorkScope`.
+* Remove unused `compute_*_roots` functions.
+* Optimize `CodeCache` roots scanning.
+* Fix a bug that `mmtk_start_the_world_count` may be incorrect.
+* Update documentation about evaluation builds.
+* Inlucde `Cargo.lock` in the repository.
+* Update to mmtk-core 0.14.0.
+
+0.13.0 (2022-06-27)
+===
+
+* Fixes a bug that may cause programs to hang in stop-the-world synchronization.
+* Updates to mmtk-core 0.13.0.
+
 0.12.0 (2022-05-13)
 ===
 

README.md

@@ -118,6 +118,14 @@ $ make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$PWD/../mmt
 
 The output jdk is at `./build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk`.
 
+**Note:** The above `make` command will build what is known as the [`default` target or "exploded image"](https://github.com/openjdk/jdk11u/blob/master/doc/building.md#Running-make). This build is exclusively meant for developers who want quick and incremental builds to test changes. If you are planning on evaluating your build (be it performance, minimum heap, etc.), then it is *highly advised* to use the `images` target. The `default` target is the (roughly) minimal set of outputs required to run the built JDK and is not guaranteed to run all benchmarks. It may have bloated minimum heap values as well. The `images` target can be built like so:
+
+```console
+$ make CONF=linux-x86_64-normal-server-release THIRD_PARTY_HEAP=$PWD/../mmtk-openjdk/openjdk images
+```
+
+The output jdk is then found at `./build/linux-x86_64-normal-server-release/images/jdk`.
+
 ### Location of Mark-bit
 The location of the mark-bit can be specified by the environment variable
 `MARK_IN_HEADER`. By default, the mark-bit is located on the side (in a side