jruby · Oct 30, 2014 · Oct 30, 2014 · Oct 31, 2014 · Oct 31, 2014 · Oct 31, 2014
diff --git a/bench/truffle/regression.rb b/bench/truffle/regression.rb
@@ -0,0 +1,101 @@
+# Copyright © 2004-2013 Brent Fulgham
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#
+#   * Neither the name of "The Computer Language Benchmarks Game" nor the name
+#     of "The Computer Language Shootout Benchmarks" nor the names of its
+#     contributors may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The Computer Language Benchmarks Game
+
+# http://benchmarksgame.alioth.debian.org/
+
+# Contributed by Wesley Moxam
+
+# Modified by Sokolov Yura aka funny_falcon
+
+# http://benchmarksgame.alioth.debian.org/u64q/program.php?test=fannkuchredux&lang=yarv&id=1
+
+def fannkuch(n)
+  p = (0..n).to_a
+  s = p.dup
+  q = p.dup
+  sign = 1
+  sum = maxflips = 0
+  while(true)
+    # flip.
+
+    if (q1 = p[1]) != 1
+      q[0..-1] = p
+      flips = 1
+      until (qq = q[q1]) == 1
+        q[q1] = q1
+        if q1 >= 4
+          i, j = 2, q1 - 1
+          while i < j
+            q[i], q[j] = q[j], q[i]
+            i += 1
+            j -= 1
+          end
+        end
+        q1 = qq
+        flips += 1
+      end
+      sum += sign * flips
+      maxflips = flips if flips > maxflips # New maximum?
+
+    end
+    # Permute.
+
+    if sign == 1
+      # Rotate 1<-2.
+
+      p[1], p[2] = p[2], p[1]
+      sign = -1
+    else
+      # Rotate 1<-2 and 1<-2<-3.
+
+      p[2], p[3] = p[3], p[2]
+      sign = 1
+      i = 3
+      while i <= n && s[i] == 1
+        #return [sum, maxflips] if i == n     # Out of permutations.
+        return sum if i == n
+
+        s[i] = i
+        # Rotate 1<-...<-i+1.
+
+        t = p.delete_at(1)
+        i += 1
+        p.insert(i, t)
+      end
+      s[i] -= 1  if i <= n
+    end
+  end
+end
+
+while true
+  fannkuch(9)
+end
diff --git a/core/src/main/java/org/jruby/ir/passes/OptimizeDynScopesPass.java b/core/src/main/java/org/jruby/ir/passes/OptimizeDynScopesPass.java
@@ -11,11 +11,15 @@
 import org.jruby.ir.operands.Variable;
 import org.jruby.ir.representations.BasicBlock;
 
