Clean-up simplifier selection for points-to/reachability.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java

@@ -80,6 +80,7 @@ public abstract class AbstractAnalysisEngine implements BigBang {
     protected final int maxConstantObjectsPerType;
     protected final boolean profileConstantObjects;
     protected final boolean optimizeReturnedParameter;
+    protected final boolean useExperimentalReachabilityAnalysis;
 
     protected final OptionValues options;
     protected final DebugContext debug;
@@ -124,6 +125,8 @@ public AbstractAnalysisEngine(OptionValues options, AnalysisUniverse universe, H
         maxConstantObjectsPerType = PointstoOptions.MaxConstantObjectsPerType.getValue(options);
         profileConstantObjects = PointstoOptions.ProfileConstantObjects.getValue(options);
         optimizeReturnedParameter = PointstoOptions.OptimizeReturnedParameter.getValue(options);
+        useExperimentalReachabilityAnalysis = PointstoOptions.UseExperimentalReachabilityAnalysis.getValue(options);
+
         this.snippetReflectionProvider = snippetReflectionProvider;
         this.constantReflectionProvider = constantReflectionProvider;
         this.wordTypes = wordTypes;
@@ -250,6 +253,11 @@ public boolean optimizeReturnedParameter() {
         return optimizeReturnedParameter;
     }
 
+    @Override
+    public boolean isPointsToAnalysis() {
+        return !useExperimentalReachabilityAnalysis;
+    }
+
     public void profileConstantObject(AnalysisType type) {
         if (profileConstantObjects) {
             PointsToAnalysis.ConstantObjectsProfiler.registerConstant(type);

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java

@@ -62,6 +62,8 @@ public interface BigBang extends ReachabilityAnalysis {
 
     UnsupportedFeatures getUnsupportedFeatures();
 
+    boolean isPointsToAnalysis();
+
     /**
      * Checks if all user defined limitations such as the number of types are satisfied.
      */

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java

@@ -577,6 +577,9 @@ public Set<AnalysisMethod> getCallers() {
     /** Get the list of all invoke locations for this method, as inferred by the static analysis. */
     public abstract List<BytecodePosition> getInvokeLocations();
 
+    /** Get the node markers used to store per-node mappings to metadata for encoded nodes. */
+    public abstract Iterable<EncodedGraph.EncodedNodeReference> getEncodedNodeReferences();
+
     /**
      * Returns true if this method is a native entrypoint, i.e. it may be called from the host
      * environment.

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/PointsToAnalysisMethod.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.pointsto.util.ConcurrentLightHashMap;
 import com.oracle.svm.common.meta.MultiMethod;
 
+import jdk.graal.compiler.nodes.EncodedGraph;
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -125,6 +126,11 @@ public static Object unwrapInvokeReason(Object reason) {
         return reason;
     }
 
+    @Override
+    public Iterable<EncodedGraph.EncodedNodeReference> getEncodedNodeReferences() {
+        return typeFlow.getMethodFlowsGraph().getNodeFlows().getKeys();
+    }
+
     @Override
     public List<BytecodePosition> getInvokeLocations() {
         List<BytecodePosition> locations = new ArrayList<>();

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java

@@ -39,7 +39,6 @@
 import com.oracle.graal.pointsto.infrastructure.Universe;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
-import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.svm.util.ImageBuildStatistics;
 
@@ -186,10 +185,6 @@ private static void reportNeverNullInstanceFields(BigBang bb) {
 
     @SuppressWarnings("try")
     public final void applyResults(AnalysisMethod method) {
-        var nodeReferences = method instanceof PointsToAnalysisMethod ptaMethod && ptaMethod.getTypeFlow().flowsGraphCreated()
-                        ? ptaMethod.getTypeFlow().getMethodFlowsGraph().getNodeFlows().getKeys()
-                        : null;
-        var debug = new DebugContext.Builder(bb.getOptions(), new GraalDebugHandlersFactory(bb.getSnippetReflectionProvider())).build();
 
         if (method.analyzedInPriorLayer()) {
             /*
@@ -203,11 +198,15 @@ public final void applyResults(AnalysisMethod method) {
             return;
         }
 
-        var graph = method.decodeAnalyzedGraph(debug, nodeReferences);
-        if (graph == null) {
+        if (method.getAnalyzedGraph() == null) {
+            /* Method was not analyzed, so there is nothing to strengthen. */
             return;
         }
 
+        var nodeReferences = method.getEncodedNodeReferences();
+        var debug = new DebugContext.Builder(bb.getOptions(), new GraalDebugHandlersFactory(bb.getSnippetReflectionProvider())).build();
+        var graph = method.decodeAnalyzedGraph(debug, nodeReferences);
+
         preStrengthenGraphs(graph, method);
 
         graph.resetDebug(debug);
@@ -225,6 +224,7 @@ public final void applyResults(AnalysisMethod method) {
 
         postStrengthenGraphs(graph, method);
 
+        /* Preserve the strengthened graph in an encoded format. */
         method.setAnalyzedGraph(GraphEncoder.encodeSingleGraph(graph, AnalysisParsedGraph.HOST_ARCHITECTURE));
 
         persistStrengthenGraph(method);
@@ -279,7 +279,7 @@ public class AnalysisStrengthenGraphsPhase extends BasePhase<CoreProviders> {
 
         AnalysisStrengthenGraphsPhase(AnalysisMethod method, StructuredGraph graph) {
             ReachabilitySimplifier simplifier;
-            if (method instanceof PointsToAnalysisMethod ptaMethod && ptaMethod.getTypeFlow().flowsGraphCreated()) {
+            if (bb.isPointsToAnalysis()) {
                 simplifier = new TypeFlowSimplifier(StrengthenGraphs.this, method, graph);
             } else {
                 simplifier = new ReachabilitySimplifier(StrengthenGraphs.this, method, graph);

substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java

@@ -40,6 +40,7 @@
 
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.EncodedGraph;
 import jdk.graal.compiler.nodes.GraphEncoder;
 import jdk.graal.compiler.nodes.Invoke;
 import jdk.graal.compiler.nodes.StructuredGraph;
@@ -110,6 +111,11 @@ public List<BytecodePosition> getInvokeLocations() {
         return calledFrom;
     }
 
+    @Override
+    public Iterable<EncodedGraph.EncodedNodeReference> getEncodedNodeReferences() {
+        return null;
+    }
+
     public void addCaller(BytecodePosition bytecodePosition) {
         calledFrom.add(bytecodePosition);
     }