[GR-34509] Early argument parsing, immutable runtime options, and prologue/epilogue changes.

PullRequest: graal/10133

Author: peter-hofer

compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/ModifiableOptionValues.java

@@ -75,6 +75,8 @@ public void update(OptionKey<?> key, Object value) {
                 newMap.put(key, encodeNull(value));
             }
         } while (!v.compareAndSet(expect, newMap));
+
+        key.afterValueUpdate();
     }
 
     /**

compiler/src/org.graalvm.compiler.options/src/org/graalvm/compiler/options/OptionKey.java

@@ -189,4 +189,10 @@ public void putIfAbsent(EconomicMap<OptionKey<?>, Object> values, Object v) {
      */
     protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, T oldValue, T newValue) {
     }
+
+    /**
+     * Notifies this object after a value associated with this key was set or updated.
+     */
+    protected void afterValueUpdate() {
+    }
 }

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

@@ -460,6 +460,7 @@ CLSS public abstract interface !annotation org.graalvm.nativeimage.c.function.CE
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
 innr public abstract interface static !annotation IsolateContext
 innr public abstract interface static !annotation IsolateThreadContext
+innr public abstract interface static ExceptionHandler
 innr public final static !enum Builtin
 innr public final static AlwaysIncluded
 innr public final static FatalExceptionHandler
@@ -490,8 +491,12 @@ meth public static org.graalvm.nativeimage.c.function.CEntryPoint$Builtin valueO
 meth public static org.graalvm.nativeimage.c.function.CEntryPoint$Builtin[] values()
 supr java.lang.Enum<org.graalvm.nativeimage.c.function.CEntryPoint$Builtin>
 
+CLSS public abstract interface static org.graalvm.nativeimage.c.function.CEntryPoint$ExceptionHandler
+ outer org.graalvm.nativeimage.c.function.CEntryPoint
+
 CLSS public final static org.graalvm.nativeimage.c.function.CEntryPoint$FatalExceptionHandler
  outer org.graalvm.nativeimage.c.function.CEntryPoint
+intf org.graalvm.nativeimage.c.function.CEntryPoint$ExceptionHandler
 supr java.lang.Object
 
 CLSS public abstract interface static !annotation org.graalvm.nativeimage.c.function.CEntryPoint$IsolateContext
@@ -914,7 +919,6 @@ meth public !varargs static void initializeAtBuildTime(java.lang.String[])
 meth public !varargs static void initializeAtRunTime(java.lang.Class<?>[])
 meth public !varargs static void initializeAtRunTime(java.lang.String[])
 supr java.lang.Object
-hfds MESSAGE
 
 CLSS public final org.graalvm.nativeimage.hosted.RuntimeReflection
 meth public !varargs static void register(boolean,boolean,java.lang.reflect.Field[])
@@ -923,8 +927,8 @@ meth public !varargs static void register(boolean,java.lang.reflect.Field[])
  anno 0 java.lang.Deprecated()
 meth public !varargs static void register(java.lang.Class<?>[])
 meth public !varargs static void register(java.lang.reflect.Executable[])
-meth public !varargs static void registerAsQueried(java.lang.reflect.Executable[])
 meth public !varargs static void register(java.lang.reflect.Field[])
