[Truffle] Re-implement String#sum in Java.

jruby · Mar 13, 2015 · fa10edc · fa10edc · nirvdrum · Mar 13, 2015
1 parent 613dd63
commit fa10edc
Showing 2 changed files with 73 additions and 17 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -6,6 +6,21 @@
  * Eclipse Public License version 1.0
  * GNU General Public License version 2
  * GNU Lesser General Public License version 2.1
+ *
+ * Contains code modified from JRuby's RubyString.java
+ *
+ * Copyright (C) 2001 Alan Moore <alan_moore@gmx.net>
+ * Copyright (C) 2001-2002 Benoit Cerrina <b.cerrina@wanadoo.fr>
+ * Copyright (C) 2001-2004 Jan Arne Petersen <jpetersen@uni-bonn.de>
+ * Copyright (C) 2002-2004 Anders Bengtsson <ndrsbngtssn@yahoo.se>
+ * Copyright (C) 2002-2006 Thomas E Enebo <enebo@acm.org>
+ * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
+ * Copyright (C) 2004 David Corbin <dcorbin@users.sourceforge.net>
+ * Copyright (C) 2005 Tim Azzopardi <tim@tigerfive.com>
+ * Copyright (C) 2006 Miguel Covarrubias <mlcovarrubias@gmail.com>
+ * Copyright (C) 2006 Ola Bini <ola@ologix.com>
+ * Copyright (C) 2007 Nick Sieger <nicksieger@gmail.com>
+ *
  */
 package org.jruby.truffle.nodes.core;
 
@@ -1706,23 +1721,77 @@ public RubyString succBang(RubyString string) {
         }
     }
 
-    @CoreMethod(names = "sum")
+    // String#sum is in Java because without OSR we can't warm up the Rubinius implementation
+
+    @CoreMethod(names = "sum", optional = 1)
     public abstract static class SumNode extends CoreMethodNode {
 
+        @Child private CallDispatchHeadNode addNode;
+        @Child private CallDispatchHeadNode subNode;
+        @Child private CallDispatchHeadNode shiftNode;
+        @Child private CallDispatchHeadNode andNode;
+
         public SumNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            addNode = DispatchHeadNodeFactory.createMethodCall(context);
+            subNode = DispatchHeadNodeFactory.createMethodCall(context);
+            shiftNode = DispatchHeadNodeFactory.createMethodCall(context);
+            andNode = DispatchHeadNodeFactory.createMethodCall(context);
         }
 
         public SumNode(SumNode prev) {
             super(prev);
+            addNode = prev.addNode;
+            subNode = prev.subNode;
+            shiftNode = prev.shiftNode;
+            andNode = prev.andNode;
         }
 
         @Specialization
-        public int sum(RubyString string) {
-            notDesignedForCompilation();
+        public Object sum(VirtualFrame frame, RubyString string, int bits) {
+            return sum(frame, string, (long) bits);
+        }
+
+        @Specialization
+        public Object sum(VirtualFrame frame, RubyString string, long bits) {
+            // Copied from JRuby
 
-            return (int) getContext().toTruffle(getContext().toJRuby(string).sum(getContext().getRuntime().getCurrentContext()));
+            final byte[] bytes = string.getByteList().getUnsafeBytes();
+            int p = string.getByteList().getBegin();
+            final int len = string.getByteList().getRealSize();
+            final int end = p + len;
+
+            if (bits >= 8 * 8) { // long size * bits in byte
+                Object sum = 0;
+                while (p < end) {
+                    //modifyCheck(bytes, len);
+                    sum = addNode.call(frame, sum, "+", null, bytes[p++] & 0xff);
+                }
+                if (bits != 0) {
+                    final Object mod = shiftNode.call(frame, 1, "<<", null, bits);
+                    sum =  andNode.call(frame, sum, "&", null, subNode.call(frame, mod, "-", null, 1));
+                }
+                return sum;
+            } else {
+                long sum = 0;
+                while (p < end) {
+                    //modifyCheck(bytes, len);
+                    sum += bytes[p++] & 0xff;
+                }
+                return bits == 0 ? sum : sum & (1L << bits) - 1L;
+            }
+        }
+
+        @Specialization
+        public Object sum(VirtualFrame frame, RubyString string, UndefinedPlaceholder bits) {
+            return sum(frame, string, 16);
         }
+
+        @Specialization(guards = {"!isInteger(arguments[1])", "!isLong(arguments[1])", "!isUndefinedPlaceholder(arguments[1])"})
+        public Object sum(VirtualFrame frame, RubyString string, Object bits) {
+            return ruby(frame, "sum Rubinius::Type.coerce_to(bits, Fixnum, :to_int)", "bits", bits);
+        }
+
     }
 
     @CoreMethod(names = "to_f")

diff --git a/truffle/src/main/ruby/core/rubinius/common/string.rb b/truffle/src/main/ruby/core/rubinius/common/string.rb
@@ -102,19 +102,6 @@ def slice!(one, two=undefined)
     result
   end
 
-  def sum(bits=16)
-    bits = Rubinius::Type.coerce_to bits, Fixnum, :to_int
-    i = -1
-    sum = 0
-
-    sum += @data[i] while (i += 1) < @num_bytes
-    if bits > 0
-      sum & ((1 << bits) - 1)
-    else
-      sum
-    end
-  end
-
   def to_c
     Complexifier.new(self).convert
   end