Merge upstream 21.3 branch (tagged vm-ee-21.3.3.0)

Author: zakkak

.github/workflows/mandrel.yml

@@ -11,7 +11,7 @@ on:
       - '.github/workflows/main.yml'
       - '.github/workflows/quarkus.yml'
       - '**.md'
-  workflow_dispatch: []
+  workflow_dispatch:
 
 # The following aims to reduce CI CPU cycles by:
 # 1. Cancelling any previous builds of this PR when pushing new changes to it
@@ -27,20 +27,20 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'graalvm/mandrel' }}
 
 jobs:
-  q-2_2-ea:
-    name: "Q 2.2 M 21.3 EA"
+  q-2_7-ea:
+    name: "Q 2.7 M 21.3 EA"
     uses: graalvm/mandrel/.github/workflows/base.yml@default
     with:
-      quarkus-version: "2.2"
+      quarkus-version: "2.7"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
       mandrel-packaging-version: "21.3"
       jdk: "11/ea"
-  q-2_2-ea-win:
-    name: "Q 2.2 M 21.3 windows EA"
+  q-2_7-ea-win:
+    name: "Q 2.7 M 21.3 windows EA"
     uses: graalvm/mandrel/.github/workflows/base-windows.yml@default
     with:
-      quarkus-version: "2.2"
+      quarkus-version: "2.7"
       repo: ${{ github.repository }}
       version: ${{ github.ref }}
       mandrel-packaging-version: "21.3"

common.json

@@ -3,19 +3,19 @@
 
   "jdks": {
     "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b05", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u331+09-jvmci-21.3-b11", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u331+09-jvmci-21.3-b11-fastdebug", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u341+10-jvmci-21.3-b19", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u341+10-jvmci-21.3-b19-fastdebug", "platformspecific": true },
 
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.15+8-jvmci-21.3-b13", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.15+8-jvmci-21.3-b11", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.16+7-jvmci-21.3-b19", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.16+11-jvmci-21.3-b20", "platformspecific": true },
 
     "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.3+5-jvmci-21.3-b13", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.3+5-jvmci-21.3-b13-debug", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.3+8-jvmci-21.3-b11", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.3+8-jvmci-21.3-b11-debug", "platformspecific": true }
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.4+7-jvmci-21.3-b19", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.4+7-jvmci-21.3-b19-debug", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.4+11-jvmci-21.3-b20", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.4+11-jvmci-21.3-b20-debug", "platformspecific": true }
   },
 
   "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

compiler/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 This changelog summarizes newly introduced optimizations that may be relevant to other teams.
 
+## Version 21.3.0
+* (GR-38857): Deprecated the libgraal JMX management bean and disabled it by default. The bean is scheduled to be
+  removed completely in GraalVM 22.3.0. Until then, it can be explicitly re-enabled with
+  `-Dgraal.LibGraalManagementDelay=1000`.
+
 ## Version 21.2.0
 * (GR-29770) Loop safepoint elimination: Not only consider 32bit loops for safepoint removal but also 64bit ones
 that iterate in 32bit ranges.

compiler/mx.compiler/suite.py

@@ -4,7 +4,7 @@
   "sourceinprojectwhitelist" : [],
 
   "groupId" : "org.graalvm.compiler",
