From 9c1955f59f7d7814637982739602ef9145e2ea46 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Tue, 23 Jun 2020 13:54:33 +0300 Subject: [PATCH 1/3] Fix table formatting with benchmark results --- .../scala/org/apache/spark/benchmark/Benchmark.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/benchmark/Benchmark.scala b/core/src/test/scala/org/apache/spark/benchmark/Benchmark.scala index 9629f5ab1a3dd..72c05a92848ff 100644 --- a/core/src/test/scala/org/apache/spark/benchmark/Benchmark.scala +++ b/core/src/test/scala/org/apache/spark/benchmark/Benchmark.scala @@ -112,11 +112,12 @@ private[spark] class Benchmark( // The results are going to be processor specific so it is useful to include that. out.println(Benchmark.getJVMOSInfo()) out.println(Benchmark.getProcessorName()) - out.printf("%-40s %14s %14s %11s %12s %13s %10s\n", name + ":", "Best Time(ms)", "Avg Time(ms)", "Stdev(ms)", "Rate(M/s)", - "Per Row(ns)", "Relative") - out.println("-" * 120) + val nameLen = Math.max(40, Math.max(name.length, benchmarks.map(_.name.length).max)) + out.printf(s"%-${nameLen}s %14s %14s %11s %12s %13s %10s\n", + name + ":", "Best Time(ms)", "Avg Time(ms)", "Stdev(ms)", "Rate(M/s)", "Per Row(ns)", "Relative") + out.println("-" * (nameLen + 80)) results.zip(benchmarks).foreach { case (result, benchmark) => - out.printf("%-40s %14s %14s %11s %12s %13s %10s\n", + out.printf(s"%-${nameLen}s %14s %14s %11s %12s %13s %10s\n", benchmark.name, "%5.0f" format result.bestMs, "%4.0f" format result.avgMs, From ec4e19efe8f668660a13b77e581a95ec68eda21c Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Tue, 23 Jun 2020 11:07:56 +0000 Subject: [PATCH 2/3] Re-gen /MakeDateTimeBenchmark-jdk11-results.txt --- .../MakeDateTimeBenchmark-jdk11-results.txt | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sql/core/benchmarks/MakeDateTimeBenchmark-jdk11-results.txt b/sql/core/benchmarks/MakeDateTimeBenchmark-jdk11-results.txt index 65faa752b94cb..dc71ba20a922d 100644 --- a/sql/core/benchmarks/MakeDateTimeBenchmark-jdk11-results.txt +++ b/sql/core/benchmarks/MakeDateTimeBenchmark-jdk11-results.txt @@ -1,22 +1,22 @@ -OpenJDK 64-Bit Server VM 11.0.5+10-post-Ubuntu-0ubuntu1.118.04 on Linux 4.15.0-1044-aws +OpenJDK 64-Bit Server VM 11.0.7+10-post-Ubuntu-2ubuntu218.04 on Linux 4.15.0-1063-aws Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz make_date(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative ------------------------------------------------------------------------------------------------------------------------ -prepare make_date() 3204 3323 139 31.2 32.0 1.0X -make_date(2019, 9, 16) 2529 2604 126 39.5 25.3 1.3X -make_date(*, *, *) 5102 5113 10 19.6 51.0 0.6X +prepare make_date() 3214 3373 240 31.1 32.1 1.0X +make_date(2019, 9, 16) 2366 2513 225 42.3 23.7 1.4X +make_date(*, *, *) 4654 4733 102 21.5 46.5 0.7X -OpenJDK 64-Bit Server VM 11.0.5+10-post-Ubuntu-0ubuntu1.118.04 on Linux 4.15.0-1044-aws +OpenJDK 64-Bit Server VM 11.0.7+10-post-Ubuntu-2ubuntu218.04 on Linux 4.15.0-1063-aws Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz -make_timestamp(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative ------------------------------------------------------------------------------------------------------------------------- -prepare make_timestamp() 3484 3513 28 0.3 3484.3 1.0X -make_timestamp(2019, 1, 2, 3, 4, 50.123456) 112 131 17 9.0 111.5 31.2X -make_timestamp(2019, 1, 2, 3, 4, 60.000000) 93 102 10 10.8 92.8 37.6X -make_timestamp(2019, 12, 31, 23, 59, 60.00) 85 88 4 11.8 84.8 41.1X -make_timestamp(*, *, *, 3, 4, 50.123456) 303 308 8 3.3 302.8 11.5X -make_timestamp(*, *, *, *, *, 0) 303 307 3 3.3 302.8 11.5X -make_timestamp(*, *, *, *, *, 60.0) 289 297 8 3.5 289.1 12.1X -make_timestamp(2019, 1, 2, *, *, *) 3576 3585 11 0.3 3576.4 1.0X -make_timestamp(*, *, *, *, *, *) 3610 3618 12 0.3 3610.0 1.0X +make_timestamp(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative +--------------------------------------------------------------------------------------------------------------------------- +prepare make_timestamp() 3420 3459 51 0.3 3420.2 1.0X +make_timestamp(2019, 1, 2, 3, 4, 50.123456) 86 95 11 11.6 86.5 39.5X +make_timestamp(2019, 1, 2, 3, 4, 60.000000) 82 85 2 12.2 82.1 41.7X +make_timestamp(2019, 12, 31, 23, 59, 60.00) 76 82 10 13.2 75.8 45.1X +make_timestamp(*, *, *, 3, 4, 50.123456) 310 313 3 3.2 310.0 11.0X +make_timestamp(*, *, *, *, *, 0) 291 298 8 3.4 290.8 11.8X +make_timestamp(*, *, *, *, *, 60.0) 290 292 3 3.4 290.5 11.8X +make_timestamp(2019, 1, 2, *, *, *) 3555 3566 9 0.3 3555.0 1.0X +make_timestamp(*, *, *, *, *, *) 3594 3605 14 0.3 3593.8 1.0X From f0598b52317be795b54885068174bd00854f6eb4 Mon Sep 17 00:00:00 2001 From: Max Gekk Date: Tue, 23 Jun 2020 11:21:35 +0000 Subject: [PATCH 3/3] Re-gen /MakeDateTimeBenchmark-results.txt --- .../MakeDateTimeBenchmark-results.txt | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sql/core/benchmarks/MakeDateTimeBenchmark-results.txt b/sql/core/benchmarks/MakeDateTimeBenchmark-results.txt index 92bcc4444e60a..8e706ee557ac1 100644 --- a/sql/core/benchmarks/MakeDateTimeBenchmark-results.txt +++ b/sql/core/benchmarks/MakeDateTimeBenchmark-results.txt @@ -1,22 +1,22 @@ -OpenJDK 64-Bit Server VM 1.8.0_232-8u232-b09-0ubuntu1~18.04.1-b09 on Linux 4.15.0-1044-aws +OpenJDK 64-Bit Server VM 1.8.0_252-8u252-b09-1~18.04-b09 on Linux 4.15.0-1063-aws Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz make_date(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative ------------------------------------------------------------------------------------------------------------------------ -prepare make_date() 2920 3239 278 34.3 29.2 1.0X -make_date(2019, 9, 16) 2322 2371 61 43.1 23.2 1.3X -make_date(*, *, *) 4553 4560 6 22.0 45.5 0.6X +prepare make_date() 2917 3180 370 34.3 29.2 1.0X +make_date(2019, 9, 16) 2352 2376 26 42.5 23.5 1.2X +make_date(*, *, *) 4604 4626 19 21.7 46.0 0.6X -OpenJDK 64-Bit Server VM 1.8.0_232-8u232-b09-0ubuntu1~18.04.1-b09 on Linux 4.15.0-1044-aws +OpenJDK 64-Bit Server VM 1.8.0_252-8u252-b09-1~18.04-b09 on Linux 4.15.0-1063-aws Intel(R) Xeon(R) CPU E5-2670 v2 @ 2.50GHz -make_timestamp(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative ------------------------------------------------------------------------------------------------------------------------- -prepare make_timestamp() 3636 3673 38 0.3 3635.7 1.0X -make_timestamp(2019, 1, 2, 3, 4, 50.123456) 94 99 4 10.7 93.8 38.8X -make_timestamp(2019, 1, 2, 3, 4, 60.000000) 68 80 13 14.6 68.3 53.2X -make_timestamp(2019, 12, 31, 23, 59, 60.00) 65 79 19 15.3 65.3 55.7X -make_timestamp(*, *, *, 3, 4, 50.123456) 271 280 14 3.7 270.7 13.4X -make_timestamp(*, *, *, *, *, 0) 255 263 11 3.9 255.5 14.2X -make_timestamp(*, *, *, *, *, 60.0) 254 258 4 3.9 254.2 14.3X -make_timestamp(2019, 1, 2, *, *, *) 3714 3722 8 0.3 3713.9 1.0X -make_timestamp(*, *, *, *, *, *) 3736 3741 6 0.3 3736.3 1.0X +make_timestamp(): Best Time(ms) Avg Time(ms) Stdev(ms) Rate(M/s) Per Row(ns) Relative +--------------------------------------------------------------------------------------------------------------------------- +prepare make_timestamp() 3694 3745 82 0.3 3694.0 1.0X +make_timestamp(2019, 1, 2, 3, 4, 50.123456) 82 90 9 12.2 82.3 44.9X +make_timestamp(2019, 1, 2, 3, 4, 60.000000) 72 77 5 13.9 71.9 51.4X +make_timestamp(2019, 12, 31, 23, 59, 60.00) 67 71 5 15.0 66.8 55.3X +make_timestamp(*, *, *, 3, 4, 50.123456) 273 289 14 3.7 273.2 13.5X +make_timestamp(*, *, *, *, *, 0) 253 256 4 4.0 252.7 14.6X +make_timestamp(*, *, *, *, *, 60.0) 263 273 9 3.8 263.2 14.0X +make_timestamp(2019, 1, 2, *, *, *) 3754 3757 3 0.3 3754.4 1.0X +make_timestamp(*, *, *, *, *, *) 3785 3787 3 0.3 3785.3 1.0X