Merge with master.

Author: christianhaeubl

.github/workflows/micronaut.yml

@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+name: Nightly Micronaut Tests
+
+on:
+  push:
+    paths:
+      - '.github/workflows/micronaut.yml'
+  pull_request:
+    paths:
+      - '.github/workflows/micronaut.yml'
+  schedule:
+  - cron: '0 2 * * *'
+  workflow_dispatch:
+
+env:
+  GRAALVM_HOME: ${{ github.workspace }}/graalvm
+  JAVA_HOME: ${{ github.workspace }}/labsjdk
+  LANG: en_US.UTF-8
+  MICRONAUT_CORE_PATH: ${{ github.workspace }}/micronaut-core
+  MICRONAUT_JDK_VERSION: 21
+  MX_GIT_CACHE: refcache
+  MX_PATH: ${{ github.workspace }}/mx
+  MX_PYTHON: python3.8
+  # Enforce experimental option checking in CI (GR-47922)
+  NATIVE_IMAGE_EXPERIMENTAL_OPTIONS_ARE_FATAL: "true"
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  build-graalvm-and-micronaut:
+    name: Native Tests
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Checkout oracle/graal
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Determine mx version
+      run: echo "MX_VERSION=$(jq -r '.mx_version' common.json)" >> ${GITHUB_ENV}
+    - name: Checkout graalvm/mx
+      uses: actions/checkout@v4
+      with:
+        repository: graalvm/mx
+        fetch-depth: 1
+        ref: ${{ env.MX_VERSION }}
+        path: ${{ env.MX_PATH }}
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.8'
+    - name: Update mx cache
+      uses: actions/cache@v3
+      with:
+        path: ~/.mx
+        key: ${{ runner.os }}-mx-${{ hashFiles('**/suite.py') }}
+        restore-keys: ${{ runner.os }}-mx-
+    - name: Fetch LabsJDK
+      run: |
+        mkdir jdk-dl
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-latest --to jdk-dl --alias ${JAVA_HOME}
+    - name: Build GraalVM JDK
+      run: |
+        cd substratevm
+        ${MX_PATH}/mx --native=native-image --components="Native Image" build
+        mv $(${MX_PATH}/mx --native=native-image --components="Native Image" graalvm-home) ${GRAALVM_HOME}
+        ${GRAALVM_HOME}/bin/native-image --version
+    - name: Reconfigure JAVA_HOME for Micronaut
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'oracle'
+        java-version: '${{ env.MICRONAUT_JDK_VERSION }}'
+    - name: Run nativeTest in Micronaut launch project
+      run: |
+        curl --fail --silent --location --retry 3 --max-time 10 --output demo.zip --request GET 'https://launch.micronaut.io/create/default/com.example.demo?lang=JAVA&build=GRADLE&test=JUNIT&javaVersion=JDK_${{ env.MICRONAUT_JDK_VERSION }}'
+        unzip demo.zip
+        cd demo
+        ./gradlew nativeTest
+    - name: Checkout micronaut-projects/micronaut-core
+      uses: actions/checkout@v4
+      with:
+        repository: micronaut-projects/micronaut-core
+        fetch-depth: 1
+        path: ${{ env.MICRONAUT_CORE_PATH }}
+    - name: Run nativeTest in micronaut-core
+      run: |
+        cd ${{ env.MICRONAUT_CORE_PATH }}
+        ./gradlew nativeTest

docs/reference-manual/native-image/BuildOutput.md

@@ -66,7 +66,7 @@ Recommendations:
 --------------------------------------------------------------------------------
     0.8s (4.6% of total time) in 35 GCs | Peak RSS: 1.93GB | CPU load: 9.61
 --------------------------------------------------------------------------------
-Produced artifacts:
+Build artifacts:
  /home/janedoe/helloworld/helloworld (executable)
  /home/janedoe/helloworld/helloworld.debug (debug_info)
  /home/janedoe/helloworld/sources (debug_info)
