refactor offsetted series benchmark

koron · koron · commit 21f6b4a3615e · 2013-09-24T15:25:13.000+09:00
diff --git a/src/main/java/me/lemire/integercompression/BenchmarkOffsettedSeries.java b/src/main/java/me/lemire/integercompression/BenchmarkOffsettedSeries.java
@@ -13,6 +13,8 @@ public class BenchmarkOffsettedSeries
 {
     public static final int DEFAULT_MEAN = 1 << 20;
     public static final int DEFAULT_RANGE = 1 << 10;
+    public static final int DEFAULT_REPEAT = 10;
+    public static final int DEFAULT_WARMUP = 2;
 
     public BenchmarkOffsettedSeries() {
     }
@@ -26,9 +28,6 @@ public BenchmarkOffsettedSeries() {
      */
     public void run(PrintWriter csvWriter, int count, int length)
     {
-        int[][] data = generateDataChunks(0, count, length,
-                DEFAULT_MEAN, DEFAULT_RANGE);
-
         IntegerCODEC[] codecs = {
             new Composition(new XorBinaryPacking(), new VariableByte()),
             new IntegratedComposition(
@@ -42,28 +41,50 @@ public void run(PrintWriter csvWriter, int count, int length)
 
         csvWriter.format("\"Algorithm\",\"Bits per int\"," +
                 "\"Compress speed (MiS)\",\"Decompress speed (MiS)\"\n");
+
+        int[][] randData = generateDataChunks(0, count, length,
+                DEFAULT_MEAN, DEFAULT_RANGE);
+        benchmark(csvWriter, "Random (mean=2^20 range=2^10)",
+                codecs, randData, DEFAULT_REPEAT, DEFAULT_WARMUP);
+    }
+
+    private void benchmark(
+            PrintWriter csvWriter,
+            String labelPrefix,
+            IntegerCODEC[] codecs,
+            int[][] data,
+            int repeat,
+            int warmup)
+    {
         for (IntegerCODEC codec : codecs) {
-            benchmark(csvWriter, codec.toString(), codec, data);
+            String label = labelPrefix + " - " + codec.toString();
+            for (int i = 0; i < warmup; ++i) {
+                benchmark(null, label, codec, data, repeat);
+            }
+            benchmark(csvWriter, label, codec, data, repeat);
         }
     }
 
     private void benchmark(
             PrintWriter csvWriter,
             String label,
             IntegerCODEC codec,
-            int[][] data)
+            int[][] data,
+            int repeat)
     {
         PerformanceLogger logger = new PerformanceLogger();
 
         int maxLen = getMaxLen(data);
         int[] compressBuffer = new int[4 * maxLen + 1024];
         int[] decompressBuffer = new int[maxLen];
 
-        for (int[] array : data) {
-            int compSize = compress(logger, codec, array, compressBuffer);
-            int decompSize = decompress(logger, codec, compressBuffer,
-                    compSize, decompressBuffer);
-            checkArray(array, decompressBuffer, decompSize, codec);
+        for (int i = 0; i < repeat; ++i) {
+            for (int[] array : data) {
+                int compSize = compress(logger, codec, array, compressBuffer);
+                int decompSize = decompress(logger, codec, compressBuffer,
+                        compSize, decompressBuffer);
+                checkArray(array, decompressBuffer, decompSize, codec);
+            }
         }
 
         if (csvWriter != null) {
@@ -166,7 +187,7 @@ public static void main(String[] args) throws Exception {
                     + csvFile.getName());
             System.out.println();
             BenchmarkOffsettedSeries b = new BenchmarkOffsettedSeries();
-            b.run(writer, 16 * 1024, 1024);
+            b.run(writer, 16 * 1000, 1000);
             System.out.println();
             System.out.println("# Results were written into a CSV file: "
                     + csvFile.getName());
diff --git a/src/main/java/me/lemire/integercompression/PerformanceLogger.java b/src/main/java/me/lemire/integercompression/PerformanceLogger.java
@@ -8,7 +8,7 @@ public final class PerformanceLogger
 {
     public static class Timer {
         private long startNano;
-        private long duration;
+        private long duration = 0;
 
         public Timer() {}
 
@@ -17,7 +17,7 @@ public void start() {
         }
 
         public long end() {
-            return this.duration = System.nanoTime() - this.startNano;
+            return this.duration += System.nanoTime() - this.startNano;
         }
 
         public long getDuration() {
@@ -53,11 +53,15 @@ public double getBitPerInt() {
         return this.compressedSize * 32.0 / this.originalSize;
     }
 
+    private static double getMiS(long size, long nanoTime) {
+        return (size * 1e-6) / (nanoTime * 1.0e-9);
+    }
+
     public double getCompressSpeed() {
-        return originalSize * 1.0e3 / this.compressionTimer.getDuration();
+        return getMiS(this.originalSize, this.compressionTimer.getDuration());
     }
 
     public double getDecompressSpeed() {
-        return originalSize * 1.0e3 / this.decompressionTimer.getDuration();
+        return getMiS(this.originalSize, this.decompressionTimer.getDuration());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public final class PerformanceLogger`
`8`	`8`	`{`
`9`	`9`	`public static class Timer {`
`10`	`10`	`private long startNano;`
`11`		`- private long duration;`
	`11`	`+ private long duration = 0;`
`12`	`12`
`13`	`13`	`public Timer() {}`
`14`	`14`
`@@ -17,7 +17,7 @@ public void start() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public long end() {`
`20`		`- return this.duration = System.nanoTime() - this.startNano;`
	`20`	`+ return this.duration += System.nanoTime() - this.startNano;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public long getDuration() {`
`@@ -53,11 +53,15 @@ public double getBitPerInt() {`
`53`	`53`	`return this.compressedSize * 32.0 / this.originalSize;`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ private static double getMiS(long size, long nanoTime) {`
	`57`	`+ return (size * 1e-6) / (nanoTime * 1.0e-9);`
	`58`	`+ }`
	`59`	`+`
`56`	`60`	`public double getCompressSpeed() {`
`57`		`- return originalSize * 1.0e3 / this.compressionTimer.getDuration();`
	`61`	`+ return getMiS(this.originalSize, this.compressionTimer.getDuration());`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`public double getDecompressSpeed() {`
`61`		`- return originalSize * 1.0e3 / this.decompressionTimer.getDuration();`
	`65`	`+ return getMiS(this.originalSize, this.decompressionTimer.getDuration());`
`62`	`66`	`}`
`63`	`67`	`}`