From 71bf7b43380eb445973f32a7f789d9670f8cc97d Mon Sep 17 00:00:00 2001 From: Aart Bik Date: Wed, 16 Nov 2016 10:17:46 -0800 Subject: Optimizations around escape analysis. With tests. Details: (1) added new intrinsics (2) implemented optimizations more !can be null information more null check removals replace return-this uses with incoming parameter remove dead StringBuffer/Builder calls (with escape analysis) (3) Fixed exposed bug in CanBeMoved() Performance gain: This improves CafeineString by about 360% (removes null check from first loop, eliminates second loop completely) Test: test-art-host Change-Id: Iaf16a1b9cab6a7386f43d71c6b51dd59600e81c1 --- test/624-checker-stringops/src/Main.java | 168 +++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) (limited to 'test/624-checker-stringops/src/Main.java') diff --git a/test/624-checker-stringops/src/Main.java b/test/624-checker-stringops/src/Main.java index 34e82831a8..d965e3ffce 100644 --- a/test/624-checker-stringops/src/Main.java +++ b/test/624-checker-stringops/src/Main.java @@ -98,9 +98,170 @@ public class Main { return k; } + // + // Allows combining of returned "this". Also ensures that similar looking append() calls + // are not combined somehow through returned result. + // + /// CHECK-START: int Main.bufferLen2() instruction_simplifier (before) + /// CHECK-DAG: <> NewInstance + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> NullCheck [<>] + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend + /// CHECK-DAG: <> NullCheck [<>] + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBufferLength + // + /// CHECK-START: int Main.bufferLen2() instruction_simplifier (after) + /// CHECK-DAG: <> NewInstance + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBufferLength + static int bufferLen2() { + StringBuffer s = new StringBuffer(); + return s.append("x").append("x").length(); + } + + // + // Allows combining of returned "this". Also ensures that similar looking append() calls + // are not combined somehow through returned result. + // + /// CHECK-START: int Main.builderLen2() instruction_simplifier (before) + /// CHECK-DAG: <> NewInstance + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> NullCheck [<>] + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend + /// CHECK-DAG: <> NullCheck [<>] + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBuilderLength + // + /// CHECK-START: int Main.builderLen2() instruction_simplifier (after) + /// CHECK-DAG: <> NewInstance + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend + /// CHECK-DAG: <> LoadString + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBuilderLength + static int builderLen2() { + StringBuilder s = new StringBuilder(); + return s.append("x").append("x").length(); + } + + // + // Similar situation in a loop. + // + /// CHECK-START: int Main.bufferLoopAppender() instruction_simplifier (before) + /// CHECK-DAG: <> NewInstance loop:none + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:none + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBufferLength loop:none + // + /// CHECK-START: int Main.bufferLoopAppender() instruction_simplifier (after) + /// CHECK-DAG: <> NewInstance loop:none + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBufferAppend loop:<> + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBufferLength loop:none + static int bufferLoopAppender() { + StringBuffer b = new StringBuffer(); + for (int i = 0; i < 10; i++) { + b.append("x").append("y").append("z"); + } + return b.length(); + } + + // + // Similar situation in a loop. + // + /// CHECK-START: int Main.builderLoopAppender() instruction_simplifier (before) + /// CHECK-DAG: <> NewInstance loop:none + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: <> NullCheck [<>] loop:none + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBuilderLength loop:none + // + /// CHECK-START: int Main.builderLoopAppender() instruction_simplifier (after) + /// CHECK-DAG: <> NewInstance loop:none + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: <> LoadString loop:<> + /// CHECK-DAG: <> InvokeVirtual [<>,<>] intrinsic:StringBuilderAppend loop:<> + /// CHECK-DAG: InvokeVirtual [<>] intrinsic:StringBuilderLength loop:none + static int builderLoopAppender() { + StringBuilder b = new StringBuilder(); + for (int i = 0; i < 10; i++) { + b.append("x").append("y").append("z"); + } + return b.length(); + } + + // + // All calls in the loop-body and thus loop can be eliminated. + // + /// CHECK-START: int Main.bufferDeadLoop() instruction_simplifier (before) + /// CHECK-DAG: Phi loop:<> + /// CHECK-DAG: InvokeVirtual intrinsic:StringBufferToString loop:<> + /// CHECK-DAG: InvokeVirtual intrinsic:StringStringIndexOfAfter loop:<> + // + /// CHECK-START: int Main.bufferDeadLoop() loop_optimization (after) + /// CHECK-NOT: Phi + /// CHECK-NOT: InvokeVirtual intrinsic:StringBufferToString + /// CHECK-NOT: InvokeVirtual intrinsic:StringStringIndexOfAfter + static int bufferDeadLoop() { + StringBuffer b = new StringBuffer(); + for (int i = 0; i < 10; i++) { + int d = b.toString().indexOf("x", 1); + } + return b.length(); + } + + // + // All calls in the loop-body and thus loop can be eliminated. + // + /// CHECK-START: int Main.builderDeadLoop() instruction_simplifier (before) + /// CHECK-DAG: Phi loop:<> + /// CHECK-DAG: InvokeVirtual intrinsic:StringBuilderToString loop:<> + /// CHECK-DAG: InvokeVirtual intrinsic:StringStringIndexOfAfter loop:<> + // + /// CHECK-START: int Main.builderDeadLoop() loop_optimization (after) + /// CHECK-NOT: Phi + /// CHECK-NOT: InvokeVirtual intrinsic:StringBuilderToString + /// CHECK-NOT: InvokeVirtual intrinsic:StringStringIndexOfAfter + static int builderDeadLoop() { + StringBuilder b = new StringBuilder(); + for (int i = 0; i < 10; i++) { + int d = b.toString().indexOf("x", 1); + } + return b.length(); + } + public static void main(String[] args) { expectEquals(1865, liveIndexOf()); expectEquals(29, deadIndexOf()); + try { indexOfExceptions(null, XYZ); throw new Error("Expected: NPE"); @@ -113,6 +274,13 @@ public class Main { } expectEquals(598, indexOfExceptions(ABC, XYZ)); + expectEquals(2, bufferLen2()); + expectEquals(2, builderLen2()); + expectEquals(30, bufferLoopAppender()); + expectEquals(30, builderLoopAppender()); + expectEquals(0, bufferDeadLoop()); + expectEquals(0, builderDeadLoop()); + System.out.println("passed"); } -- cgit v1.2.3-59-g8ed1b