From e7a3e590edabee731e68d5f19d8af14d7b9a83e4 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 21 Sep 2010 14:47:33 -0700 Subject: Reuse DiffPerformanceTest support code to validate algorithms Each algorithm should produce a particular number of results given one of the standard inputs used during the performance tests. To help ensure those tests are accurate, assert that the edit list length is correct. Change-Id: I292f8fde0cec6a60a75ce09e70814a00ca47cb99 Signed-off-by: Shawn O. Pearce --- .../org/eclipse/jgit/diff/DiffPerformanceTest.java | 213 +++++++++++++++++++++ .../jgit/diff/MyersDiffPerformanceTest.java | 213 --------------------- .../tst/org/eclipse/jgit/diff/MyersDiffTest.java | 12 ++ .../org/eclipse/jgit/diff/PatienceDiffTest.java | 28 +-- 4 files changed, 228 insertions(+), 238 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffPerformanceTest.java delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffPerformanceTest.java (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/diff') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffPerformanceTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffPerformanceTest.java new file mode 100644 index 0000000000..17c586f1e0 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffPerformanceTest.java @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2009, Christian Halstrick + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * 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 Eclipse Foundation, Inc. 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. + */ + +package org.eclipse.jgit.diff; + +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.jgit.util.CPUTimeStopWatch; + +/** + * Test cases for the performance of the diff implementation. The tests test + * that the performance of the MyersDiff algorithm is really O(N*D). Means the + * time for computing the diff between a and b should depend on the product of + * a.length+b.length and the number of found differences. The tests compute + * diffs between chunks of different length, measure the needed time and check + * that time/(N*D) does not differ more than a certain factor. + */ +public class DiffPerformanceTest extends TestCase { + private static final long longTaskBoundary = 5000000000L; + + private static final int minCPUTimerTicks = 10; + + private static final int maxFactor = 15; + + private CPUTimeStopWatch stopwatch=CPUTimeStopWatch.createInstance(); + + public class PerfData { + private NumberFormat fmt = new DecimalFormat("#.##E0"); + + public long runningTime; + + public long D; + + public long N; + + private double p1 = -1; + + private double p2 = -1; + + public double perf1() { + if (p1 < 0) + p1 = runningTime / ((double) N * D); + return p1; + } + + public double perf2() { + if (p2 < 0) + p2 = runningTime / ((double) N * D * D); + return p2; + } + + public String toString() { + return ("diffing " + N / 2 + " bytes took " + runningTime + + " ns. N=" + N + ", D=" + D + ", time/(N*D):" + + fmt.format(perf1()) + ", time/(N*D^2):" + fmt +.format(perf2()) + "\n"); + } + } + + public static Comparator getComparator(final int whichPerf) { + return new Comparator() { + public int compare(PerfData o1, PerfData o2) { + double p1 = (whichPerf == 1) ? o1.perf1() : o1.perf2(); + double p2 = (whichPerf == 1) ? o2.perf1() : o2.perf2(); + return (p1 < p2) ? -1 : (p1 > p2) ? 1 : 0; + } + }; + } + + public void test() { + if (stopwatch!=null) { + // run some tests without recording to let JIT do its optimization + test(10000); + test(20000); + test(10000); + test(20000); + + List perfData = new LinkedList(); + perfData.add(test(10000)); + perfData.add(test(20000)); + perfData.add(test(40000)); + perfData.add(test(80000)); + perfData.add(test(160000)); + perfData.add(test(320000)); + perfData.add(test(640000)); + perfData.add(test(1280000)); + + Comparator c = getComparator(1); + double factor = Collections.max(perfData, c).perf1() + / Collections.min(perfData, c).perf1(); + assertTrue( + "minimun and maximum of performance-index t/(N*D) differed too much. Measured factor of " + + factor + + " (maxFactor=" + + maxFactor + + "). Perfdata=<" + perfData.toString() + ">", + factor < maxFactor); + } + } + + /** + * Tests the performance of MyersDiff for texts which are similar (not + * random data). The CPU time is measured and returned. Because of bad + * accuracy of CPU time information the diffs are repeated. During each + * repetition the interim CPU time is checked. The diff operation is + * repeated until we have seen the CPU time clock changed its value at least + * {@link #minCPUTimerTicks} times. + * + * @param characters + * the size of the diffed character sequences. + * @return performance data + */ + private PerfData test(int characters) { + PerfData ret = new PerfData(); + String a = DiffTestDataGenerator.generateSequence(characters, 971, 3); + String b = DiffTestDataGenerator.generateSequence(characters, 1621, 5); + CharArray ac = new CharArray(a); + CharArray bc = new CharArray(b); + CharCmp cmp = new CharCmp(); + int D = 0; + int cpuTimeChanges = 0; + long lastReadout = 0; + long interimTime = 0; + int repetitions = 0; + stopwatch.start(); + while (cpuTimeChanges < minCPUTimerTicks && interimTime < longTaskBoundary) { + D = MyersDiff.INSTANCE.diff(cmp, ac, bc).size(); + repetitions++; + interimTime = stopwatch.readout(); + if (interimTime != lastReadout) { + cpuTimeChanges++; + lastReadout = interimTime; + } + } + ret.runningTime = stopwatch.stop() / repetitions; + ret.N = ac.size() + bc.size(); + ret.D = D; + + return ret; + } + + static class CharArray extends Sequence { + final char[] array; + + public CharArray(String s) { + array = s.toCharArray(); + } + + @Override + public int size() { + return array.length; + } + } + + static class CharCmp extends SequenceComparator { + @Override + public boolean equals(CharArray a, int ai, CharArray b, int bi) { + return a.array[ai] == b.array[bi]; + } + + @Override + public int hash(CharArray seq, int ptr) { + return seq.array[ptr]; + } + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffPerformanceTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffPerformanceTest.java deleted file mode 100644 index a3f9c22e31..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffPerformanceTest.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (C) 2009, Christian Halstrick - * and other copyright owners as documented in the project's IP log. - * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php - * - * 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 Eclipse Foundation, Inc. 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. - */ - -package org.eclipse.jgit.diff; - -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; - -import junit.framework.TestCase; - -import org.eclipse.jgit.util.CPUTimeStopWatch; - -/** - * Test cases for the performance of the diff implementation. The tests test - * that the performance of the MyersDiff algorithm is really O(N*D). Means the - * time for computing the diff between a and b should depend on the product of - * a.length+b.length and the number of found differences. The tests compute - * diffs between chunks of different length, measure the needed time and check - * that time/(N*D) does not differ more than a certain factor. - */ -public class MyersDiffPerformanceTest extends TestCase { - private static final long longTaskBoundary = 5000000000L; - - private static final int minCPUTimerTicks = 10; - - private static final int maxFactor = 15; - - private CPUTimeStopWatch stopwatch=CPUTimeStopWatch.createInstance(); - - public class PerfData { - private NumberFormat fmt = new DecimalFormat("#.##E0"); - - public long runningTime; - - public long D; - - public long N; - - private double p1 = -1; - - private double p2 = -1; - - public double perf1() { - if (p1 < 0) - p1 = runningTime / ((double) N * D); - return p1; - } - - public double perf2() { - if (p2 < 0) - p2 = runningTime / ((double) N * D * D); - return p2; - } - - public String toString() { - return ("diffing " + N / 2 + " bytes took " + runningTime - + " ns. N=" + N + ", D=" + D + ", time/(N*D):" - + fmt.format(perf1()) + ", time/(N*D^2):" + fmt -.format(perf2()) + "\n"); - } - } - - public static Comparator getComparator(final int whichPerf) { - return new Comparator() { - public int compare(PerfData o1, PerfData o2) { - double p1 = (whichPerf == 1) ? o1.perf1() : o1.perf2(); - double p2 = (whichPerf == 1) ? o2.perf1() : o2.perf2(); - return (p1 < p2) ? -1 : (p1 > p2) ? 1 : 0; - } - }; - } - - public void test() { - if (stopwatch!=null) { - // run some tests without recording to let JIT do its optimization - test(10000); - test(20000); - test(10000); - test(20000); - - List perfData = new LinkedList(); - perfData.add(test(10000)); - perfData.add(test(20000)); - perfData.add(test(40000)); - perfData.add(test(80000)); - perfData.add(test(160000)); - perfData.add(test(320000)); - perfData.add(test(640000)); - perfData.add(test(1280000)); - - Comparator c = getComparator(1); - double factor = Collections.max(perfData, c).perf1() - / Collections.min(perfData, c).perf1(); - assertTrue( - "minimun and maximum of performance-index t/(N*D) differed too much. Measured factor of " - + factor - + " (maxFactor=" - + maxFactor - + "). Perfdata=<" + perfData.toString() + ">", - factor < maxFactor); - } - } - - /** - * Tests the performance of MyersDiff for texts which are similar (not - * random data). The CPU time is measured and returned. Because of bad - * accuracy of CPU time information the diffs are repeated. During each - * repetition the interim CPU time is checked. The diff operation is - * repeated until we have seen the CPU time clock changed its value at least - * {@link #minCPUTimerTicks} times. - * - * @param characters - * the size of the diffed character sequences. - * @return performance data - */ - private PerfData test(int characters) { - PerfData ret = new PerfData(); - String a = DiffTestDataGenerator.generateSequence(characters, 971, 3); - String b = DiffTestDataGenerator.generateSequence(characters, 1621, 5); - CharArray ac = new CharArray(a); - CharArray bc = new CharArray(b); - CharCmp cmp = new CharCmp(); - int D = 0; - int cpuTimeChanges = 0; - long lastReadout = 0; - long interimTime = 0; - int repetitions = 0; - stopwatch.start(); - while (cpuTimeChanges < minCPUTimerTicks && interimTime < longTaskBoundary) { - D = MyersDiff.INSTANCE.diff(cmp, ac, bc).size(); - repetitions++; - interimTime = stopwatch.readout(); - if (interimTime != lastReadout) { - cpuTimeChanges++; - lastReadout = interimTime; - } - } - ret.runningTime = stopwatch.stop() / repetitions; - ret.N = ac.size() + bc.size(); - ret.D = D; - - return ret; - } - - private static class CharArray extends Sequence { - final char[] array; - - public CharArray(String s) { - array = s.toCharArray(); - } - - @Override - public int size() { - return array.length; - } - } - - private static class CharCmp extends SequenceComparator { - @Override - public boolean equals(CharArray a, int ai, CharArray b, int bi) { - return a.array[ai] == b.array[bi]; - } - - @Override - public int hash(CharArray seq, int ptr) { - return seq.array[ptr]; - } - } -} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffTest.java index 4df2c5a407..896b0fbccb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/MyersDiffTest.java @@ -43,9 +43,21 @@ package org.eclipse.jgit.diff; +import org.eclipse.jgit.diff.DiffPerformanceTest.CharArray; +import org.eclipse.jgit.diff.DiffPerformanceTest.CharCmp; + public class MyersDiffTest extends AbstractDiffTestCase { @Override protected DiffAlgorithm algorithm() { return MyersDiff.INSTANCE; } + + public void testPerformanceTestDeltaLength() { + String a = DiffTestDataGenerator.generateSequence(40000, 971, 3); + String b = DiffTestDataGenerator.generateSequence(40000, 1621, 5); + CharArray ac = new CharArray(a); + CharArray bc = new CharArray(b); + EditList r = algorithm().diff(new CharCmp(), ac, bc); + assertEquals(131, r.size()); + } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/PatienceDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/PatienceDiffTest.java index 67a4904c6d..de88c2f878 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/PatienceDiffTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/PatienceDiffTest.java @@ -43,6 +43,9 @@ package org.eclipse.jgit.diff; +import org.eclipse.jgit.diff.DiffPerformanceTest.CharArray; +import org.eclipse.jgit.diff.DiffPerformanceTest.CharCmp; + public class PatienceDiffTest extends AbstractDiffTestCase { @Override protected DiffAlgorithm algorithm() { @@ -71,29 +74,4 @@ public class PatienceDiffTest extends AbstractDiffTestCase { EditList r = algorithm().diff(new CharCmp(), ac, bc); assertEquals(25, r.size()); } - - private static class CharArray extends Sequence { - final char[] array; - - public CharArray(String s) { - array = s.toCharArray(); - } - - @Override - public int size() { - return array.length; - } - } - - private static class CharCmp extends SequenceComparator { - @Override - public boolean equals(CharArray a, int ai, CharArray b, int bi) { - return a.array[ai] == b.array[bi]; - } - - @Override - public int hash(CharArray seq, int ptr) { - return seq.array[ptr]; - } - } } -- cgit v1.2.3