-  "version" : "21.3.2.1",
+  "version" : "21.3.3.0",
   "release" : False,
   "url" : "http://www.graalvm.org/",
   "developer" : {

compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java

@@ -764,4 +764,16 @@ public void emitZeroMemory(Value address, Value length, boolean isAligned) {
         emitMove(lengthReg, length);
         append(new AMD64ZeroMemoryOp(asAddressValue(address), lengthReg));
     }
+
+    public boolean supportsCPUFeature(AMD64.CPUFeature feature) {
+        return ((AMD64) target().arch).getFeatures().contains(feature);
+    }
+
+    public boolean supportsCPUFeature(String feature) {
+        try {
+            return ((AMD64) target().arch).getFeatures().contains(AMD64.CPUFeature.valueOf(feature));
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
 }

compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java

@@ -537,6 +537,26 @@ private <T extends Node> T addHelper(T node) {
         return node;
     }
 
+    /**
+     * Notifies node event listeners registered with this graph that {@code node} has been created
+     * as part of decoding a graph but its fields have yet to be initialized.
+     */
+    public void beforeDecodingFields(Node node) {
+        if (nodeEventListener != null) {
+            nodeEventListener.event(NodeEvent.BEFORE_DECODING_FIELDS, node);
+        }
+    }
+
+    /**
+     * Notifies node event listeners registered with this graph that {@code node} has been created
+     * as part of decoding a graph and its fields have now been initialized.
+     */
+    public void afterDecodingFields(Node node) {
+        if (nodeEventListener != null) {
+            nodeEventListener.event(NodeEvent.AFTER_DECODING_FIELDS, node);
+        }
+    }
+
     /**
      * The type of events sent to a {@link NodeEventListener}.
      */
@@ -559,7 +579,22 @@ public enum NodeEvent {
         /**
          * A node was removed from the graph.
          */
-        NODE_REMOVED
+        NODE_REMOVED,
+
+        /**
+         * Graph decoding (partial evaluation) may create nodes adding them to the graph in a "stub"
+         * form before filling any node fields. We want to observe these events as well. This event
+         * is triggered before a "stub" node's fields are decoded and initialized.
+         */
+        BEFORE_DECODING_FIELDS,
+
+        /**
+         * Graph decoding (partial evaluation) may create nodes adding them to the graph in a "stub"
+         * form before filling any node fields. We want to observe these events as well. This event
+         * is triggered after a "stub" node's fields are decoded and populated i.e. when the node is
+         * no longer a stub.
+         */
+        AFTER_DECODING_FIELDS,
     }
 
     /**
@@ -590,6 +625,13 @@ final void event(NodeEvent e, Node node) {
                 case NODE_REMOVED:
                     nodeRemoved(node);
                     break;
+                case BEFORE_DECODING_FIELDS:
+                    beforeDecodingFields(node);
+                    break;
+
+                case AFTER_DECODING_FIELDS:
+                    afterDecodingFields(node);
+                    break;
             }
             changed(e, node);
         }
@@ -611,6 +653,22 @@ public void changed(NodeEvent e, Node node) {
         public void inputChanged(Node node) {
         }
 
+        /**
+         * Notifies this listener that the decoding of fields for this node is about to commence.
+         *
+         * @param node a node whose fields are about to be decoded.
+         */
+        public void beforeDecodingFields(Node node) {
+        }
+
+        /**
+         * Notifies this listener that the decoding of fields for this node has finished.
+         *
+         * @param node a node who has had fields decoded.
+         */
+        public void afterDecodingFields(Node node) {
+        }
+
         /**
          * Notifies this listener of a node becoming unused.
          *

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java

@@ -48,6 +48,7 @@
 import org.graalvm.compiler.core.common.type.Stamp;
 import org.graalvm.compiler.debug.DebugCloseable;
 import org.graalvm.compiler.debug.DebugContext;
+import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.compiler.graph.Graph.NodeEventListener;
 import org.graalvm.compiler.graph.iterators.NodeIterable;
 import org.graalvm.compiler.graph.iterators.NodePredicate;
@@ -1420,7 +1421,28 @@ public final void pushInputs(NodeStack stack) {
         getNodeClass().pushInputs(this, stack);
     }
 
-    public NodeSize estimatedNodeSize() {
+    public final NodeSize estimatedNodeSize() {
+        try {
+            return dynamicNodeSizeEstimate();
+        } catch (Exception e) {
+            throw GraalError.shouldNotReachHere(e, "Exception during node cost estimation");
+        }
+    }
+
+    /**
+     * Node subclasses should override this method if they need to specify a dynamically calculated
+     * {@link NodeSize} value. If the node size is static please use {@link NodeInfo#size()}.
+     *
+     * NOTE: When overriding this method, make sure that *all* field reads are null checked (even if
+     * Java semantics seemingly make the value of the field non-null). This is necessary because
+     * node size estimates are needed even during graph decoding which, for some nodes, first
+     * reflectively creates a stub and then later, reflectively, populates its fields. This method
+     * could be invoked between these two points. For this reason, when overriding this method
+     * assume that all fields can and will be null.
+     *
+     * @return The estimated node size for this node.
+     */
+    protected NodeSize dynamicNodeSizeEstimate() {
         return nodeClass.size();
     }
 

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Node.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -210,6 +210,14 @@ public void remove() {
                 assert NodeMap.this.values[current] != null;
                 NodeMap.this.values[current] = null;
             }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public T setValue(T newValue) {
+                T oldValue = (T) NodeMap.this.values[current];
+                NodeMap.this.values[current] = newValue;
+                return oldValue;
+            }
         };
     }
 

compiler/src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/NodeMap.java

@@ -39,6 +39,7 @@
 import org.graalvm.compiler.options.Option;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionType;
+import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
 /**
@@ -59,7 +60,7 @@ static class Options {
          */
         @Option(help = "Milliseconds to delay initialization of the libgraal JMX interface. " +
                         "Specify a negative value to disable the interface altogether.", type = OptionType.Expert)//
-        static final OptionKey<Integer> LibGraalManagementDelay = new OptionKey<>(1000);
+        static final OptionKey<Integer> LibGraalManagementDelay = new OptionKey<>(-1);
     }
 
     /**
@@ -77,6 +78,10 @@ public void initialize(HotSpotGraalRuntime runtime, GraalHotSpotVMConfig config)
         if (delay < 0) {
             return;
         }
+        Pointer warningShown = MBeanProxy.getOptionWarningStatePointer();
+        if (warningShown.compareAndSwapInt(0, 0, 1, LocationIdentity.ANY_LOCATION) == 0) {
+            TTY.printf("The %s option is deprecated and will be removed in the next GraalVM version.%n", Options.LibGraalManagementDelay.getName());
+        }
         Pointer defineClassesStatePointer = getDefineClassesStatePointer();
         long defineClassesState = defineClassesStatePointer.readLong(0);
         if (delay == 0 || defineClassesState == HS_CLASSES_DEFINED) {

compiler/src/org.graalvm.compiler.hotspot.management.libgraal/src/org/graalvm/compiler/hotspot/management/libgraal/LibGraalHotSpotGraalManagement.java

@@ -437,6 +437,15 @@ static Pointer getDefineClassesStatePointer() {
         return WordFactory.nullPointer();
     }
 
+    /**
+     * Gets a pointer to a global word used as a flag to show a deprecated option warning only once
+     * even in case of multiple compiler isolates per process.
+     */
+    static Pointer getOptionWarningStatePointer() {
+        // Substituted by Target_org_graalvm_compiler_hotspot_management_libgraal_MBeanProxy
+        return WordFactory.nullPointer();
+    }
+
     /**
      * Lifecycle state.
      */