+import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 
 public class OptimizeDynScopesPass extends CompilerPass {
+    public static List<Class<? extends CompilerPass>> DEPENDENCIES = Arrays.<Class<? extends CompilerPass>>asList(CFGBuilder.class);
+
     @Override
     public String getLabel() {
         return "Optimize Dynamic Scopes";

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -59,6 +59,10 @@ public Object isDefined(VirtualFrame frame) {
         return getContext().makeString("expression");
     }
 
+    public String executeJavaString(VirtualFrame frame) throws UnexpectedResultException {
+        return RubyTypesGen.RUBYTYPES.expectString(execute(frame));
+    }
+
     public RubyArray executeArray(VirtualFrame frame) throws UnexpectedResultException {
         return RubyTypesGen.RUBYTYPES.expectRubyArray(execute(frame));
     }

diff --git a/core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java b/core/src/main/java/org/jruby/truffle/nodes/RubyTypes.java
@@ -36,6 +36,7 @@
                 int.class, //
                 long.class, //
                 double.class, //
+                String.class, // for SymbolCastNode
                 BigInteger.class, //
                 RubyRange.IntegerFixnumRange.class, //
                 RubyRange.LongFixnumRange.class, //
@@ -73,12 +74,6 @@
 
 public class RubyTypes {
 
-	@ImplicitCast
-	public long int2long(int value) {
-		return value;
-	}
-
-
     @ImplicitCast
     public boolean unboxBoolean(RubyTrueClass value) {
         return true;

diff --git a/core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java b/core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
@@ -21,13 +21,13 @@ public class WhenSplatNode extends RubyNode {
 
     @Child protected RubyNode readCaseExpression;
     @Child protected RubyNode splat;
-    @Child protected DispatchHeadNode dispatchThreeEqual;
+    @Child protected DispatchHeadNode dispatchCaseEqual;
 
     public WhenSplatNode(RubyContext context, SourceSection sourceSection, RubyNode readCaseExpression, RubyNode splat) {
         super(context, sourceSection);
         this.readCaseExpression = readCaseExpression;
         this.splat = splat;
-        dispatchThreeEqual = new DispatchHeadNode(context);
+        dispatchCaseEqual = new DispatchHeadNode(context);
     }
 
     @Override
@@ -47,7 +47,7 @@ public boolean executeBoolean(VirtualFrame frame) {
         for (Object value : array.slowToArray()) {
             // TODO(CS): how to cast this to a boolean?
 
-            if ((boolean) dispatchThreeEqual.call(frame, caseExpression, "===", null, value)) {
+            if ((boolean) dispatchCaseEqual.call(frame, caseExpression, "===", null, value)) {
                 return true;
             }
         }

diff --git a/core/src/main/java/org/jruby/truffle/nodes/conversion/ToJavaStringNode.java b/core/src/main/java/org/jruby/truffle/nodes/conversion/ToJavaStringNode.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.nodes.conversion;
+
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyString;
+import org.jruby.truffle.runtime.core.RubySymbol;
+
+@NodeChild(value="child", type=RubyNode.class)
+public abstract class ToJavaStringNode extends RubyNode {
+
+    public ToJavaStringNode(RubyContext context, SourceSection sourceSection) {
+        super(context, sourceSection);
+    }
+
+    public ToJavaStringNode(ToJavaStringNode prev) {
+        super(prev);
+    }
+
+    public abstract String executeJavaString(VirtualFrame frame, Object object);
+
+    // TODO(CS): cache the conversion to a Java String? Or should the user do that themselves?
+
+    @CompilerDirectives.TruffleBoundary
+    @Specialization
+    protected String toJavaString(RubySymbol symbol) {
+        return symbol.toString();
+    }
+
+    @CompilerDirectives.TruffleBoundary
+    @Specialization
+    protected String toJavaString(RubyString string) {
+        return string.toString();
+    }
+
+    @Specialization
+    protected String toJavaString(String string) {
+        return string;
+    }
+
+}
diff --git a/core/src/main/java/org/jruby/truffle/nodes/conversion/ToSymbolNode.java b/core/src/main/java/org/jruby/truffle/nodes/conversion/ToSymbolNode.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.nodes.conversion;
+
+import com.oracle.truffle.api.dsl.NodeChild;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.nodes.RubyNode;
+import org.jruby.truffle.runtime.RubyContext;
+import org.jruby.truffle.runtime.core.RubyString;
+import org.jruby.truffle.runtime.core.RubySymbol;
+
+@NodeChild(value="child", type=RubyNode.class)
+public abstract class ToSymbolNode extends RubyNode {
+
+    public ToSymbolNode(RubyContext context, SourceSection sourceSection) {
+        super(context, sourceSection);
+    }
+
+    public ToSymbolNode(ToSymbolNode prev) {
+        super(prev);
+    }
+
+    public abstract RubySymbol executeRubySymbol(VirtualFrame frame, Object object);
+
+    // TODO(CS): cache the conversion to a symbol? Or should the user do that themselves?
+
+    @Specialization
+    protected RubySymbol toSymbol(RubySymbol symbol) {
+        return symbol;
+    }
+
+    @Specialization
+    protected RubySymbol toSymbol(RubyString string) {
+        return getContext().newSymbol(string.getBytes());
+    }
+
+    @Specialization
+    protected RubySymbol toSymbol(String string) {
+        return getContext().newSymbol(string);
+    }
+
+}
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -507,11 +507,15 @@ public boolean equal(VirtualFrame frame, RubyArray a, RubyArray b) {
             return true;
         }
 
-        // TODO(CS): what to do about all the other cases?
-
         @Specialization
-        public boolean equal(VirtualFrame frame, RubyArray a, RubySymbol b) {
-            return false;
+        public boolean equal(VirtualFrame frame, RubyArray a, Object b) {
+            notDesignedForCompilation();
+
+            if (!(b instanceof RubyArray)) {
+                return false;
+            } else {
+                return equal(frame, a, (RubyArray) b);
+            }
         }
 
     }
@@ -1162,16 +1166,16 @@ public RubyArray concat(RubyArray array, RubyArray other) {
     @CoreMethod(names = "delete", required = 1)
     public abstract static class DeleteNode extends ArrayCoreMethodNode {
 
-        @Child protected DispatchHeadNode threeEqual;
+        @Child protected KernelNodes.SameOrEqualNode equalNode;
 
         public DeleteNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            threeEqual = new DispatchHeadNode(context);
+            equalNode = KernelNodesFactory.SameOrEqualNodeFactory.create(context, sourceSection, new RubyNode[]{null,null});
         }
 
         public DeleteNode(DeleteNode prev) {
             super(prev);
-            threeEqual = prev.threeEqual;
+            equalNode = prev.equalNode;
         }
 
         @Specialization(guards = "isIntegerFixnum")
@@ -1185,9 +1189,7 @@ public Object deleteIntegerFixnum(VirtualFrame frame, RubyArray array, Object va
             for (int n = 0; n < array.getSize(); n++) {
                 final Object stored = store[n];
 
-                // TODO(CS): need a cast node around the dispatch
-
-                if (stored == value || (boolean) threeEqual.call(frame, store[n], "===", null, value)) {
+                if (equalNode.executeSameOrEqual(frame, stored, value)) {
                     found = store[n];
                     continue;
                 }
@@ -1214,9 +1216,7 @@ public Object deleteObject(VirtualFrame frame, RubyArray array, Object value) {
             for (int n = 0; n < array.getSize(); n++) {
                 final Object stored = store[n];
 
-                // TODO(CS): need a cast node around the dispatch
-
-                if (stored == value || (boolean) threeEqual.call(frame, store[n], "===", null, value)) {
+                if (equalNode.executeSameOrEqual(frame, stored, value)) {
                     found = store[n];
                     continue;
                 }
@@ -1737,16 +1737,16 @@ public RubyArray flatten(RubyArray array) {
     @CoreMethod(names = "include?", required = 1)
     public abstract static class IncludeNode extends ArrayCoreMethodNode {
 
-        @Child protected DispatchHeadNode threeEqual;
+        @Child protected KernelNodes.SameOrEqualNode equalNode;
 
         public IncludeNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
-            threeEqual = new DispatchHeadNode(context);
+            equalNode = KernelNodesFactory.SameOrEqualNodeFactory.create(context, sourceSection, new RubyNode[]{null,null});
         }
 
         public IncludeNode(IncludeNode prev) {
             super(prev);
-            threeEqual = prev.threeEqual;
+            equalNode = prev.equalNode;
         }
 
         @Specialization(guards = "isNull")
@@ -1764,7 +1764,7 @@ public boolean includeFixnum(VirtualFrame frame, RubyArray array, Object value)
                 // TODO(CS): cast node around the dispatch
                 notDesignedForCompilation();
 
-                if (stored == value || (boolean) threeEqual.call(frame, store[n], "===", null, value)) {
+                if (equalNode.executeSameOrEqual(frame, stored, value)) {
                     return true;
                 }
             }
@@ -1782,7 +1782,7 @@ public boolean includeObject(VirtualFrame frame, RubyArray array, Object value)
                 // TODO(CS): cast node around the dispatch
                 notDesignedForCompilation();
 
-                if (stored == value || (boolean) threeEqual.call(frame, store[n], "===", null, value)) {
+                if (equalNode.executeSameOrEqual(frame, stored, value)) {
                     return true;
                 }
             }