+meth public !varargs static void registerAsQueried(java.lang.reflect.Executable[])
 meth public !varargs static void registerForReflectiveInstantiation(java.lang.Class<?>[])
 supr java.lang.Object
 

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/VMRuntime.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -51,7 +51,6 @@
  * @since 19.0
  */
 public final class VMRuntime {
-
     /**
      * Initializes the VM: Runs all startup hooks that were registered during image building.
      * Startup hooks usually depend on option values, so it is recommended (but not required) that
@@ -63,7 +62,7 @@ public final class VMRuntime {
      * @since 19.0
      */
     public static void initialize() {
-        ImageSingletons.lookup(VMRuntimeSupport.class).executeStartupHooks();
+        ImageSingletons.lookup(VMRuntimeSupport.class).initialize();
     }
 
     /**

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/c/function/CEntryPoint.java

@@ -119,7 +119,7 @@
      *
      * @since 19.0
      */
-    final class FatalExceptionHandler {
+    final class FatalExceptionHandler implements ExceptionHandler {
         private FatalExceptionHandler() {
         }
     }
@@ -284,4 +284,12 @@ enum Builtin {
     @Target(ElementType.PARAMETER)
     @interface IsolateContext {
     }
+
+    /**
+     * Marker interface for all {@link CEntryPoint#exceptionHandler() exception handler} classes.
+     *
+     * @since 22.0
+     */
+    interface ExceptionHandler {
+    }
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/VMRuntimeSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -42,7 +42,7 @@
 
 public interface VMRuntimeSupport {
 
-    void executeStartupHooks();
+    void initialize();
 
     void shutdown();
 

substratevm/mx.substratevm/mx_substratevm.py

@@ -665,7 +665,9 @@ def _helloworld(native_image, javac_command, path, build_only, args):
                 pout, pin = os.pipe()
                 os.dup2(pin, 1)  # connect stdout to pipe
                 os.environ[envkey] = output
-                lib.run_main(1, 'dummy')  # call run_main of shared lib
+                argc = 1
+                argv = (ctypes.c_char_p * argc)(b'dummy')
+                lib.run_main(argc, argv)  # call run_main of shared lib
                 call_stdout = os.read(pout, 120)  # get pipe contents
                 actual_output.append(call_stdout)
                 os.dup2(stdout, 1)  # restore original stdout

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java

@@ -38,7 +38,6 @@
 import com.oracle.svm.core.heap.PhysicalMemory;
 import com.oracle.svm.core.heap.ReferenceAccess;
 import com.oracle.svm.core.jdk.UninterruptibleUtils;
-import com.oracle.svm.core.option.RuntimeOptionValues;
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.VMError;
@@ -277,7 +276,7 @@ protected SizeParameters computeSizeParameters(SizeParameters existing) {
         long optionMaxYoung = SubstrateGCOptions.MaxNewSize.getValue();
         if (optionMaxYoung > 0L) {
             maxYoung = WordFactory.unsigned(optionMaxYoung);
-        } else if (HeapParameters.Options.MaximumYoungGenerationSizePercent.hasBeenSet(RuntimeOptionValues.singleton())) {
+        } else if (HeapParameters.Options.MaximumYoungGenerationSizePercent.hasBeenSet()) {
             maxYoung = maxHeap.unsignedDivide(100).multiply(HeapParameters.getMaximumYoungGenerationSizePercent());
         } else {
             maxYoung = maxHeap.unsignedDivide(AbstractCollectionPolicy.NEW_RATIO + 1);

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunkProvider.java

@@ -33,7 +33,6 @@
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.MemoryWalker;
-import com.oracle.svm.core.SubstrateGCOptions;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.annotate.AlwaysInline;
 import com.oracle.svm.core.annotate.Uninterruptible;
@@ -146,7 +145,7 @@ void consumeAlignedChunks(AlignedHeader firstChunk, boolean keepAll) {
         } else {
             UnsignedWord freeListBytes = getBytesInUnusedChunks();
             UnsignedWord reserveBytes = GCImpl.getPolicy().getMaximumFreeAlignedChunksSize();
-            UnsignedWord maxHeapFree = WordFactory.unsigned(SubstrateGCOptions.MaxHeapFree.getValue());
+            UnsignedWord maxHeapFree = WordFactory.unsigned(HeapParameters.Options.MaxHeapFree.getValue());
             if (maxHeapFree.aboveThan(0)) {
                 reserveBytes = UnsignedUtils.min(reserveBytes, maxHeapFree);
             }

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java

@@ -28,9 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
-import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext;
-import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
@@ -47,7 +44,10 @@
 import com.oracle.svm.core.MemoryWalker;
 import com.oracle.svm.core.SubstrateDiagnostics;
 import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunk;
+import com.oracle.svm.core.SubstrateDiagnostics.DiagnosticThunkRegistry;
+import com.oracle.svm.core.SubstrateDiagnostics.ErrorContext;
 import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.NeverInline;
 import com.oracle.svm.core.annotate.RestrictHeapAccess;
 import com.oracle.svm.core.annotate.Substitute;
@@ -74,12 +74,14 @@
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.nodes.CFunctionEpilogueNode;
 import com.oracle.svm.core.nodes.CFunctionPrologueNode;
+import com.oracle.svm.core.option.RuntimeOptionKey;
 import com.oracle.svm.core.os.CommittedMemoryProvider;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.ThreadStatus;
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.thread.VMThreads;
+import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.UserError;
 
@@ -641,8 +643,10 @@ public boolean printLocationInfo(Log log, UnsignedWord value, boolean allowJavaH
     }
 
     @Override
-    public void updateSizeParameters() {
-        GCImpl.getPolicy().updateSizeParameters();
+    public void optionValueChanged(RuntimeOptionKey<?> key) {
+        if (!SubstrateUtil.HOSTED) {
+            GCImpl.getPolicy().updateSizeParameters();
+        }
     }
 
     static Pointer getImageHeapStart() {
@@ -853,7 +857,7 @@ private long totalMemory() {
     @Substitute
     private long maxMemory() {
         PhysicalMemory.size(); // ensure physical memory size is set correctly and not estimated
-        Heap.getHeap().updateSizeParameters();
+        GCImpl.getPolicy().updateSizeParameters();
         return GCImpl.getPolicy().getMaximumHeapSize().rawValue();
     }