Skip to content
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

Poseidon2 perf improvement #758

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+954 −841
Open

Poseidon2 perf improvement #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1982389
Poseidon2 perf improvement
danny-shterman Feb 6, 2025
87e376c
Fixed sponge and padding
danny-shterman Feb 12, 2025
71f6b95
fix golang test
danny-shterman Feb 12, 2025
50208aa
generate sponge tests
danny-shterman Feb 12, 2025
06035e3
Fixed sponge padding
danny-shterman Feb 15, 2025
60e881e
Merge branch 'main' into danny/poseidon1_improvement1
LeonHibnik Feb 16, 2025
6d19d88
Fixed test for large fields.
danny-shterman Feb 16, 2025
768c29b
Fixed comments.
danny-shterman Feb 17, 2025
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
6 changes: 3 additions & 3 deletions icicle/backend/cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ macro(message)
endmacro()
FetchContent_Declare(
Taskflow
GIT_REPOSITORY https://github.com/taskflow/taskflow.git
GIT_TAG v3.8.0
GIT_SHALLOW TRUE
GIT_REPOSITORY https://github.com/taskflow/taskflow.git
danny-shterman marked this conversation as resolved.
Show resolved Hide resolved
GIT_TAG v3.8.0
GIT_SHALLOW TRUE
)
# Disable unnecessary components
set(TF_BUILD_BENCHMARKS OFF CACHE BOOL "Disable Taskflow benchmarks" FORCE)
Expand Down
663 changes: 351 additions & 312 deletions icicle/backend/cpu/src/hash/cpu_poseidon2.cpp
View file
Open in desktop

Large diffs are not rendered by default.

471 changes: 258 additions & 213 deletions icicle/tests/test_hash_api.cpp
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 37 additions & 34 deletions wrappers/golang/curves/bls12377/tests/poseidon2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,42 @@ func testPoseidon2Hash(s *suite.Suite) {
}
}

// TODO uncomment once Poseidon2 sponge function is ready
// func testPoseidon2HashSponge(s *suite.Suite) {
// for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// inputs := bls12_377.GenerateScalars(t*8 - 2)
// var noDomainTag *bls12_377.ScalarField
//
// // Set device to CPU
// test_helpers.ActivateReferenceDevice()
// outputsRef := make([]bls12_377.ScalarField, 1)
// poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), noDomainTag)
// err := poseidon2HasherRef.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsRef),
// core.GetDefaultHashConfig(),
// )
//
// poseidonHasherRef.Delete()
//
// // Set device to main
// test_helpers.ActivateMainDevice()
// outputsMain := make([]bls12_377.ScalarField, 1)
// poseidonHasherMain, _ := poseidon.NewHasher(uint64(t), noDomainTag)
// poseidonHasherMain.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsMain),
// core.GetDefaultHashConfig(),
// )
//
// poseidon2HasherMain.Delete()
//
// s.Equal(runtime.InvalidArgument, err)
// }
// }
func testPoseidon2HashSponge(s *suite.Suite) {
for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// TODO Danny add 8, 12, 16, 20, 24 for large fields once all is supported
var largeField bls12_377.ScalarField
if largeField.Size() > 4 && t > 4 {
continue // TODO Danny remove this
}
inputs := bls12_377.GenerateScalars(t*8 - 2)

// Set device to CPU
test_helpers.ActivateReferenceDevice()
outputsRef := make([]bls12_377.ScalarField, 1)
poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherRef.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsRef),
core.GetDefaultHashConfig(),
)

poseidon2HasherRef.Delete()

// Set device to main
test_helpers.ActivateMainDevice()
outputsMain := make([]bls12_377.ScalarField, 1)
poseidon2HasherMain, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherMain.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsMain),
core.GetDefaultHashConfig(),
)

poseidon2HasherMain.Delete()

s.Equal(outputsRef, outputsMain, "Poseidon2 hash outputs did not match")
}
}

