only set libgraal related image system properties when building libgraal

Author: dougxc

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LibGraalSupport.java

@@ -27,7 +27,6 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.hosted.RuntimeSystemProperties;
 
 import java.io.PrintStream;
 import java.lang.ref.Reference;
@@ -46,17 +45,11 @@
 public interface LibGraalSupport {
 
     /**
-     * Prefix to be used when {@linkplain RuntimeSystemProperties#register registering} properties
-     * describing the image configuration for libgraal. This is analogous to the configuration info
-     * displayed by {@code -XshowSettings}.
-     * <p>
-     * For example:
-     *
-     * <pre>
-     * RuntimeSystemProperties.register(NATIVE_IMAGE_SETTING_KEY_PREFIX + "gc", "serial");
-     * </pre>
+     * Prefix to use for an image runtime system property describing some aspect of the libgraal
+     * image configuration. These properties are included in the output of
+     * {@code -Djdk.graal.ShowConfiguration}.
      */
-    String NATIVE_IMAGE_SETTING_KEY_PREFIX = "org.graalvm.nativeimage.setting.";
+    String LIBGRAAL_SETTING_PROPERTY_PREFIX = "libgraal.setting.";
 
     /**
      * Called to signal a fatal, non-recoverable error. This method does not return or throw an

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilerConfigurationFactory.java

@@ -25,7 +25,7 @@
 package jdk.graal.compiler.hotspot;
 
 import static jdk.vm.ci.common.InitTimer.timer;
-import static jdk.graal.compiler.core.common.LibGraalSupport.NATIVE_IMAGE_SETTING_KEY_PREFIX;
+import static jdk.graal.compiler.core.common.LibGraalSupport.LIBGRAAL_SETTING_PROPERTY_PREFIX;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -279,9 +279,9 @@ private Object getLoadedFromLocation(boolean verbose) {
             String justification = "properties initialized via org.graalvm.nativeimage.hosted.RuntimeSystemProperties " +
                             "are not accessible via GraalServices.getSavedProperties()";
             String settings = GraalServices.getSystemProperties(justification).entrySet().stream()//
-                            .filter(e -> e.getKey().toString().startsWith(NATIVE_IMAGE_SETTING_KEY_PREFIX))//
+                            .filter(e -> e.getKey().toString().startsWith(LIBGRAAL_SETTING_PROPERTY_PREFIX))//
                             .map(e -> {
-                                String key = e.getKey().toString().substring(NATIVE_IMAGE_SETTING_KEY_PREFIX.length());
+                                String key = e.getKey().toString().substring(LIBGRAAL_SETTING_PROPERTY_PREFIX.length());
                                 String val = e.getValue().toString();
                                 return val.isEmpty() ? key : key + "=" + val;
                             })//

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java

@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.graal.compiler.core.common.LibGraalSupport;
+import com.oracle.svm.core.jdk.SystemPropertiesSupport;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
@@ -69,7 +69,6 @@
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.util.Providers;
-import org.graalvm.nativeimage.hosted.RuntimeSystemProperties;
 
 @AutomaticallyRegisteredFeature
 class GenScavengeGCFeature implements InternalFeature {
@@ -131,8 +130,8 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
             ImageSingletons.add(CommittedMemoryProvider.class, createCommittedMemoryProvider());
         }
 
-        String gcName = Heap.getHeap().getGC().getName();
-        RuntimeSystemProperties.register(LibGraalSupport.NATIVE_IMAGE_SETTING_KEY_PREFIX + "gc", gcName);
+        // If building libgraal, set system property showing gc algorithm
+        SystemPropertiesSupport.singleton().setLibGraalRuntimeProperty("gc", Heap.getHeap().getGC().getName());
 
         // Needed for the barrier set.
         access.registerAsUsed(Object[].class);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -1389,4 +1389,7 @@ public static class TruffleStableOptions {
             throw UserError.invalidOptionValue(key, key.getValue(), "Mapping the image heap with mremap() is only supported on Linux.");
         }
     });
+
+    @Option(help = "file:doc-files/LibGraalClassLoader.txt")//
+    public static final HostedOptionKey<String> LibGraalClassLoader = new HostedOptionKey<>("");
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/doc-files/LibGraalClassLoader.txt renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/doc-files/LibGraalClassLoader.txt

@@ -24,6 +24,7 @@
  */
 package com.oracle.svm.core.jdk;
 
+import static jdk.graal.compiler.core.common.LibGraalSupport.LIBGRAAL_SETTING_PROPERTY_PREFIX;
 import static jdk.graal.compiler.nodes.extended.MembarNode.FenceKind.STORE_STORE;
 
 import java.util.ArrayList;
@@ -35,10 +36,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
+import com.oracle.svm.core.SubstrateOptions;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.hosted.RuntimeSystemProperties;
 import org.graalvm.nativeimage.impl.RuntimeSystemPropertiesSupport;
 
 import com.oracle.svm.core.SubstrateUtil;
@@ -290,6 +293,18 @@ private synchronized void initializeAllProperties() {
         allPropertiesInitialized = true;
     }
 
+    /**
+     * If the current image being built is libgraal, sets a runtime system property used to describe
+     * some aspect of the libgraal image configuration.
+     *
+     * @see jdk.graal.compiler.core.common.LibGraalSupport#LIBGRAAL_SETTING_PROPERTY_PREFIX
+     */
+    public void setLibGraalRuntimeProperty(String name, String value) {
+        if (!SubstrateOptions.LibGraalClassLoader.getValue().isEmpty()) {
+            RuntimeSystemProperties.register(LIBGRAAL_SETTING_PROPERTY_PREFIX + name, value);
+        }
+    }
+
     private void ensurePropertyInitialized(String key) {
         if (allPropertiesInitialized) {
             return;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java

@@ -572,9 +572,9 @@ private Stream<AddExportsAndOpensAndReadsFormatValue> processOption(OptionKey<Ac
     }
 
     public void setupLibGraalClassLoader() {
-        var className = NativeImageOptions.LibGraalClassLoader.getValue(parsedHostedOptions);
+        var className = SubstrateOptions.LibGraalClassLoader.getValue(parsedHostedOptions);
         if (!className.isEmpty()) {
-            String nameOption = SubstrateOptionsParser.commandArgument(NativeImageOptions.LibGraalClassLoader, className);
+            String nameOption = SubstrateOptionsParser.commandArgument(SubstrateOptions.LibGraalClassLoader, className);
             try {
                 Class<?> loaderClass = Class.forName(className, true, classLoader);
                 if (!LibGraalLoader.class.isAssignableFrom(loaderClass)) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -305,7 +305,4 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
             }
         }
     };
-
-    @Option(help = "file:doc-files/LibGraalClassLoader.txt")//
-    public static final HostedOptionKey<String> LibGraalClassLoader = new HostedOptionKey<>("");
 }