Skip to content

Commit 88bf2b9

Browse files
keeghcetkeeghcet
committed
refactor: Use b.Loop() to simplify the code
Signed-off-by: keeghcet <keeghcet@outlook.com>
1 parent 0e8594d commit 88bf2b9

File tree

9 files changed

+30
-40
lines changed

9 files changed

+30
-40
lines changed

‎pkg/bmt/benchmark_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ func benchmarkSHA3(b *testing.B, n int) {
4747
testData := testutil.RandBytesWithSeed(b, 4096, seed)
4848

4949
b.ReportAllocs()
50-
b.ResetTimer()
51-
for i := 0; i < b.N; i++ {
50+
51+
for b.Loop() {
5252
if _, err := bmt.Sha3hash(testData[:n]); err != nil {
5353
b.Fatalf("seed %d: %v", seed, err)
5454
}
@@ -66,8 +66,8 @@ func benchmarkBMTBaseline(b *testing.B, _ int) {
6666
testData := testutil.RandBytesWithSeed(b, 4096, seed)
6767

6868
b.ReportAllocs()
69-
b.ResetTimer()
70-
for i := 0; i < b.N; i++ {
69+
70+
for b.Loop() {
7171
eg := new(errgroup.Group)
7272
for j := 0; j < testSegmentCount; j++ {
7373
eg.Go(func() error {
@@ -92,8 +92,8 @@ func benchmarkBMT(b *testing.B, n int) {
9292
defer pool.Put(h)
9393

9494
b.ReportAllocs()
95-
b.ResetTimer()
96-
for i := 0; i < b.N; i++ {
95+
96+
for b.Loop() {
9797
if _, err := syncHash(h, testData[:n]); err != nil {
9898
b.Fatalf("seed %d: %v", seed, err)
9999
}
@@ -110,8 +110,8 @@ func benchmarkPool(b *testing.B, poolsize int) {
110110
cycles := 100
111111

112112
b.ReportAllocs()
113-
b.ResetTimer()
114-
for i := 0; i < b.N; i++ {
113+
114+
for b.Loop() {
115115
eg := new(errgroup.Group)
116116
for j := 0; j < cycles; j++ {
117117
eg.Go(func() error {
@@ -136,8 +136,8 @@ func benchmarkRefHasher(b *testing.B, n int) {
136136
rbmt := reference.NewRefHasher(swarm.NewHasher(), 128)
137137

138138
b.ReportAllocs()
139-
b.ResetTimer()
140-
for i := 0; i < b.N; i++ {
139+
140+
for b.Loop() {
141141
_, err := rbmt.Hash(testData[:n])
142142
if err != nil {
143143
b.Fatal(err)

‎pkg/feeds/epochs/lookup_benchmark_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func BenchmarkFinder(b *testing.B) {
5858
} {
5959
names := []string{"sync", "async"}
6060
b.Run(fmt.Sprintf("%s:prefill=%d, latest=%d, now=%d", names[k], prefill, latest, now), func(b *testing.B) {
61-
for n := 0; n < b.N; n++ {
61+
for b.Loop() {
6262
_, _, _, err := finder.At(ctx, int64(now), after)
6363
if err != nil {
6464
b.Fatal(err)

‎pkg/feeds/sequence/lookup_benchmark_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func BenchmarkFinder(b *testing.B) {
5454
} {
5555
names := []string{"sync", "async"}
5656
b.Run(fmt.Sprintf("%s:prefill=%d, latest/now=%d", names[k], prefill, now), func(b *testing.B) {
57-
for n := 0; n < b.N; n++ {
57+
for b.Loop() {
5858
_, _, _, err := finder.At(ctx, now, 0)
5959
if err != nil {
6060
b.Fatal(err)

‎pkg/file/pipeline/builder/builder_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func BenchmarkPipeline(b *testing.B) {
140140
100000000, // 100 mb
141141
} {
142142
b.Run(strconv.Itoa(count)+"-bytes", func(b *testing.B) {
143-
for n := 0; n < b.N; n++ {
143+
for b.Loop() {
144144
benchmarkPipeline(b, count)
145145
}
146146
})

‎pkg/file/splitter/splitter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func BenchmarkSplitter(b *testing.B) {
223223
100000000, // 100 mb
224224
} {
225225
b.Run(strconv.Itoa(count)+"-bytes", func(b *testing.B) {
226-
for n := 0; n < b.N; n++ {
226+
for b.Loop() {
227227
benchmarkSplitter(b, count)
228228
}
229229
})

‎pkg/pss/mining_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func BenchmarkWrap(b *testing.B) {
5151
name := fmt.Sprintf("length:%d,depth:%d", c.length, c.depth)
5252
b.Run(name, func(b *testing.B) {
5353
targets := newTargets(c.length, c.depth)
54-
for i := 0; i < b.N; i++ {
54+
for b.Loop() {
5555
if _, err := pss.Wrap(ctx, topic, msg, pubkey, targets); err != nil {
5656
b.Fatal(err)
5757
}

‎pkg/storage/storagetest/benchmark.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func maxInt(a int, b int) int {
227227
func doRead(b *testing.B, db storage.Store, g keyGenerator, allowNotFound bool) {
228228
b.Helper()
229229

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

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

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

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

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

334-
for i := 0; i < b.N; i++ {
334+
for i := 0; b.Loop(); i++ {
335335
key := string(g.Key(i))
336336
addr := swarm.MustParseHexAddress(key)
337337
_, err := db.Get(context.Background(), addr)

‎pkg/storage/storagetest/storage.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ func BenchmarkWriteInBatches(b *testing.B, bs storage.BatchStore) {
950950
g := newSequentialEntryGenerator(b.N)
951951
batch := bs.Batch(context.Background())
952952
resetBenchmark(b)
953-
for i := 0; i < b.N; i++ {
953+
for i := 0; b.Loop(); i++ {
954954
key := g.Key(i)
955955
item := &obj1{
956956
Id: string(key),
@@ -969,7 +969,7 @@ func BenchmarkWriteInFixedSizeBatches(b *testing.B, bs storage.BatchStore) {
969969
g := newSequentialEntryGenerator(b.N)
970970
writer := newBatchDBWriter(bs)
971971
resetBenchmark(b)
972-
for i := 0; i < b.N; i++ {
972+
for i := 0; b.Loop(); i++ {
973973
writer.Put(g.Key(i), g.Value(i))
974974
}
975975
}
@@ -1021,7 +1021,7 @@ func BenchmarkDeleteInBatches(b *testing.B, bs storage.BatchStore) {
10211021
doWrite(b, bs, g)
10221022
resetBenchmark(b)
10231023
batch := bs.Batch(context.Background())
1024-
for i := 0; i < b.N; i++ {
1024+
for i := 0; b.Loop(); i++ {
10251025
item := &obj1{
10261026
Id: string(g.Key(i)),
10271027
}
@@ -1039,7 +1039,7 @@ func BenchmarkDeleteInFixedSizeBatches(b *testing.B, bs storage.BatchStore) {
10391039
doWrite(b, bs, g)
10401040
resetBenchmark(b)
10411041
writer := newBatchDBWriter(bs)
1042-
for i := 0; i < b.N; i++ {
1042+
for i := 0; b.Loop(); i++ {
10431043
writer.Delete(g.Key(i))
10441044
}
10451045
}

‎pkg/topology/pslice/pslice_test.go‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,7 @@ func BenchmarkAdd(b *testing.B) {
435435

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

438-
b.ResetTimer()
439-
440-
for n := 0; n < b.N; n++ {
438+
for b.Loop() {
441439
for _, addr := range addrs {
442440
ps.Add(addr)
443441
}
@@ -450,9 +448,7 @@ func BenchmarkAddBatch(b *testing.B) {
450448

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

453-
b.ResetTimer()
454-
455-
for n := 0; n < b.N; n++ {
451+
for b.Loop() {
456452
ps.Add(addrs...)
457453
}
458454
}
@@ -464,9 +460,7 @@ func BenchmarkRemove(b *testing.B) {
464460
addrs := swarm.RandAddresses(b, bins*perBin)
465461
ps.Add(addrs...)
466462

467-
b.ResetTimer()
468-
469-
for n := 0; n < b.N; n++ {
463+
for b.Loop() {
470464
for _, addr := range addrs {
471465
ps.Remove(addr)
472466
}
@@ -480,9 +474,7 @@ func BenchmarkEachBin(b *testing.B) {
480474
addrs := swarm.RandAddresses(b, bins*perBin)
481475
ps.Add(addrs...)
482476

483-
b.ResetTimer()
484-
485-
for n := 0; n < b.N; n++ {
477+
for b.Loop() {
486478
_ = ps.EachBin(func(a swarm.Address, u uint8) (stop bool, jumpToNext bool, err error) {
487479
return false, false, nil
488480
})
@@ -496,9 +488,7 @@ func BenchmarkEachBinRev(b *testing.B) {
496488
addrs := swarm.RandAddresses(b, bins*perBin)
497489
ps.Add(addrs...)
498490

499-
b.ResetTimer()
500-
501-
for n := 0; n < b.N; n++ {
491+
for b.Loop() {
502492
_ = ps.EachBinRev(func(a swarm.Address, u uint8) (stop bool, jumpToNext bool, err error) {
503493
return false, false, nil
504494
})

0 commit comments

Comments
 (0)