[GR-19220] Significantly improved performance of Time#strftime for common formats (#2361)

PullRequest: truffleruby/2682

Author: eregon

CHANGELOG.md

@@ -42,6 +42,7 @@ Performance:
 * Improved the performance of the exceptional case of `String#chr` (#2318, @chrisseaton).
 * Improved the performance of `IO#read_nonblock` when no data is available to be read.
 * `TruffleSafepoint` is now used instead of custom logic, which no longer invalidates JITed code for guest safepoints (e.g., `Thread#{backtrace,raise,kill}`, `ObjectSpace`, etc)
+* Significantly improved performance of `Time#strftime` for common formats (#2361, @wildmaples, @chrisseaton).
 
 Changes:
 

spec/ruby/library/datetime/strftime_spec.rb

@@ -1,3 +1,4 @@
+require_relative '../../spec_helper'
 require 'date'
 require_relative '../../shared/time/strftime_for_date'
 require_relative '../../shared/time/strftime_for_time'

spec/ruby/shared/time/strftime_for_time.rb

@@ -170,4 +170,12 @@
     time.strftime("%-k%p").should == "8AM"
     time.strftime("%-l%p").should == "8AM"
   end
+
+  it "should be able to show default Logger format" do
+    default_logger_format = "%Y-%m-%dT%H:%M:%S.%6N "
+    @new_time[2001, 2, 3, 4, 5, 6].strftime(default_logger_format).should == "2001-02-03T04:05:06.000000 "
+    @new_time[2001, 12, 3, 4, 5, 6 + 1/10r].strftime(default_logger_format).should == "2001-12-03T04:05:06.100000 "
+    @new_time[2001, 2, 13, 4, 5, 6 + 1/100r].strftime(default_logger_format).should == "2001-02-13T04:05:06.010000 "
+    @new_time[2001, 2, 3, 14, 5, 6 + 1/1000r].strftime(default_logger_format).should == "2001-02-03T14:05:06.001000 "
+  end
 end

src/main/java/org/truffleruby/core/rope/LazyIntRope.java

@@ -24,7 +24,7 @@ public LazyIntRope(int value) {
         this(value, USASCIIEncoding.INSTANCE, length(value));
     }
 
-    protected LazyIntRope(int value, Encoding encoding, int length) {
+    public LazyIntRope(int value, Encoding encoding, int length) {
         super(encoding, CodeRange.CR_7BIT, length, length, null);
         this.value = value;
         assert Integer.toString(value).length() == length;

src/main/java/org/truffleruby/core/rope/LeafRope.java

@@ -22,9 +22,4 @@ public byte getByteSlow(int index) {
         return getRawBytes()[index];
     }
 
-    public LeafRope computeHashCode() {
-        hashCode();
-        return this;
-    }
-
 }

src/main/java/org/truffleruby/core/rope/RopeBuilder.java

@@ -62,11 +62,11 @@ public void append(Rope other) {
         append(other.getBytes());
     }
 
-    public Rope toRope() {
+    public ManagedRope toRope() {
         return toRope(CR_UNKNOWN);
     }
 
-    public Rope toRope(CodeRange codeRange) {
+    public ManagedRope toRope(CodeRange codeRange) {
         // TODO CS 17-Jan-16 can we take the bytes from the RopeBuilder and set its bytes to null so it can't use them again
         return RopeOperations.create(getBytes(), encoding, codeRange);
     }

src/main/java/org/truffleruby/core/rope/RopeConstants.java

@@ -18,35 +18,36 @@
 
 public class RopeConstants {
 
+    public static final Map<String, LeafRope> ROPE_CONSTANTS = new HashMap<>();
+
     public static final byte[] EMPTY_BYTES = new byte[0];
 
-    public static final LeafRope EMPTY_ASCII_8BIT_ROPE = new AsciiOnlyLeafRope(EMPTY_BYTES, ASCIIEncoding.INSTANCE)
-            .computeHashCode();
-    public static final LeafRope EMPTY_US_ASCII_ROPE = new AsciiOnlyLeafRope(EMPTY_BYTES, USASCIIEncoding.INSTANCE)
-            .computeHashCode();
-    public static final LeafRope EMPTY_UTF8_ROPE = new AsciiOnlyLeafRope(EMPTY_BYTES, UTF8Encoding.INSTANCE)
-            .computeHashCode();
+    public static final LeafRope EMPTY_ASCII_8BIT_ROPE = withHashCode(
+            new AsciiOnlyLeafRope(EMPTY_BYTES, ASCIIEncoding.INSTANCE));
+    public static final LeafRope EMPTY_US_ASCII_ROPE = withHashCode(
+            new AsciiOnlyLeafRope(EMPTY_BYTES, USASCIIEncoding.INSTANCE));
+    public static final LeafRope EMPTY_UTF8_ROPE = withHashCode(
+            new AsciiOnlyLeafRope(EMPTY_BYTES, UTF8Encoding.INSTANCE));
 
     public static final LeafRope[] UTF8_SINGLE_BYTE_ROPES = new LeafRope[256];
     public static final LeafRope[] US_ASCII_SINGLE_BYTE_ROPES = new LeafRope[256];
     public static final LeafRope[] ASCII_8BIT_SINGLE_BYTE_ROPES = new LeafRope[256];
-    static final Map<String, LeafRope> ROPE_CONSTANTS = new HashMap<>();
 
     static {
         for (int i = 0; i < 128; i++) {
             final byte[] bytes = new byte[]{ (byte) i };
 
-            UTF8_SINGLE_BYTE_ROPES[i] = new AsciiOnlyLeafRope(bytes, UTF8Encoding.INSTANCE).computeHashCode();
-            US_ASCII_SINGLE_BYTE_ROPES[i] = new AsciiOnlyLeafRope(bytes, USASCIIEncoding.INSTANCE).computeHashCode();
-            ASCII_8BIT_SINGLE_BYTE_ROPES[i] = new AsciiOnlyLeafRope(bytes, ASCIIEncoding.INSTANCE).computeHashCode();
+            UTF8_SINGLE_BYTE_ROPES[i] = withHashCode(new AsciiOnlyLeafRope(bytes, UTF8Encoding.INSTANCE));
+            US_ASCII_SINGLE_BYTE_ROPES[i] = withHashCode(new AsciiOnlyLeafRope(bytes, USASCIIEncoding.INSTANCE));
+            ASCII_8BIT_SINGLE_BYTE_ROPES[i] = withHashCode(new AsciiOnlyLeafRope(bytes, ASCIIEncoding.INSTANCE));
         }
 
         for (int i = 128; i < 256; i++) {
             final byte[] bytes = new byte[]{ (byte) i };
 
-            UTF8_SINGLE_BYTE_ROPES[i] = new InvalidLeafRope(bytes, UTF8Encoding.INSTANCE, 1).computeHashCode();
-            US_ASCII_SINGLE_BYTE_ROPES[i] = new InvalidLeafRope(bytes, USASCIIEncoding.INSTANCE, 1).computeHashCode();
-            ASCII_8BIT_SINGLE_BYTE_ROPES[i] = new ValidLeafRope(bytes, ASCIIEncoding.INSTANCE, 1).computeHashCode();
+            UTF8_SINGLE_BYTE_ROPES[i] = withHashCode(new InvalidLeafRope(bytes, UTF8Encoding.INSTANCE, 1));
+            US_ASCII_SINGLE_BYTE_ROPES[i] = withHashCode(new InvalidLeafRope(bytes, USASCIIEncoding.INSTANCE, 1));
+            ASCII_8BIT_SINGLE_BYTE_ROPES[i] = withHashCode(new ValidLeafRope(bytes, ASCIIEncoding.INSTANCE, 1));
         }
     }
 
@@ -109,7 +110,7 @@ private static Rope ascii(String string) {
             return US_ASCII_SINGLE_BYTE_ROPES[string.charAt(0)];
         } else {
             final byte[] bytes = RopeOperations.encodeAsciiBytes(string);
-            final LeafRope rope = new AsciiOnlyLeafRope(bytes, USASCIIEncoding.INSTANCE).computeHashCode();
+            final LeafRope rope = withHashCode(new AsciiOnlyLeafRope(bytes, USASCIIEncoding.INSTANCE));
             final Rope existing = ROPE_CONSTANTS.putIfAbsent(string, rope);
             if (existing != null) {
                 throw new AssertionError("Duplicate Rope in RopeConstants: " + existing);
@@ -126,4 +127,50 @@ public static LeafRope lookupUSASCII(String string) {
         }
     }
 
+    private static final LeafRope[] PADDED_NUMBERS = createPaddedNumbersTable();
+
+    private static LeafRope[] createPaddedNumbersTable() {
+        final LeafRope[] table = new LeafRope[100];
+
+        for (int n = 0; n < table.length; n++) {
+            table[n] = new AsciiOnlyLeafRope(
+                    new byte[]{ (byte) ('0' + n / 10), (byte) ('0' + n % 10) },
+                    UTF8Encoding.INSTANCE);
+        }
+
+        return table;
+    }
+
+    /*** Zero-padded numbers in the format %02d, between 00 and 99. */
+    public static LeafRope paddedNumber(int n) {
+        return PADDED_NUMBERS[n];
+    }
+
+    private static final LeafRope[] PADDING_ZEROS = createPaddingZeroTable();
+
+    private static LeafRope[] createPaddingZeroTable() {
+        final LeafRope[] table = new LeafRope[6];
+
+        for (int n = 0; n < table.length; n++) {
+            final byte[] bytes = new byte[n];
+
+            for (int i = 0; i < bytes.length; i++) {
+                bytes[i] = '0';
+            }
+
+            table[n] = new AsciiOnlyLeafRope(bytes, UTF8Encoding.INSTANCE);
+        }
+
+        return table;
+    }
+
+    public static LeafRope paddingZeros(int n) {
+        return PADDING_ZEROS[n];
+    }
+
+    private static <T> T withHashCode(T object) {
+        object.hashCode();
+        return object;
+    }
+
 }

src/main/java/org/truffleruby/core/rope/RopeNodes.java

@@ -828,7 +828,7 @@ protected Object debugPrintRepeatingRope(RepeatingRope rope, int currentLevel, b
             final boolean bytesAreNull = rope.getRawBytes() == null;
 
             System.err.println(String.format(
-                    "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; T: %d; D: %d; E: %s)",
+                    "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; T: %d; E: %s)",
                     printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,
@@ -852,7 +852,7 @@ protected Object debugPrintLazyInt(LazyIntRope rope, int currentLevel, boolean p
             final boolean bytesAreNull = rope.getRawBytes() == null;
 
             System.err.println(String.format(
-                    "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; V: %d, D: %d; E: %s)",
+                    "%s (%s; BN: %b; BL: %d; CL: %d; CR: %s; V: %d, E: %s)",
                     printString ? RopeOperations.escape(rope) : "<skipped>",
                     rope.getClass().getSimpleName(),
                     bytesAreNull,

src/main/java/org/truffleruby/core/rope/TruffleRopesNodes.java

@@ -76,9 +76,7 @@ protected Object debugPrint(Object string, boolean printString,
             System.err.println("CR = Code Range");
             System.err.println("O = Byte Offset (SubstringRope only)");
             System.err.println("T = Times (RepeatingRope only)");
-            System.err.println("D = Depth");
-            System.err.println("LD = Left Depth (ConcatRope only)");
-            System.err.println("RD = Right Depth (ConcatRope only)");
+            System.err.println("V = Value (LazyIntRope only)");
             System.err.println("E = Encoding");
             System.err.println("P = Native Pointer (NativeRope only)");
             System.err.println("S = Native Size (NativeRope only)");