update current benchmarks

Author: cruftex

jmh-suite/src/main/java/org/cache2k/benchmark/jmh/suite/eviction/symmetrical/ZipfianSequenceBulkLoadingBenchmark.java

@@ -58,7 +58,7 @@ public class ZipfianSequenceBulkLoadingBenchmark extends BenchmarkBase {
   @Param({"110", "500"})
   public int percent = 0;
 
-  @Param({"100_000", "1000_000"})
+  @Param({"100000", "1000000"})
   public int entryCount = 100_000;
 
   /**
@@ -136,6 +136,7 @@ public void setup() throws Exception {
   public void tearDown() {
     MiscResultRecorderProfiler.addCounter("singleLoaderCalls", source.singleCallCount.longValue());
     MiscResultRecorderProfiler.addCounter("bulkLoaderCalls", source.bulkCallCount.longValue());
+    MiscResultRecorderProfiler.setValue("cacheSize", cache.getSize(), "entries");
     RequestRecorder.recordMissCount(source.bulkMissCount.longValue() + source.singleCallCount.longValue());
     ForcedGcMemoryProfiler.keepReference(this);
     Cache2kMetricsRecorder.recordStatsAfterIteration(cache.toString());

jmh-suite/src/main/java/org/cache2k/benchmark/jmh/suite/eviction/symmetrical/ZipfianSequenceLoadingBenchmark.java

@@ -25,6 +25,7 @@
 import org.cache2k.benchmark.BenchmarkCacheLoader;
 import org.cache2k.benchmark.jmh.BenchmarkBase;
 import org.cache2k.benchmark.jmh.ForcedGcMemoryProfiler;
+import org.cache2k.benchmark.jmh.MiscResultRecorderProfiler;
 import org.cache2k.benchmark.util.ZipfianPattern;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -126,6 +127,7 @@ public void setup() throws Exception {
   @TearDown(Level.Iteration)
   public void tearDown() {
     RequestRecorder.recordMissCount(source.missCount.longValue());
+    MiscResultRecorderProfiler.setValue("cacheSize", cache.getSize(), "entries");
     ForcedGcMemoryProfiler.keepReference(this);
     String statString = cache.toString();
     System.out.println(statString);

processJmhResults.sh

@@ -878,8 +878,21 @@ fi
 (
 header4 "$prods";
 local tmp="$RESULT/tmp-plotOps-$name-$param$tmpext.data"
+# old query: jq -r ".[] |  select (.benchmark | contains (\".${name}\") ) | [ (.threads | tostring) + \"-\" + .params.entryCount + \"-\" + .params.$param, .params.cacheFactory, .primaryMetric.score, .primaryMetric.scoreError, .primaryMetric.scoreConfidence[0], .primaryMetric.scoreConfidence[1]  ] | @csv" | \
+local query=`cat << EOF
+.[] |  select (.benchmark | contains (".${name}") ) |
+  [ (.threads | tostring) +  "-" + .params.entryCount + "-" + .params.$param,
+     .params.cacheFactory,
+     .["secondaryMetrics"]["requests"].score,
+     .["secondaryMetrics"]["requests"].scoreError,
+     .["secondaryMetrics"]["requests"].scoreConfidence[0],
+     .["secondaryMetrics"]["requests"].scoreConfidence[1]
+  ] | @csv
+EOF
+`
+
 test -f "$tmp" || json | \
-    jq -r ".[] |  select (.benchmark | contains (\".${name}\") ) | [ (.threads | tostring) + \"-\" + .params.entryCount + \"-\" + .params.$param, .params.cacheFactory, .primaryMetric.score, .primaryMetric.scoreError, .primaryMetric.scoreConfidence[0], .primaryMetric.scoreConfidence[1]  ] | @csv" | \
+    jq -r "$query" | \
     sort | tr -d '"' | \
     pivot4 $prods | \
     sort -n -t- -k1,1 -k2,2 -k3,3 | shortenParamValues > "$tmp"
@@ -1073,7 +1086,7 @@ for I in $benchmarks; do
 done
 
 # benchmarks with percent parameter
-benchmarks="ZipfianSequenceLoadingBenchmark PrecalculatedZipfianSequenceLoadingBenchmark"
+benchmarks="ZipfianSequenceLoadingBenchmark PrecalculatedZipfianSequenceLoadingBenchmark ZipfianSequenceBulkLoadingBenchmark"
 for I in $benchmarks; do
   noBenchmark $I || {
       plotOps $I percent;