@@ -341,11 +341,22 @@ If there is enough headroom and the [GC statistics](#glossary-garbage-collection
 The CPU time used by the process divided by the total process time.
 Increase the number of CPU cores to reduce the time to build the native binary.
 
+## <a name="glossary-build-artifacts"></a>Build Artifacts
+
+The list of all build artifacts.
+This includes the generated native binary, but it can also contain other artifacts such as additional libraries, C header files, or debug info.
+Some of these artifacts must remain in the same location with the native binary as they are needed at run time.
+For applications using AWT, for example, the build process will also output libraries from the JDK and shims to provide compatible AWT support.
+These libraries need to be copied and distributed together with the native binary.
+Use the `-H:+GenerateBuildArtifactsFile` option to instruct the builder to produce a machine-readable version of the build artifact list in JSON format.
+Such a JSON file validates against the JSON schema defined in [`build-artifacts-schema-v0.9.0.json`](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/build-artifacts-schema-v0.9.0.json).
+This schema also contains descriptions for each possible artifact type and explains whether they are needed at run time or not.
+
 ## Machine-Readable Build Output
 
 The build output produced by the `native-image` builder is designed for humans, can evolve with new releases, and should thus not be parsed in any way by tools.
 Instead, use the `-H:BuildOutputJSONFile=<file.json>` option to instruct the builder to produce machine-readable build output in JSON format that can be used, for example, for building monitoring tools.
-The JSON files validate against the JSON schema defined in [`build-output-schema-v0.9.2.json`](https://github.com/oracle/graal/tree/master/docs/reference-manual/native-image/assets/build-output-schema-v0.9.2.json).
+Such a JSON file validates against the JSON schema defined in [`build-output-schema-v0.9.2.json`](https://github.com/oracle/graal/tree/master/docs/reference-manual/native-image/assets/build-output-schema-v0.9.2.json).
 Note that a JSON file is produced if and only if a build succeeds.
 
 The following example illustrates how this could be used in a CI/CD build pipeline to check that the number of reachable methods does not exceed a certain threshold:

docs/reference-manual/native-image/MemoryManagement.md

@@ -164,7 +164,7 @@ Here is a small subset of the options that can be specified when doing performan
 
 ```shell
 # Build and execute a native image that uses the G1 GC with a region size of 2MB and a maximum pause time goal of 100ms
-native-image --gc=G1 -H:G1RegionSize=2m -R:MaxGCPauseMillis=100 HelloWorld
+native-image --gc=G1 -H:G1HeapRegionSize=2m -R:MaxGCPauseMillis=100 HelloWorld
 ./helloworld
 
 # Execute the native image from above and override the maximum pause time goal

docs/reference-manual/native-image/OptimizationsAndPerformance.md

@@ -7,7 +7,35 @@ permalink: /reference-manual/native-image/optimizations-and-performance/
 
 # Optimizations and Performance
 
-Native Image provides advanced mechanisms to further optimize the generated binary:
+Native Image provides different mechanisms that enable users to optimize a generated binary in terms of performance, file size, build time, debuggability, and other metrics.
+
+### Optimization Levels
+
+Similar to `gcc` and `clang`, users can control the optimization level using the `-O` option.
+By default, `-O2` is used which aims for a good tradeoff between performance, file size, and build time.
+The following table provides an overview of the different optimization levels and explains when they are useful:
+
+| Level | Optimizations | Use Cases |
+|:---:|:---:|---|
+| `-Ob` | Reduced | Quick build mode: Speeds up builds during development by avoiding time-consuming optimizations. This can also reduce file size sometimes. |
+| `-O0` | None | Typically used together with `-g` to improve the debugging experience. |
+| `-O1` | Basic | Trades performance for reduced file size and build time. Oracle GraalVM's `-O1` is somewhat comparable to `-O2` in GraalVM Community Edition. |
+| `-O2` | Advanced | **Default:** Aims for good performance at a reasonable file size. |
+| `-O3` | All | Aims for the best performance at the cost of longer build times. Used automatically by Oracle GraalVM for [PGO builds](guides/optimize-native-executable-with-pgo.md) (`--pgo` option). `-O3` and `-O2` are identical in GraalVM Community Edition. |
+
+### Optimizing for Specific Machines
+
+Native Image provides a `-march` option that works similarly to the ones in `gcc` and `clang`: it enables users to control the set of instructions that the Graal compiler can use when compiling code to native.
+By default, Native Image uses [`x86-64-v3` on x64](https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels){:target="_blank"} and [`armv8-a` on AArch64](https://en.wikipedia.org/wiki/ARM_architecture_family#Cores){:target="_blank"}.
+Use `-march=list` to list all available machine types.
+If the generated binary is built on the same or similar machine type that it is also deployed on, use `-march=native`.
+This option instructs the compiler to use all instructions that it finds available on the machine the binary is generated on.
+If the generated binary, on the other hand, is distributed to users with many different, and potentially very old machines, use `-march=compatibility`.
+This reduces the set of instructions used by the compiler to a minimum and thus improves the compatibility of the generated binary.
+
+### Additional Features
+
+Native Image provides additional features to further optimize a generated binary:
 
  - Profile-Guided Optimizations (PGO) can provide additional performance gain and higher throughput for most native images. See [Optimize a Native Executable with PGO](guides/optimize-native-executable-with-pgo.md).
  - Choosing an appropriate Garbage Collector and tailoring the garbage collection policy can reduce GC times. See [Memory Management](MemoryManagement.md).

docs/reference-manual/native-image/assets/build-artifacts-schema-v0.9.0.json

@@ -11,7 +11,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Build information generated by Native Image (not needed at run-time)",
+      "title": "Build information generated by Native Image (not needed at run time)",
       "type": "array"
     },
     "c_headers": {
@@ -21,7 +21,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "C header files generated by Native Image (not needed at run-time)",
+      "title": "C header files generated by Native Image (not needed at run time)",
       "type": "array"
     },
     "debug_info": {
@@ -31,7 +31,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Debug information generated by Native Image (not needed at run-time)",
+      "title": "Debug information generated by Native Image (not needed at run time)",
       "type": "array"
     },
     "executables": {
@@ -41,7 +41,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Executables generated by Native Image (needed at run-time)",
+      "title": "Executables generated by Native Image (needed at run time)",
       "type": "array"
     },
     "import_libraries": {
@@ -51,7 +51,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Import libraries generated by Native Image (not needed at run-time)",
+      "title": "Import libraries generated by Native Image (not needed at run time)",
       "type": "array"
     },
     "jdk_libraries": {
@@ -61,7 +61,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "JDK libraries copied by Native Image (needed at run-time)",
+      "title": "JDK libraries copied by Native Image (needed at run time)",
       "type": "array"
     },
     "language_home": {
@@ -71,7 +71,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Language home artifacts for Truffle languages (needed at run-time)",
+      "title": "Language home artifacts for Truffle languages (needed at run time)",
       "type": "array"
     },
     "shared_libraries": {
@@ -81,7 +81,7 @@
         "title": "Relative path to file or directory",
         "type": "string"
       },
-      "title": "Shared libraries generated by Native Image (not needed at run-time)",
+      "title": "Shared libraries generated by Native Image (needed at run time)",
       "type": "array"
     }
   },

java-benchmarks/mx.java-benchmarks/mx_java_benchmarks.py

@@ -468,21 +468,33 @@ def extra_image_build_argument(self, benchmark, args):
 
 mx_benchmark.add_bm_suite(BaseQuarkusRegistryBenchmark())
 
+_mushopConfig = {
+    'order': ['--initialize-at-build-time=io.netty.handler.codec.http.cookie.ServerCookieEncoder,java.sql.DriverInfo,kotlin.coroutines.intrinsics.CoroutineSingletons'],
+    'user': ['--initialize-at-build-time=io.netty.handler.codec.http.cookie.ServerCookieEncoder,java.sql.DriverInfo'],
+    'payment': ['--initialize-at-build-time=io.netty.handler.codec.http.cookie.ServerCookieEncoder']
+}
+
 class BaseMicronautMuShopBenchmark(BaseMicronautBenchmarkSuite, mx_sdk_benchmark.BaseMicroserviceBenchmarkSuite):
     """
-    This benchmark suite is NOT yet fully functional - there is not load for measuring its runtime performance.
-    It is only useful to collect image build time metrics.
+    This benchmark suite is used to measure the precision and performance of the static analysis in Native Image,
+    so there is no runtime load, that's why the default stage is just image.
     """
 
     def version(self):
-        return "0.0.1"
+        return "0.0.2"
 
     def name(self):
         return "mushop"
 
     def benchmarkList(self, bmSuiteArgs):
         return ["user", "order", "payment"]
 
+    def default_stages(self):
+        return ['image']
+
+    def run(self, benchmarks, bmSuiteArgs):
+        return self.intercept_run(super(), benchmarks, bmSuiteArgs)
+
     def createCommandLineArgs(self, benchmarks, bmSuiteArgs):
         if benchmarks is None:
             mx.abort("Suite can only run a single benchmark per VM instance.")
@@ -496,11 +508,11 @@ def applicationDist(self):
         return mx.library("MICRONAUT_MUSHOP_" + self.version(), True).get_path(True)
 
     def extra_image_build_argument(self, benchmark, args):
-        return [
+        return ([
             '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk=ALL-UNNAMED',
             '--add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.configure=ALL-UNNAMED',
-            '--add-exports=org.graalvm.nativeimage/org.graalvm.nativeimage.impl=ALL-UNNAMED'
-        ] + super(BaseMicronautBenchmarkSuite,self).extra_image_build_argument(benchmark, args)
+            '--add-exports=org.graalvm.nativeimage/org.graalvm.nativeimage.impl=ALL-UNNAMED']
+                + _mushopConfig[benchmark] + super(BaseMicronautBenchmarkSuite,self).extra_image_build_argument(benchmark, args))
 
 mx_benchmark.add_bm_suite(BaseMicronautMuShopBenchmark())
 

java-benchmarks/mx.java-benchmarks/suite.py

@@ -38,9 +38,9 @@
       "packedResource": True,
     },
 
-    "MICRONAUT_MUSHOP_0.0.1" : {
-      "urls": ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/mu-shop-0.0.1.zip"],
-      "digest": "sha512:41f91679c2077a9c252cfc29b8cbf7884f2e9f3c411cfe6c88d807d346178b76299bc5c3f446290b84139ca3a9f6f18c91511fc8ee90b47549b4a8c19cdb337d" ,
+    "MICRONAUT_MUSHOP_0.0.2" : {
+      "urls": ["https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/mu-shop-0.0.2.zip"],
+      "digest": "sha512:e0a503423c1cf94611e9dc14c4d8f06ae25081745b3ebe47b91225c188713537a55c9281a865d1ada364fddaac7d17b90b7da728ccf3975e4d2f584d21bee550" ,
       "packedResource": True
     },