func testPoseidon2HashTree(s *suite.Suite) {
t := 4
Expand Down Expand Up @@ -132,7 +135,7 @@ type Poseidon2TestSuite struct {

func (s *Poseidon2TestSuite) TestPoseidon2() {
s.Run("TestPoseidon2Hash", testWrapper(&s.Suite, testPoseidon2Hash))
// s.Run("TestPoseidonHash2Sponge", testWrapper(&s.Suite, testPoseidonHash2Sponge))
s.Run("TestPoseidon2HashSponge", testWrapper(&s.Suite, testPoseidon2HashSponge))
s.Run("TestPoseidon2HashTree", testWrapper(&s.Suite, testPoseidon2HashTree))
}

Expand Down
71 changes: 37 additions & 34 deletions wrappers/golang/curves/bls12381/tests/poseidon2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,42 @@ func testPoseidon2Hash(s *suite.Suite) {
}
}

// TODO uncomment once Poseidon2 sponge function is ready
// func testPoseidon2HashSponge(s *suite.Suite) {
// for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// inputs := bls12_381.GenerateScalars(t*8 - 2)
// var noDomainTag *bls12_381.ScalarField
//
// // Set device to CPU
// test_helpers.ActivateReferenceDevice()
// outputsRef := make([]bls12_381.ScalarField, 1)
// poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), noDomainTag)
// err := poseidon2HasherRef.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsRef),
// core.GetDefaultHashConfig(),
// )
//
// poseidonHasherRef.Delete()
//
// // Set device to main
// test_helpers.ActivateMainDevice()
// outputsMain := make([]bls12_381.ScalarField, 1)
// poseidonHasherMain, _ := poseidon.NewHasher(uint64(t), noDomainTag)
// poseidonHasherMain.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsMain),
// core.GetDefaultHashConfig(),
// )
//
// poseidon2HasherMain.Delete()
//
// s.Equal(runtime.InvalidArgument, err)
// }
// }
func testPoseidon2HashSponge(s *suite.Suite) {
for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// TODO Danny add 8, 12, 16, 20, 24 for large fields once all is supported
var largeField bls12_381.ScalarField
if largeField.Size() > 4 && t > 4 {
continue // TODO Danny remove this
}
inputs := bls12_381.GenerateScalars(t*8 - 2)

// Set device to CPU
test_helpers.ActivateReferenceDevice()
outputsRef := make([]bls12_381.ScalarField, 1)
poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherRef.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsRef),
core.GetDefaultHashConfig(),
)

poseidon2HasherRef.Delete()

// Set device to main
test_helpers.ActivateMainDevice()
outputsMain := make([]bls12_381.ScalarField, 1)
poseidon2HasherMain, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherMain.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsMain),
core.GetDefaultHashConfig(),
)

poseidon2HasherMain.Delete()

s.Equal(outputsRef, outputsMain, "Poseidon2 hash outputs did not match")
}
}

func testPoseidon2HashTree(s *suite.Suite) {
t := 4
Expand Down Expand Up @@ -132,7 +135,7 @@ type Poseidon2TestSuite struct {

func (s *Poseidon2TestSuite) TestPoseidon2() {
s.Run("TestPoseidon2Hash", testWrapper(&s.Suite, testPoseidon2Hash))
// s.Run("TestPoseidonHash2Sponge", testWrapper(&s.Suite, testPoseidonHash2Sponge))
s.Run("TestPoseidon2HashSponge", testWrapper(&s.Suite, testPoseidon2HashSponge))
s.Run("TestPoseidon2HashTree", testWrapper(&s.Suite, testPoseidon2HashTree))
}

Expand Down
71 changes: 37 additions & 34 deletions wrappers/golang/curves/bn254/tests/poseidon2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,42 @@ func testPoseidon2Hash(s *suite.Suite) {
}
}

// TODO uncomment once Poseidon2 sponge function is ready
// func testPoseidon2HashSponge(s *suite.Suite) {
// for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// inputs := bn254.GenerateScalars(t*8 - 2)
// var noDomainTag *bn254.ScalarField
//
// // Set device to CPU
// test_helpers.ActivateReferenceDevice()
// outputsRef := make([]bn254.ScalarField, 1)
// poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), noDomainTag)
// err := poseidon2HasherRef.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsRef),
// core.GetDefaultHashConfig(),
// )
//
// poseidonHasherRef.Delete()
//
// // Set device to main
// test_helpers.ActivateMainDevice()
// outputsMain := make([]bn254.ScalarField, 1)
// poseidonHasherMain, _ := poseidon.NewHasher(uint64(t), noDomainTag)
// poseidonHasherMain.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsMain),
// core.GetDefaultHashConfig(),
// )
//
// poseidon2HasherMain.Delete()
//
// s.Equal(runtime.InvalidArgument, err)
// }
// }
func testPoseidon2HashSponge(s *suite.Suite) {
for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// TODO Danny add 8, 12, 16, 20, 24 for large fields once all is supported
var largeField bn254.ScalarField
if largeField.Size() > 4 && t > 4 {
continue // TODO Danny remove this
}
inputs := bn254.GenerateScalars(t*8 - 2)

// Set device to CPU
test_helpers.ActivateReferenceDevice()
outputsRef := make([]bn254.ScalarField, 1)
poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherRef.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsRef),
core.GetDefaultHashConfig(),
)

