Merge pull request #6 from ingonyama-zk/feat/add-point-copy

[FEAT]: Add copy points functions
ingonyama-zk · Sep 18, 2023 · 7c37237 · 7c37237
2 parents c314861 + b18f425
commit 7c37237
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/curves/bls12377/ntt_test.go b/curves/bls12377/ntt_test.go
@@ -58,7 +58,7 @@ func TestNttBN254CompareToGnarkDIF(t *testing.T) {
 	copy(nttResult, scalars)
 
 	assert.Equal(t, nttResult, scalars)
-	icicle.Ntt(&nttResult, false, icicle.DIF, 0)
+	icicle.Ntt(&nttResult, false, 0)
 	assert.NotEqual(t, nttResult, scalars)
 
 	domain := fft.NewDomain(uint64(len(scalars)))
@@ -83,7 +83,7 @@ func TestNttBN254CompareToGnarkDIT(t *testing.T) {
 	copy(nttResult, scalars)
 
 	assert.Equal(t, nttResult, scalars)
-	icicle.Ntt(&nttResult, false, icicle.DIT, 0)
+	icicle.Ntt(&nttResult, false, 0)
 	assert.NotEqual(t, nttResult, scalars)
 
 	domain := fft.NewDomain(uint64(len(scalars)))
@@ -108,7 +108,7 @@ func TestINttBN254CompareToGnarkDIT(t *testing.T) {
 	copy(nttResult, scalars)
 
 	assert.Equal(t, nttResult, scalars)
-	icicle.Ntt(&nttResult, true, icicle.DIT, 0)
+	icicle.Ntt(&nttResult, true, 0)
 	assert.NotEqual(t, nttResult, scalars)
 
 	frResScalars := make([]fr.Element, len(frScalars)) // Make a new slice with the same length
@@ -136,7 +136,7 @@ func TestINttBN254CompareToGnarkDIF(t *testing.T) {
 	copy(nttResult, scalars)
 
 	assert.Equal(t, nttResult, scalars)
-	icicle.Ntt(&nttResult, true, icicle.DIF, 0)
+	icicle.Ntt(&nttResult, true, 0)
 	assert.NotEqual(t, nttResult, scalars)
 
 	domain := fft.NewDomain(uint64(len(scalars)))
@@ -160,14 +160,14 @@ func TestNttBN254(t *testing.T) {
 	copy(nttResult, scalars)
 
 	assert.Equal(t, nttResult, scalars)
-	icicle.Ntt(&nttResult, false, icicle.NONE, 0)
+	icicle.Ntt(&nttResult, false, 0)
 	assert.NotEqual(t, nttResult, scalars)
 
 	inttResult := make([]icicle.G1ScalarField, len(nttResult))
 	copy(inttResult, nttResult)
 
 	assert.Equal(t, inttResult, nttResult)
-	icicle.Ntt(&inttResult, true, icicle.NONE, 0)
+	icicle.Ntt(&inttResult, true, 0)
 	assert.Equal(t, inttResult, scalars)
 }
 
@@ -203,7 +203,7 @@ func TestNttBatchBN254(t *testing.T) {
 		nttResultVecOfVec = append(nttResultVecOfVec, clone)
 
 		// Call the ntt_bls12377 function
-		icicle.Ntt(&nttResultVecOfVec[i], false, icicle.NONE, 0)
+		icicle.Ntt(&nttResultVecOfVec[i], false, 0)
 	}
 
 	assert.NotEqual(t, nttBatchResult, scalars)
@@ -227,7 +227,7 @@ func BenchmarkNTT(b *testing.B) {
 			nttResult := make([]icicle.G1ScalarField, len(scalars)) // Make a new slice with the same length
 			copy(nttResult, scalars)
 			for n := 0; n < b.N; n++ {
-				icicle.Ntt(&nttResult, false, icicle.NONE, 0)
+				icicle.Ntt(&nttResult, false, 0)
 			}
 		})
 	}

diff --git a/curves/bn254/gnark.go b/curves/bn254/gnark.go
@@ -15,8 +15,8 @@ import (
 )
 
 type OnDeviceData struct {
-	p    unsafe.Pointer
-	size int
+	P    unsafe.Pointer
+	Size int
 }
 
 func INttOnDevice(scalars_d, twiddles_d, cosetPowers_d unsafe.Pointer, size, sizeBytes int, isCoset bool) unsafe.Pointer {
@@ -35,8 +35,6 @@ func NttOnDevice(scalars_out, scalars_d, twiddles_d, coset_powers_d unsafe.Point
 	}
 
 	icicle.ReverseScalars(scalars_out, size)
-
-	return
 }
 
 func MsmOnDevice(scalars_d, points_d unsafe.Pointer, count int, convert bool) (curve.G1Jac, unsafe.Pointer, error) {
@@ -84,8 +82,6 @@ func PolyOps(a_d, b_d, c_d, den_d unsafe.Pointer, size int) {
 	if ret != 0 {
 		fmt.Print("Vector mult a*den issue")
 	}
-
-	return
 }
 
 func MontConvOnDevice(scalars_d unsafe.Pointer, size int, is_into bool) {
@@ -94,8 +90,6 @@ func MontConvOnDevice(scalars_d unsafe.Pointer, size int, is_into bool) {
 	} else {
 		icicle.FromMontgomery(scalars_d, size)
 	}
-
-	return
 }
 
 func CopyToDevice(scalars []fr.Element, bytes int, copyDone chan unsafe.Pointer) {

diff --git a/curves/bn254/ntt_test.go b/curves/bn254/ntt_test.go
diff --git a/curves/bn254/utils.go b/curves/bn254/utils.go
@@ -2,13 +2,40 @@ package bn254
 
 import (
 	"fmt"
+	"unsafe"
 
 	"github.com/consensys/gnark-crypto/ecc/bn254"
 	"github.com/consensys/gnark-crypto/ecc/bn254/fp"
 	"github.com/consensys/gnark-crypto/ecc/bn254/fr"
 	icicle "github.com/ingonyama-zk/icicle/goicicle/curves/bn254"
+	goicicle "github.com/ingonyama-zk/icicle/goicicle"
 )
 
+func CopyPointsToDevice(points []bn254.G1Affine, pointsBytes int, copyDone chan unsafe.Pointer) {
+	if pointsBytes == 0 {
+		copyDone <- nil
+	} else {
+		devicePtr, _ := goicicle.CudaMalloc(pointsBytes)
+		iciclePoints := BatchConvertFromG1Affine(points)
+		goicicle.CudaMemCpyHtoD[icicle.G1PointAffine](devicePtr, iciclePoints, pointsBytes)
+
+		copyDone <- devicePtr
+	}
+}
+
+func CopyG2PointsToDevice(points []bn254.G2Affine, pointsBytes int, copyDone chan unsafe.Pointer) {
+	if pointsBytes == 0 {
+		copyDone <- nil
+	} else {
+		devicePtr, _ := goicicle.CudaMalloc(pointsBytes)
+		iciclePoints := BatchConvertFromG2Affine(points)
+		goicicle.CudaMemCpyHtoD[icicle.G2PointAffine](devicePtr, iciclePoints, pointsBytes)
+
+		copyDone <- devicePtr
+	}
+}
+
+
 func ScalarToGnarkFr(f *icicle.G1ScalarField) *fr.Element {
 	fb := f.ToBytesLe()
 	var b32 [32]byte