Skip to content

refactor: use b.Loop() to simplify the code #5206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinconic merged 1 commit into from
Sep 10, 2025
Merged

refactor: use b.Loop() to simplify the code #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pkg/bmt/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ func benchmarkSHA3(b *testing.B, n int) {
testData := testutil.RandBytesWithSeed(b, 4096, seed)

b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {

for b.Loop() {
if _, err := bmt.Sha3hash(testData[:n]); err != nil {
b.Fatalf("seed %d: %v", seed, err)
}
Expand All @@ -66,8 +66,8 @@ func benchmarkBMTBaseline(b *testing.B, _ int) {
testData := testutil.RandBytesWithSeed(b, 4096, seed)

b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {

for b.Loop() {
eg := new(errgroup.Group)
for j := 0; j < testSegmentCount; j++ {
eg.Go(func() error {
Expand All @@ -92,8 +92,8 @@ func benchmarkBMT(b *testing.B, n int) {
defer pool.Put(h)

b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {

for b.Loop() {
if _, err := syncHash(h, testData[:n]); err != nil {
b.Fatalf("seed %d: %v", seed, err)
}
Expand All @@ -110,8 +110,8 @@ func benchmarkPool(b *testing.B, poolsize int) {
cycles := 100

b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {

for b.Loop() {
eg := new(errgroup.Group)
for j := 0; j < cycles; j++ {
eg.Go(func() error {
Expand All @@ -136,8 +136,8 @@ func benchmarkRefHasher(b *testing.B, n int) {
rbmt := reference.NewRefHasher(swarm.NewHasher(), 128)

b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {

for b.Loop() {
_, err := rbmt.Hash(testData[:n])
if err != nil {
b.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/feeds/epochs/lookup_benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func BenchmarkFinder(b *testing.B) {
} {
names := []string{"sync", "async"}
b.Run(fmt.Sprintf("%s:prefill=%d, latest=%d, now=%d", names[k], prefill, latest, now), func(b *testing.B) {
for n := 0; n < b.N; n++ {
for b.Loop() {
_, _, _, err := finder.At(ctx, int64(now), after)
if err != nil {
b.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/feeds/sequence/lookup_benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func BenchmarkFinder(b *testing.B) {
} {
names := []string{"sync", "async"}
b.Run(fmt.Sprintf("%s:prefill=%d, latest/now=%d", names[k], prefill, now), func(b *testing.B) {
for n := 0; n < b.N; n++ {
for b.Loop() {
_, _, _, err := finder.At(ctx, now, 0)
if err != nil {
b.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/file/pipeline/builder/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func BenchmarkPipeline(b *testing.B) {
100000000, // 100 mb
} {
b.Run(strconv.Itoa(count)+"-bytes", func(b *testing.B) {
for n := 0; n < b.N; n++ {
for b.Loop() {
benchmarkPipeline(b, count)
}
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/file/splitter/splitter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func BenchmarkSplitter(b *testing.B) {
100000000, // 100 mb
} {
b.Run(strconv.Itoa(count)+"-bytes", func(b *testing.B) {
for n := 0; n < b.N; n++ {
for b.Loop() {
benchmarkSplitter(b, count)
}
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/pss/mining_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func BenchmarkWrap(b *testing.B) {
name := fmt.Sprintf("length:%d,depth:%d", c.length, c.depth)
b.Run(name, func(b *testing.B) {
targets := newTargets(c.length, c.depth)
for i := 0; i < b.N; i++ {
for b.Loop() {
if _, err := pss.Wrap(ctx, topic, msg, pubkey, targets); err != nil {
b.Fatal(err)
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/storage/storagetest/benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func maxInt(a int, b int) int {
func doRead(b *testing.B, db storage.Store, g keyGenerator, allowNotFound bool) {
b.Helper()

for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
key := g.Key(i)
item := &obj1{
Id: string(key),
Expand Down Expand Up @@ -269,7 +269,7 @@ func doWrite(b *testing.B, db storage.Store, g entryGenerator) {
b.Helper()

w := newDBWriter(db)
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
if err := w.Put(g.Key(i), g.Value(i)); err != nil {
b.Fatalf("write key '%s': %v", string(g.Key(i)), err)
}
Expand All @@ -280,7 +280,7 @@ func doDelete(b *testing.B, db storage.Store, g keyGenerator) {
b.Helper()

w := newDBWriter(db)
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
if err := w.Delete(g.Key(i)); err != nil {
b.Fatalf("delete key '%s': %v", string(g.Key(i)), err)
}
Expand All @@ -304,7 +304,7 @@ func populate(b *testing.B, db storage.Store) {
func doDeleteChunk(b *testing.B, db storage.ChunkStore, g keyGenerator) {
b.Helper()

for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
addr := swarm.MustParseHexAddress(string(g.Key(i)))
if err := db.Delete(context.Background(), addr); err != nil {
b.Fatalf("delete key '%s': %v", string(g.Key(i)), err)
Expand All @@ -315,7 +315,7 @@ func doDeleteChunk(b *testing.B, db storage.ChunkStore, g keyGenerator) {
func doWriteChunk(b *testing.B, db storage.Putter, g entryGenerator) {
b.Helper()

for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
buf := make([]byte, swarm.HashSize)
if _, err := hex.Decode(buf, g.Key(i)); err != nil {
b.Fatalf("decode value: %v", err)
Expand All @@ -331,7 +331,7 @@ func doWriteChunk(b *testing.B, db storage.Putter, g entryGenerator) {
func doReadChunk(b *testing.B, db storage.ChunkStore, g keyGenerator, allowNotFound bool) {
b.Helper()

for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
key := string(g.Key(i))
addr := swarm.MustParseHexAddress(key)
_, err := db.Get(context.Background(), addr)
Expand Down
8 changes: 4 additions & 4 deletions pkg/storage/storagetest/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ func BenchmarkWriteInBatches(b *testing.B, bs storage.BatchStore) {
g := newSequentialEntryGenerator(b.N)
batch := bs.Batch(context.Background())
resetBenchmark(b)
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
key := g.Key(i)
item := &obj1{
Id: string(key),
Expand All @@ -969,7 +969,7 @@ func BenchmarkWriteInFixedSizeBatches(b *testing.B, bs storage.BatchStore) {
g := newSequentialEntryGenerator(b.N)
writer := newBatchDBWriter(bs)
resetBenchmark(b)
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
writer.Put(g.Key(i), g.Value(i))
}
}
Expand Down Expand Up @@ -1021,7 +1021,7 @@ func BenchmarkDeleteInBatches(b *testing.B, bs storage.BatchStore) {
doWrite(b, bs, g)
resetBenchmark(b)
batch := bs.Batch(context.Background())
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
item := &obj1{
Id: string(g.Key(i)),
}
Expand All @@ -1039,7 +1039,7 @@ func BenchmarkDeleteInFixedSizeBatches(b *testing.B, bs storage.BatchStore) {
doWrite(b, bs, g)
resetBenchmark(b)
writer := newBatchDBWriter(bs)
for i := 0; i < b.N; i++ {
for i := 0; b.Loop(); i++ {
writer.Delete(g.Key(i))
}
}
20 changes: 5 additions & 15 deletions pkg/topology/pslice/pslice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,7 @@ func BenchmarkAdd(b *testing.B) {

addrs := swarm.RandAddresses(b, bins*perBin)

b.ResetTimer()

for n := 0; n < b.N; n++ {
for b.Loop() {
for _, addr := range addrs {
ps.Add(addr)
}
Expand All @@ -450,9 +448,7 @@ func BenchmarkAddBatch(b *testing.B) {

addrs := swarm.RandAddresses(b, bins*perBin)

b.ResetTimer()

for n := 0; n < b.N; n++ {
for b.Loop() {
ps.Add(addrs...)
}
}
Expand All @@ -464,9 +460,7 @@ func BenchmarkRemove(b *testing.B) {
addrs := swarm.RandAddresses(b, bins*perBin)
ps.Add(addrs...)

b.ResetTimer()

for n := 0; n < b.N; n++ {
for b.Loop() {
for _, addr := range addrs {
ps.Remove(addr)
}
Expand All @@ -480,9 +474,7 @@ func BenchmarkEachBin(b *testing.B) {
addrs := swarm.RandAddresses(b, bins*perBin)
ps.Add(addrs...)

b.ResetTimer()

for n := 0; n < b.N; n++ {
for b.Loop() {
_ = ps.EachBin(func(a swarm.Address, u uint8) (stop bool, jumpToNext bool, err error) {
return false, false, nil
})
Expand All @@ -496,9 +488,7 @@ func BenchmarkEachBinRev(b *testing.B) {
addrs := swarm.RandAddresses(b, bins*perBin)
ps.Add(addrs...)

b.ResetTimer()

for n := 0; n < b.N; n++ {
for b.Loop() {
_ = ps.EachBinRev(func(a swarm.Address, u uint8) (stop bool, jumpToNext bool, err error) {
return false, false, nil
})
Expand Down
Loading