[GR-42385] Add optional precedingLoop edge to LoopBeginNode

PullRequest: graal/13311

Author: gergo-

compiler/src/org.graalvm.compiler.asm.amd64/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java

@@ -1263,7 +1263,7 @@ public static class VexRMOp extends VexRROp {
         public static final VexRMOp VCVTTPD2DQ      = new VexRMOp("VCVTTPD2DQ",      P_66, M_0F,   WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL,           EVEXTuple.FVM,       W1);
         public static final VexRMOp VCVTTPD2QQ      = new VexRMOp("VCVTTPD2QQ",      P_66, M_0F,   W1,  0x7A, VEXOpAssertion.AVX512DQ_VL,               EVEXTuple.FVM,       W1);
         public static final VexRMOp VCVTDQ2PD       = new VexRMOp("VCVTDQ2PD",       P_F3, M_0F,   WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL,           EVEXTuple.HVM,       W0);
-        public static final VexRMOp VBROADCASTSS    = new VexRMOp("VBROADCASTSS",    P_66, M_0F38, W0,  0x18, VEXOpAssertion.AVX1_AVX2_AVX512F_VL,      EVEXTuple.FVM,       W0);
+        public static final VexRMOp VBROADCASTSS    = new VexRMOp("VBROADCASTSS",    P_66, M_0F38, W0,  0x18, VEXOpAssertion.AVX1_AVX512F_VL,           EVEXTuple.FVM,       W0);
         public static final VexRMOp VBROADCASTSD    = new VexRMOp("VBROADCASTSD",    P_66, M_0F38, W0,  0x19, VEXOpAssertion.AVX1_256ONLY_AVX512F_VL,   EVEXTuple.FVM,       W1);
         public static final VexRMOp VBROADCASTF128  = new VexRMOp("VBROADCASTF128",  P_66, M_0F38, W0,  0x1A, VEXOpAssertion.AVX1_256ONLY);
         public static final VexRMOp VPBROADCASTI128 = new VexRMOp("VPBROADCASTI128", P_66, M_0F38, W0,  0x5A, VEXOpAssertion.AVX2_256ONLY);

compiler/src/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/LoopBeginNode.java

@@ -52,6 +52,7 @@
 public final class LoopBeginNode extends AbstractMergeNode implements IterableNodeType, LIRLowerable {
 
     public static final NodeClass<LoopBeginNode> TYPE = NodeClass.create(LoopBeginNode.class);
+
     protected double loopOrigFrequency;
     protected int nextEndIndex;
     protected int unswitches;
@@ -133,6 +134,8 @@ public boolean isProtectedNonOverflowingUnsigned() {
 
     @OptionalInput(InputType.Guard) GuardingNode overflowGuard;
 
+    @OptionalInput(InputType.Association) ValueNode precedingLoop;
+
     public static final CounterKey overflowSpeculationTaken = DebugContext.counter("CountedLoops_OverflowSpeculation_Taken");
     public static final CounterKey overflowSpeculationNotTaken = DebugContext.counter("CountedLoops_OverflowSpeculation_NotTaken");
 
@@ -465,6 +468,15 @@ public void setOverflowGuard(GuardingNode overflowGuard) {
         this.overflowGuard = overflowGuard;
     }
 
+    public ValueNode getPrecedingLoop() {
+        return precedingLoop;
+    }
+
+    public void setPrecedingLoop(ValueNode precedingLoop) {
+        updateUsages(this.precedingLoop, precedingLoop);
+        this.precedingLoop = precedingLoop;
+    }
+
     private static final int NO_INCREMENT = Integer.MIN_VALUE;
 
     /**

compiler/src/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/LoopUtility.java

@@ -29,8 +29,16 @@
 import org.graalvm.compiler.graph.Graph.NodeEvent;
 import org.graalvm.compiler.graph.Graph.NodeEventScope;
 import org.graalvm.compiler.nodes.LoopExitNode;
+import org.graalvm.compiler.nodes.NodeView;
 import org.graalvm.compiler.nodes.ProxyNode;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
+import org.graalvm.compiler.nodes.ValuePhiNode;
+import org.graalvm.compiler.nodes.calc.AddNode;
+import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
+import org.graalvm.compiler.nodes.calc.MulNode;
+import org.graalvm.compiler.nodes.loop.BasicInductionVariable;
+import org.graalvm.compiler.nodes.loop.InductionVariable;
 import org.graalvm.compiler.nodes.loop.LoopEx;
 import org.graalvm.compiler.nodes.loop.LoopsData;
 import org.graalvm.compiler.nodes.spi.CoreProviders;
@@ -71,4 +79,21 @@ public static void removeObsoleteProxiesForLoop(LoopEx loop) {
             }
         }
     }
+
+    /**
+     * Advance all of the loop's induction variables by {@code iterations} strides by modifying the
+     * underlying phi's init value.
+     */
+    public static void stepLoopIVs(StructuredGraph graph, LoopEx loop, ValueNode iterations) {
+        for (InductionVariable iv : loop.getInductionVariables().getValues()) {
+            if (!(iv instanceof BasicInductionVariable)) {
+                // Only step basic IVs; this will advance derived IVs automatically.
+                continue;
+            }
+            ValuePhiNode phi = ((BasicInductionVariable) iv).valueNode();
+            ValueNode convertedIterations = IntegerConvertNode.convert(iterations, iv.strideNode().stamp(NodeView.DEFAULT), NodeView.DEFAULT);
+            ValueNode steppedInit = AddNode.create(phi.valueAt(0), MulNode.create(convertedIterations, iv.strideNode(), NodeView.DEFAULT), NodeView.DEFAULT);
+            phi.setValueAt(0, graph.addOrUniqueWithInputs(steppedInit));
+        }
+    }
 }