poseidon2HasherRef.Delete()

// Set device to main
test_helpers.ActivateMainDevice()
outputsMain := make([]bn254.ScalarField, 1)
poseidon2HasherMain, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherMain.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsMain),
core.GetDefaultHashConfig(),
)

poseidon2HasherMain.Delete()

s.Equal(outputsRef, outputsMain, "Poseidon2 hash outputs did not match")
}
}

func testPoseidon2HashTree(s *suite.Suite) {
t := 4
Expand Down Expand Up @@ -132,7 +135,7 @@ type Poseidon2TestSuite struct {

func (s *Poseidon2TestSuite) TestPoseidon2() {
s.Run("TestPoseidon2Hash", testWrapper(&s.Suite, testPoseidon2Hash))
// s.Run("TestPoseidonHash2Sponge", testWrapper(&s.Suite, testPoseidonHash2Sponge))
s.Run("TestPoseidon2HashSponge", testWrapper(&s.Suite, testPoseidon2HashSponge))
s.Run("TestPoseidon2HashTree", testWrapper(&s.Suite, testPoseidon2HashTree))
}

Expand Down
71 changes: 37 additions & 34 deletions wrappers/golang/curves/bw6761/tests/poseidon2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,42 @@ func testPoseidon2Hash(s *suite.Suite) {
}
}

// TODO uncomment once Poseidon2 sponge function is ready
// func testPoseidon2HashSponge(s *suite.Suite) {
// for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// inputs := bw6_761.GenerateScalars(t*8 - 2)
// var noDomainTag *bw6_761.ScalarField
//
// // Set device to CPU
// test_helpers.ActivateReferenceDevice()
// outputsRef := make([]bw6_761.ScalarField, 1)
// poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), noDomainTag)
// err := poseidon2HasherRef.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsRef),
// core.GetDefaultHashConfig(),
// )
//
// poseidonHasherRef.Delete()
//
// // Set device to main
// test_helpers.ActivateMainDevice()
// outputsMain := make([]bw6_761.ScalarField, 1)
// poseidonHasherMain, _ := poseidon.NewHasher(uint64(t), noDomainTag)
// poseidonHasherMain.Hash(
// core.HostSliceFromElements(inputs),
// core.HostSliceFromElements(outputsMain),
// core.GetDefaultHashConfig(),
// )
//
// poseidon2HasherMain.Delete()
//
// s.Equal(runtime.InvalidArgument, err)
// }
// }
func testPoseidon2HashSponge(s *suite.Suite) {
for _, t := range []int{2, 3, 4, 8, 12, 16, 20, 24} {
// TODO Danny add 8, 12, 16, 20, 24 for large fields once all is supported
var largeField bw6_761.ScalarField
if largeField.Size() > 4 && t > 4 {
continue // TODO Danny remove this
}
inputs := bw6_761.GenerateScalars(t*8 - 2)

// Set device to CPU
test_helpers.ActivateReferenceDevice()
outputsRef := make([]bw6_761.ScalarField, 1)
poseidon2HasherRef, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherRef.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsRef),
core.GetDefaultHashConfig(),
)

poseidon2HasherRef.Delete()

// Set device to main
test_helpers.ActivateMainDevice()
outputsMain := make([]bw6_761.ScalarField, 1)
poseidon2HasherMain, _ := poseidon2.NewHasher(uint64(t), nil /*domain tag*/)
poseidon2HasherMain.Hash(
core.HostSliceFromElements(inputs),
core.HostSliceFromElements(outputsMain),
core.GetDefaultHashConfig(),
)

poseidon2HasherMain.Delete()

s.Equal(outputsRef, outputsMain, "Poseidon2 hash outputs did not match")
}
}

func testPoseidon2HashTree(s *suite.Suite) {
t := 4
Expand Down Expand Up @@ -132,7 +135,7 @@ type Poseidon2TestSuite struct {

func (s *Poseidon2TestSuite) TestPoseidon2() {
s.Run("TestPoseidon2Hash", testWrapper(&s.Suite, testPoseidon2Hash))
// s.Run("TestPoseidonHash2Sponge", testWrapper(&s.Suite, testPoseidonHash2Sponge))
s.Run("TestPoseidon2HashSponge", testWrapper(&s.Suite, testPoseidon2HashSponge))
s.Run("TestPoseidon2HashTree", testWrapper(&s.Suite, testPoseidon2HashTree))
}

Expand Down
Loading
Loading