diff --git a/src/main/java/io/deephaven/benchmark/run/SvgSummary.java b/src/main/java/io/deephaven/benchmark/run/SvgSummary.java index 67ee422a..981bb7f4 100644 --- a/src/main/java/io/deephaven/benchmark/run/SvgSummary.java +++ b/src/main/java/io/deephaven/benchmark/run/SvgSummary.java @@ -64,7 +64,7 @@ void summarize() { var platformProp = platformProps.get(lookupName); var benchmark = benchmarks.get(lookupName); if (platformProp != null) - return platformProp.getValue(columnName); + return formatPlatformValue(lookupName, platformProp.getValue(columnName)); if (benchmark != null) return Numbers.formatNumber(benchmark.getValue(columnName)); return "$0"; @@ -103,10 +103,16 @@ private Map readSummaryCsv(URL csv, String sortColumn, boolean isNu private String replacePlatformVars(String str) { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd"); str = str.replace("${run_date}", dtf.format(LocalDateTime.now())); - str = str.replace("${os_name}", "Ubuntu 22.04.1 LTS".toLowerCase().replace(" ", "-")); + str = str.replace("${os_name}", "Ubuntu 22.04.5 LTS".toLowerCase().replace(" ", "-")); return str.replace("${benchmark_count}", "" + benchmarks.size()); } + private String formatPlatformValue(String name, String value) { + if (name.contains(".heap")) + return Numbers.formatBytesToGigs(value); + return value; + } + class RowComparator implements Comparator { final String sortKey; final boolean isNumber; diff --git a/src/main/resources/io/deephaven/benchmark/run/profile/compare-benchmark-summary.template.svg b/src/main/resources/io/deephaven/benchmark/run/profile/compare-benchmark-summary.template.svg index bb5bc1c3..2270f8ae 100644 --- a/src/main/resources/io/deephaven/benchmark/run/profile/compare-benchmark-summary.template.svg +++ b/src/main/resources/io/deephaven/benchmark/run/profile/compare-benchmark-summary.template.svg @@ -123,7 +123,7 @@ Sort${Deephaven Sort=>op_rate}${PyArrow Sort=>op_rate}${Pandas Sort=>op_rate} - * cpu-threads=${deephaven-engine>>available.processors=>value} heap=${deephaven-engine>>java.max.memory=>value} os=${os_name} full-benchmark-set=${benchmark_count} + * cpu-threads=${deephaven-engine>>java.available.processors=>value} heap=${deephaven-engine>>java.max.heap=>value} os=${os_name} full-benchmark-set=${benchmark_count} diff --git a/src/main/resources/io/deephaven/benchmark/run/profile/standard-benchmark-summary.template.svg b/src/main/resources/io/deephaven/benchmark/run/profile/standard-benchmark-summary.template.svg index da305a9c..79e401f5 100644 --- a/src/main/resources/io/deephaven/benchmark/run/profile/standard-benchmark-summary.template.svg +++ b/src/main/resources/io/deephaven/benchmark/run/profile/standard-benchmark-summary.template.svg @@ -125,7 +125,7 @@ AsOfJoin on 2 Columns Matching 1 Row Each${AsOfJoin- Join On 2 Cols -Static=>op_rate}${AsOfJoin- Join On 2 Cols -Inc=>op_rate} - * cpu-threads=${deephaven-engine>>available.processors=>value} heap=${deephaven-engine>>java.max.memory=>value} os=${os_name} full-benchmark-set=${benchmark_count} + * cpu-threads=${deephaven-engine>>java.available.processors=>value} heap=${deephaven-engine>>java.max.heap=>value} os=${os_name} full-benchmark-set=${benchmark_count} diff --git a/src/test/java/io/deephaven/benchmark/run/SvgSummaryTest.java b/src/test/java/io/deephaven/benchmark/run/SvgSummaryTest.java index 49aa240e..31286f1c 100644 --- a/src/test/java/io/deephaven/benchmark/run/SvgSummaryTest.java +++ b/src/test/java/io/deephaven/benchmark/run/SvgSummaryTest.java @@ -39,7 +39,7 @@ public void summarize() throws Exception { Avg By Row114,915,4789,609,994 Median By Row22,309,3482,226,799 - * threads=16 heap=24g os=ubuntu-22.04.1-lts benchmark-count=5 + * threads=16 heap=24g os=ubuntu-22.04.5-lts benchmark-count=5