test: re-enable all benchmarks + parallel benchmark for bootstrapping

tuneinsight · Jan 21, 2025 · aa5a921 · aa5a921
1 parent 9074893
commit aa5a921
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 79 deletions.
diff --git a/circuits/ckks/bootstrapping/evaluator_benchmarks_test.go b/circuits/ckks/bootstrapping/evaluator_benchmarks_test.go
@@ -1,17 +1,12 @@
 package bootstrapping
 
 import (
-	"fmt"
-	"sync"
 	"testing"
 	"time"
 
-	// "time"
-
 	"github.com/stretchr/testify/require"
 
 	"github.com/tuneinsight/lattigo/v6/core/rlwe"
-	"github.com/tuneinsight/lattigo/v6/ring"
 
 	"github.com/tuneinsight/lattigo/v6/schemes/ckks"
 )
@@ -33,81 +28,19 @@ func BenchmarkConcurrentBootstrap(b *testing.B) {
 
 	b.Run(ParamsToString(params, btpParams.LogMaxDimensions().Cols, "Bootstrap/"), func(b *testing.B) {
 		var err error
-		var ctBtp1, ctBtp2 *rlwe.Ciphertext
-		var wg sync.WaitGroup
 		eval, err := NewEvaluator(btpParams, evk)
-		for i := 0; i < b.N; i++ {
-			b.StopTimer()
-			ct1 := ckks.NewCiphertext(params, 1, 0)
-			ct2 := ckks.NewCiphertext(params, 1, 0)
-			b.StartTimer()
-			wg.Add(1)
-			go func(ctIn *rlwe.Ciphertext) {
-				var err error
-				defer wg.Done()
-				ctBtp2, err = eval.Bootstrap(ctIn)
-				require.NoError(b, err)
-			}(ct2)
-			ctBtp1, err = eval.Bootstrap(ct1)
-			require.NoError(b, err)
-			wg.Wait()
-			fmt.Println(ctBtp1.Level(), ctBtp2.Level())
-		}
+		require.NoError(b, err)
+		ct1 := ckks.NewCiphertext(params, 1, 0)
+		b.ResetTimer()
+		b.RunParallel(func(pb *testing.PB) {
+			for pb.Next() {
+				_, err = eval.Bootstrap(ct1)
+			}
+		})
 	})
 
 }
 
-func BenchmarkAlloc(b *testing.B) {
-	b.Skip()
-
-	paramSet := DefaultParametersDense[0]
-
-	params, err := ckks.NewParametersFromLiteral(paramSet.SchemeParams)
-	require.NoError(b, err)
-
-	btpParams, err := NewParametersFromLiteral(params, paramSet.BootstrappingParams)
-	require.Nil(b, err)
-
-	kgen := rlwe.NewKeyGenerator(params)
-	sk := kgen.GenSecretKeyNew()
-
-	evk, _, err := btpParams.GenEvaluationKeys(sk)
-	require.NoError(b, err)
-
-	eval, err := NewEvaluator(btpParams, evk)
-	require.NoError(b, err)
-
-	b.Run("Pool", func(b *testing.B) {
-
-		for i := 0; i < b.N; i++ {
-
-			pol0 := eval.GetBuffQPPool().Get()
-			pol1 := eval.GetBuffQPPool().Get()
-			// pol0 := ringqp.NewPoly()
-			// pol1 := ringqp.NewPoly()
-			tmpCt := rlwe.Ciphertext{}
-			tmpCt.Value = []ring.Poly{pol0.Q, pol1.Q}
-
-			eval.GetBuffQPPool().Put(pol0)
-			eval.GetBuffQPPool().Put(pol1)
-		}
-	})
-	// b.Run("Buff", func(b *testing.B) {
-	//
-	// 	// var err error
-	//
-	// 	for i := 0; i < b.N; i++ {
-	//
-	// 		pol0 := eval.GetBuffQP()[0]
-	// 		pol1 := eval.GetBuffQP()[1]
-	// 		tmpCt := rlwe.Ciphertext{}
-	// 		tmpCt.Value = []ring.Poly{pol0.Q, pol1.Q}
-	//
-	// 		// ScaleDown
-	// 	}
-	// })
-}
-
 func BenchmarkBootstrap(b *testing.B) {
 
 	b.Skip()

diff --git a/core/rlwe/rlwe_benchmark_test.go b/core/rlwe/rlwe_benchmark_test.go
@@ -143,4 +143,12 @@ func benchEvaluator(tc *TestContext, bpw2 int, b *testing.B) {
 			}
 		})
 	}
+
+	b.Run(testString(params, params.MaxLevelQ(), params.MaxLevelP(), bpw2, "Evaluator/BuffQPPool"), func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			pol := eval.BuffQPPool.Get()
+			eval.BuffQPPool.Put(pol)
+		}
+
+	})
 }
diff --git a/schemes/ckks/ckks_benchmarks_test.go b/schemes/ckks/ckks_benchmarks_test.go
@@ -23,8 +23,8 @@ func BenchmarkCKKS(b *testing.B) {
 	default:
 		testParams = []ParametersLiteral{
 			{
-				LogN:            16,
-				LogQ:            []int{50, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40},
+				LogN:            14,
+				LogQ:            []int{50, 40, 40, 40, 40, 40, 40, 40},
 				LogP:            []int{60},
 				LogDefaultScale: 40,
 				RingType:        ring.Standard,
@@ -37,8 +37,8 @@ func BenchmarkCKKS(b *testing.B) {
 		tc := NewTestContext(paramsLiteral)
 
 		for _, testSet := range []func(tc *TestContext, b *testing.B){
-			// benchEncoder,
-			// benchEvaluator,
+			benchEncoder,
+			benchEvaluator,
 			benchEvaluatorParallel,
 		} {
 			testSet(tc, b)