From 5a529e06c153141e7a2508c0b3c3f5f7a631a188 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 26 Oct 2024 19:45:41 +0200 Subject: [PATCH] crypto/cipher: add small CTR benchmark, remove CFB/OFB benchmarks CFB and OFB are mostly unused, and not a performance target. Updates #39365 Updates #69445 Change-Id: Ice6441e4fee2112a9e72607c63e49dbc50441ba6 Reviewed-on: https://go-review.googlesource.com/c/go/+/621957 Reviewed-by: Roland Shoemaker LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Reviewed-by: Daniel McCarney --- src/crypto/cipher/benchmark_test.go | 32 +++++++++-------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/crypto/cipher/benchmark_test.go b/src/crypto/cipher/benchmark_test.go index eb02cd08c50..181d08c9b14 100644 --- a/src/crypto/cipher/benchmark_test.go +++ b/src/crypto/cipher/benchmark_test.go @@ -86,28 +86,16 @@ func benchmarkAESStream(b *testing.B, mode func(cipher.Block, []byte) cipher.Str const almost1K = 1024 - 5 const almost8K = 8*1024 - 5 -func BenchmarkAESCFBEncrypt1K(b *testing.B) { - benchmarkAESStream(b, cipher.NewCFBEncrypter, make([]byte, almost1K)) -} - -func BenchmarkAESCFBDecrypt1K(b *testing.B) { - benchmarkAESStream(b, cipher.NewCFBDecrypter, make([]byte, almost1K)) -} - -func BenchmarkAESCFBDecrypt8K(b *testing.B) { - benchmarkAESStream(b, cipher.NewCFBDecrypter, make([]byte, almost8K)) -} - -func BenchmarkAESOFB1K(b *testing.B) { - benchmarkAESStream(b, cipher.NewOFB, make([]byte, almost1K)) -} - -func BenchmarkAESCTR1K(b *testing.B) { - benchmarkAESStream(b, cipher.NewCTR, make([]byte, almost1K)) -} - -func BenchmarkAESCTR8K(b *testing.B) { - benchmarkAESStream(b, cipher.NewCTR, make([]byte, almost8K)) +func BenchmarkAESCTR(b *testing.B) { + b.Run("50", func(b *testing.B) { + benchmarkAESStream(b, cipher.NewCTR, make([]byte, 50)) + }) + b.Run("1K", func(b *testing.B) { + benchmarkAESStream(b, cipher.NewCTR, make([]byte, almost1K)) + }) + b.Run("8K", func(b *testing.B) { + benchmarkAESStream(b, cipher.NewCTR, make([]byte, almost8K)) + }) } func BenchmarkAESCBCEncrypt1K(b *testing.B) {