Check the value of SubstrateTargetDescription across layer

Author: Zeavee

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

@@ -25,16 +25,32 @@
 package com.oracle.svm.core;
 
 import java.util.EnumSet;
+import java.util.List;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.code.RuntimeCodeCache;
+import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
+import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
+import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
+import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
+import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
+import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
+import com.oracle.svm.core.traits.SingletonLayeredCallbacksSupplier;
+import com.oracle.svm.core.traits.SingletonLayeredInstallationKind.Independent;
+import com.oracle.svm.core.traits.SingletonTrait;
+import com.oracle.svm.core.traits.SingletonTraitKind;
+import com.oracle.svm.core.traits.SingletonTraits;
+import com.oracle.svm.core.util.VMError;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.TargetDescription;
 
+@SingletonTraits(access = AllAccess.class, layeredCallbacks = SubstrateTargetDescription.LayeredCallbacks.class, layeredInstallationKind = Independent.class)
 public class SubstrateTargetDescription extends TargetDescription {
+    private static final String RUNTIME_CHECKED_CPU_FEATURES = "runtimeCheckedCPUFeatures";
+
     @Platforms(Platform.HOSTED_ONLY.class)
     public static boolean shouldInlineObjectsInImageCode() {
         return SubstrateOptions.SpawnIsolates.getValue();
@@ -55,4 +71,33 @@ public SubstrateTargetDescription(Architecture arch, boolean isMP, int stackAlig
     public EnumSet<?> getRuntimeCheckedCPUFeatures() {
         return runtimeCheckedCPUFeatures;
     }
+
+    static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
+        @Override
+        public SingletonTrait getLayeredCallbacksTrait() {
+            SingletonLayeredCallbacks action = new SingletonLayeredCallbacks() {
+                @Override
+                public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, Object singleton) {
+                    SubstrateTargetDescription substrateTargetDescription = (SubstrateTargetDescription) singleton;
+                    writer.writeStringList(RUNTIME_CHECKED_CPU_FEATURES, getCPUFeaturesList(substrateTargetDescription));
+                    return PersistFlags.CALLBACK_ON_REGISTRATION;
+                }
+
+                @Override
+                public void onSingletonRegistration(ImageSingletonLoader loader, Object singleton) {
+                    SubstrateTargetDescription substrateTargetDescription = (SubstrateTargetDescription) singleton;
+                    List<String> previousLayerRuntimeCheckedCPUFeatures = loader.readStringList(RUNTIME_CHECKED_CPU_FEATURES);
+                    List<String> currentLayerRuntimeCheckedCPUFeatures = getCPUFeaturesList(substrateTargetDescription);
+                    VMError.guarantee(previousLayerRuntimeCheckedCPUFeatures.equals(currentLayerRuntimeCheckedCPUFeatures),
+                                    "The runtime checked CPU Features should be consistent across layers. The previous layer CPU Features were %s, but the current layer are %s",
+                                    previousLayerRuntimeCheckedCPUFeatures, currentLayerRuntimeCheckedCPUFeatures);
+                }
+            };
+            return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, action);
+        }
+    }
+
+    private static List<String> getCPUFeaturesList(SubstrateTargetDescription substrateTargetDescription) {
+        return substrateTargetDescription.runtimeCheckedCPUFeatures.stream().map(Enum::toString).toList();
+    }
 }