[GR-48652] [GR-48664] Read elimination: only kill mutable locations when encountering ANY.

PullRequest: graal/15612

Author: davleopo

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/LowTier.java

@@ -57,18 +57,21 @@ static class Options {
 
     }
 
+    private final CanonicalizerPhase canonicalizerWithoutGVN;
+    private final CanonicalizerPhase canonicalizerWithGVN;
+
     @SuppressWarnings("this-escape")
     public LowTier(OptionValues options) {
-        CanonicalizerPhase canonicalizer = CanonicalizerPhase.create();
-        CanonicalizerPhase canonicalizerWithoutGVN = canonicalizer.copyWithoutGVN();
+        this.canonicalizerWithGVN = CanonicalizerPhase.create();
+        this.canonicalizerWithoutGVN = canonicalizerWithGVN.copyWithoutGVN();
 
         if (Options.ProfileCompiledMethods.getValue(options)) {
             appendPhase(new ProfileCompiledMethodsPhase());
         }
 
-        appendPhase(new LowTierLoweringPhase(canonicalizer));
+        appendPhase(new LowTierLoweringPhase(canonicalizerWithGVN));
 
-        appendPhase(new ExpandLogicPhase(canonicalizer));
+        appendPhase(new ExpandLogicPhase(canonicalizerWithGVN));
 
         appendPhase(new FixReadsPhase(true,
                         new SchedulePhase(GraalOptions.StressTestEarlyReads.getValue(options) ? SchedulingStrategy.EARLIEST : SchedulingStrategy.LATEST_OUT_OF_LOOPS_IMPLICIT_NULL_CHECKS)));
@@ -92,4 +95,12 @@ public LowTier(OptionValues options) {
 
         appendPhase(new SchedulePhase(SchedulePhase.SchedulingStrategy.LATEST_OUT_OF_LOOPS));
     }
+
+    public final CanonicalizerPhase getCanonicalizerWithoutGVN() {
+        return canonicalizerWithoutGVN;
+    }
+
+    public final CanonicalizerPhase getCanonicalizer() {
+        return canonicalizerWithGVN;
+    }
 }

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphState.java

@@ -625,6 +625,7 @@ public enum StageFlag {
         VECTOR_LOWERING,
         EXPAND_LOGIC,
         FIXED_READS,
+        PARTIAL_REDUNDANCY_SCHEDULE,
         ADDRESS_LOWERING,
         FINAL_CANONICALIZATION,
         TARGET_VECTOR_LOWERING,

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java

@@ -156,6 +156,10 @@ protected CanonicalizerPhase(CustomSimplification customSimplification, EnumSet<
         this.features = features;
     }
 
+    public EnumSet<CanonicalizerFeature> getFeatures() {
+        return features;
+    }
+
     public CanonicalizerPhase copyWithCustomSimplification(CustomSimplification newSimplification) {
         return new CanonicalizerPhase(newSimplification, features);
     }
@@ -508,7 +512,7 @@ private boolean processNode(Node node, Tool tool) {
         return false;
     }
 
-    public boolean tryGlobalValueNumbering(Node node, NodeClass<?> nodeClass) {
+    public static boolean gvn(Node node, NodeClass<?> nodeClass) {
         if (nodeClass.valueNumberable()) {
             Node newNode = node.graph().findDuplicate(node);
             if (newNode != null) {
@@ -522,6 +526,13 @@ public boolean tryGlobalValueNumbering(Node node, NodeClass<?> nodeClass) {
         return false;
     }
 
+    public boolean tryGlobalValueNumbering(Node node, NodeClass<?> nodeClass) {
+        assert ((StructuredGraph) node.graph()).getGraphState().isBeforeStage(StageFlag.PARTIAL_REDUNDANCY_SCHEDULE) : "GVN must not occur after expanding partially redundant nodes, trying to gvn " +
+                        node +
+                        " for graph " + node.graph();
+        return gvn(node, nodeClass);
+    }
+
     private static AutoCloseable getCanonicalizeableContractAssertion(Node node) {
         boolean needsAssertion = false;
         assert (needsAssertion = true) == true;

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java

@@ -193,8 +193,16 @@ public ValueNode getCacheEntry(CacheEntry<?> identifier) {
 
     public void killReadCache(LocationIdentity identity, ValueNode index, ValueNode array) {
         if (identity.isAny()) {
-            // ANY aliases with every other location
-            readCache.clear();
+            /**
+             * Kill all mutable locations.
+             */
+            Iterator<CacheEntry<?>> iterator = readCache.getKeys().iterator();
+            while (iterator.hasNext()) {
+                CacheEntry<?> entry = iterator.next();
+                if (entry.getIdentity().isMutable()) {
+                    iterator.remove();
+                }
+            }
             return;
         }
         Iterator<CacheEntry<?>> iterator = readCache.getKeys().iterator();