cmd/bent: rename benchmarks-50.toml to benchmarks-100.toml And now it runs 98 benchmarks. (Two from k8s/-cache were just removed because they leak goroutines). These are semi-curated; further review might be useful for determining which ones are just memmove benchmarks. This might fix the automated benchmark runner, might not. Updates #80564. Change-Id: I03f6a2f7976072dde55a5d7e812d3345b6aec5a3 Reviewed-on: https://go-review.googlesource.com/c/benchmarks/+/807020 Reviewed-by: Carlos Amedee <carlos@golang.org> LUCI-TryBot-Result: golang-scoped@luci-project-accounts.iam.gserviceaccount.com <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Junyang Shao <shaojunyang@google.com> Reviewed-by: Cherry Mui <cherryyz@google.com>
diff --git a/cmd/bent/README.md b/cmd/bent/README.md index 7732ce9..6af11c0 100644 --- a/cmd/bent/README.md +++ b/cmd/bent/README.md
@@ -22,7 +22,7 @@ bent -I cp configurations-sample.toml configurations.toml nano configurations.toml # or use your favorite editor -bent -v -N 10 # will run default set of ~50 benchmarks 10 times using supplied configuration(s) +bent -v -N 10 # will run default set of ~100 benchmarks 10 times using supplied configuration(s) ``` The output binaries are placed in subdirectory `testbin`, various
diff --git a/cmd/bent/bent.go b/cmd/bent/bent.go index 14ec62c..816a0f2 100644 --- a/cmd/bent/bent.go +++ b/cmd/bent/bent.go
@@ -63,9 +63,9 @@ var verbose counterFlag -var benchFile = "benchmarks-50.toml" // default list of benchmarks -var confFile = "configurations.toml" // default list of configurations -var suiteFile = "suites.toml" // default list of suites +var benchFile = "benchmarks-100.toml" // default list of benchmarks +var confFile = "configurations.toml" // default list of configurations +var suiteFile = "suites.toml" // default list of suites var container = "" var N = 1 // benchmark repeat count var R = 0 // randomized build/benchmark repeat count @@ -95,7 +95,7 @@ } var copyConfigs = []string{ - "benchmarks-all.toml", "benchmarks-50.toml", "benchmarks-gc.toml", "benchmarks-gcplus.toml", "benchmarks-trial.toml", + "benchmarks-all.toml", "benchmarks-100.toml", "benchmarks-gc.toml", "benchmarks-gcplus.toml", "benchmarks-trial.toml", "configurations-sample.toml", "configurations-gollvm.toml", "configurations-cronjob.toml", "configurations-cmpjob.toml", "configurations-pgo.toml", "configurations-random.toml", "suites.toml", }
diff --git a/cmd/bent/bent_test.go b/cmd/bent/bent_test.go index 746cbfc..0850e16 100644 --- a/cmd/bent/bent_test.go +++ b/cmd/bent/bent_test.go
@@ -58,7 +58,7 @@ } t.Log(string(output)) Cs := []string{"sample", "cronjob", "cmpjob", "gollvm"} - Bs := []string{"all", "50", "gc", "gcplus", "trial"} + Bs := []string{"all", "100", "gc", "gcplus", "trial"} for _, c := range Cs { for _, b := range Bs { cmd = bentCmd(t, "-l", "-C=configurations-"+c+".toml", "-B=benchmarks-"+b+".toml")
diff --git a/cmd/bent/configs/benchmarks-50.toml b/cmd/bent/configs/benchmarks-100.toml similarity index 86% rename from cmd/bent/configs/benchmarks-50.toml rename to cmd/bent/configs/benchmarks-100.toml index 2cd0779..b6d2da1 100644 --- a/cmd/bent/configs/benchmarks-50.toml +++ b/cmd/bent/configs/benchmarks-100.toml
@@ -1,10 +1,10 @@ -# A sample of about 50 different benchmark runs, not noisy, run quickly enough, +# A sample of about 100 different benchmark runs, not noisy, run quickly enough, # that appear to be somewhat diverse. [[Benchmarks]] Name = "wazero" - Benchmarks = "BenchmarkInvocation/interpreter/(string_manipulation_size_50|fib_for_20|random_mat_mul_size_20)|BenchmarkCompilation/without" + Benchmarks = "BenchmarkInvocation/interpreter/(string_manipulation_size_50|random_mat_mul_size_20)|BenchmarkCompilation/without" [[Benchmarks]] Name = "toml" @@ -46,7 +46,7 @@ [[Benchmarks]] Name = "ethereum_ethash" - Benchmarks = "BenchmarkDifficultyCalculator/big-homestead-16" + Benchmarks = "BenchmarkDifficultyCalculator/big-homestead" [[Benchmarks]] Name = "ethereum_sha3" @@ -86,15 +86,15 @@ [[Benchmarks]] Name = "k8s_cache" - Benchmarks = "Benchmark[^S]" # BenchmarkSharedIndexInformer spawns an non-exiting goroutine + Benchmarks = "Benchmark([^SELIA]|Listener|Lister_Match_1[^_]*_1[^_]*)" # SharedIndexInformer spawns an non-exiting goroutine, AddSlowListeners leaks a thread. [[Benchmarks]] Name = "k8s_workqueue" - Benchmarks = "BenchmarkParallelizeUntil" # DelayingQueue is noisy + Benchmarks = "BenchmarkParallelizeUntil/(pieces:999,workers:10,chunkSize:13|pieces:1000,workers:10,chunkSize:1)" # DelayingQueue is noisy [[Benchmarks]] Name = "uuid" - Benchmarks = "Benchmark" + Benchmarks = "Benchmark([^P]|ParseBytesCopy)" [[Benchmarks]] Name = "gonum_topo" @@ -122,7 +122,7 @@ [[Benchmarks]] Name = "uber_zap" - Benchmarks = "Benchmark" + Benchmarks = "Benchmark([^MSBT]|Standard)" [[Benchmarks]] Name = "uber_tally" @@ -155,7 +155,7 @@ [[Benchmarks]] Name = "benhoyt_goawk" - Benchmarks = "BenchmarkR" + Benchmarks = "Benchmark(Re[^p]|Repeat[^N])" [[Benchmarks]] Name = "ericlagergren_decimal"
diff --git a/cmd/bent/scripts/make_assets b/cmd/bent/scripts/make_assets index 44a0603..7dfe9c7 100755 --- a/cmd/bent/scripts/make_assets +++ b/cmd/bent/scripts/make_assets
@@ -1,2 +1,2 @@ #!/bin/bash -go-bindata -o assets.go foo memprofile cpuprofile tmpclr benchtime benchsize benchdwarf cronjob.sh cmpjob.sh cmpcl.sh cmpcl-phase.sh tweet-results benchmarks-{all,50,gc,gcplus,trial}.toml configurations-{sample,gollvm,cronjob,cmpjob}.toml +go-bindata -o assets.go foo memprofile cpuprofile tmpclr benchtime benchsize benchdwarf cronjob.sh cmpjob.sh cmpcl.sh cmpcl-phase.sh tweet-results benchmarks-{all,100,gc,gcplus,trial}.toml configurations-{sample,gollvm,cronjob,cmpjob}.toml