diff --git a/prover/example/test_cases/framework_test.go b/prover/example/test_cases/framework_test.go index a5f4e82f7..a095c8911 100644 --- a/prover/example/test_cases/framework_test.go +++ b/prover/example/test_cases/framework_test.go @@ -14,7 +14,8 @@ import ( "github.com/consensys/linea-monorepo/prover/protocol/compiler/lookup" "github.com/consensys/linea-monorepo/prover/protocol/compiler/permutation" "github.com/consensys/linea-monorepo/prover/protocol/compiler/specialqueries" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/compiler/univariates" "github.com/consensys/linea-monorepo/prover/protocol/compiler/vortex" "github.com/consensys/linea-monorepo/prover/protocol/ifaces" @@ -66,7 +67,8 @@ var ( innerproduct.Compile, } ARITHMETICS = compilationSuite{ - splitter.SplitColumns(8), + stitcher.Stitcher(4, 8), + splitter.Splitter(8), localcs.Compile, globalcs.Compile, } diff --git a/prover/example/test_cases/local_opening_test.go b/prover/example/test_cases/local_opening_test.go index 474bb884f..66b8b04b9 100644 --- a/prover/example/test_cases/local_opening_test.go +++ b/prover/example/test_cases/local_opening_test.go @@ -11,7 +11,8 @@ import ( "github.com/consensys/linea-monorepo/prover/maths/common/smartvectors" "github.com/consensys/linea-monorepo/prover/maths/field" "github.com/consensys/linea-monorepo/prover/protocol/column" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/wizard" "github.com/stretchr/testify/require" ) @@ -31,7 +32,7 @@ func proverLocalOpening(run *wizard.ProverRuntime) { } func TestGnarkCompile(t *testing.T) { - comp := wizard.Compile(defineLocalOpening, splitter.SplitColumns(32)) + comp := wizard.Compile(defineLocalOpening, stitcher.Stitcher(16, 32), splitter.Splitter(32)) proof := wizard.Prove(comp, proverLocalOpening) circ, err := wizard.AllocateWizardCircuit(comp) diff --git a/prover/example/test_cases/range_test.go b/prover/example/test_cases/range_test.go index cd0373d21..20fe6d7c7 100644 --- a/prover/example/test_cases/range_test.go +++ b/prover/example/test_cases/range_test.go @@ -6,7 +6,8 @@ import ( "testing" "github.com/consensys/linea-monorepo/prover/maths/common/smartvectors" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/wizard" ) @@ -27,5 +28,6 @@ func proveRange(run *wizard.ProverRuntime) { } func TestRange(t *testing.T) { - checkSolved(t, defineRange, proveRange, join(ALL_SPECIALS, compilationSuite{splitter.SplitColumns(8)}, DUMMY), true) + checkSolved(t, defineRange, proveRange, join(ALL_SPECIALS, + compilationSuite{stitcher.Stitcher(4, 8), splitter.Splitter(8)}, DUMMY), true) } diff --git a/prover/protocol/compiler/arcane.go b/prover/protocol/compiler/arcane.go index b1fbaa82c..cbc02eea7 100644 --- a/prover/protocol/compiler/arcane.go +++ b/prover/protocol/compiler/arcane.go @@ -9,8 +9,8 @@ import ( "github.com/consensys/linea-monorepo/prover/protocol/compiler/lookup" "github.com/consensys/linea-monorepo/prover/protocol/compiler/permutation" "github.com/consensys/linea-monorepo/prover/protocol/compiler/specialqueries" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter/sticker" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/compiler/univariates" "github.com/consensys/linea-monorepo/prover/protocol/wizard" ) @@ -32,8 +32,8 @@ func Arcane(minStickSize, targetColSize int, noLog ...bool) func(comp *wizard.Co if withLog_ { logdata.Log("after-expansion")(comp) } - sticker.Sticker(minStickSize, targetColSize)(comp) - splitter.SplitColumns(targetColSize)(comp) + stitcher.Stitcher(minStickSize, targetColSize)(comp) + splitter.Splitter(targetColSize)(comp) if withLog_ { logdata.Log("post-rectangularization")(comp) } diff --git a/prover/protocol/compiler/fullrecursion/full_recursion_test.go b/prover/protocol/compiler/fullrecursion/full_recursion_test.go index 5fd62cd43..8c8c27e7e 100644 --- a/prover/protocol/compiler/fullrecursion/full_recursion_test.go +++ b/prover/protocol/compiler/fullrecursion/full_recursion_test.go @@ -17,8 +17,8 @@ import ( "github.com/consensys/linea-monorepo/prover/protocol/compiler/mimc" "github.com/consensys/linea-monorepo/prover/protocol/compiler/permutation" "github.com/consensys/linea-monorepo/prover/protocol/compiler/specialqueries" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter/sticker" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/compiler/univariates" "github.com/consensys/linea-monorepo/prover/protocol/compiler/vortex" "github.com/consensys/linea-monorepo/prover/protocol/ifaces" @@ -72,8 +72,8 @@ func TestLookup(t *testing.T) { specialqueries.CompileFixedPermutations, permutation.CompileGrandProduct, innerproduct.Compile, - sticker.Sticker(1<<8, 1<<16), - splitter.SplitColumns(1 << 16), + stitcher.Stitcher(1<<8, 1<<16), + splitter.Splitter(1 << 16), localcs.Compile, globalcs.Compile, univariates.CompileLocalOpening, diff --git a/prover/protocol/dedicated/functionals/eval_bivariate_test.go b/prover/protocol/dedicated/functionals/eval_bivariate_test.go index b5224328e..387a7beac 100644 --- a/prover/protocol/dedicated/functionals/eval_bivariate_test.go +++ b/prover/protocol/dedicated/functionals/eval_bivariate_test.go @@ -8,7 +8,8 @@ import ( "github.com/consensys/linea-monorepo/prover/protocol/accessors" "github.com/consensys/linea-monorepo/prover/protocol/coin" "github.com/consensys/linea-monorepo/prover/protocol/compiler/dummy" - "github.com/consensys/linea-monorepo/prover/protocol/compiler/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/splitter" + "github.com/consensys/linea-monorepo/prover/protocol/compiler/stitch_split/stitcher" "github.com/consensys/linea-monorepo/prover/protocol/dedicated/functionals" "github.com/consensys/linea-monorepo/prover/protocol/ifaces" "github.com/consensys/linea-monorepo/prover/protocol/wizard" @@ -124,7 +125,8 @@ func TestEvalBivariateSimpleWithSplitting(t *testing.T) { } compiled := wizard.Compile(definer, - splitter.SplitColumns(4), + stitcher.Stitcher(2, 4), + splitter.Splitter(4), dummy.Compile, ) diff --git a/prover/protocol/dedicated/functionals/interpolation_test.go b/prover/protocol/dedicated/functionals/interpolation_test.go index c6eec320b..a469c54cb 100644 --- a/prover/protocol/dedicated/functionals/interpolation_test.go +++ b/prover/protocol/dedicated/functionals/interpolation_test.go @@ -46,7 +46,8 @@ func TestInterpolate(t *testing.T) { // specialqueries.CompileFixedPermutations, // specialqueries.CompileInclusionPermutations, // innerproduct.Compile, - // splitter.SplitColumns(8), + // stitcher.Stitcher(4, 8), + // splitter.Splitter(8), // arithmetics.CompileLocal, // arithmetics.CompileGlobal, dummy.Compile, diff --git a/prover/protocol/serialization/implementation_registry.go b/prover/protocol/serialization/implementation_registry.go index 8f9ac4f57..01f95767b 100644 --- a/prover/protocol/serialization/implementation_registry.go +++ b/prover/protocol/serialization/implementation_registry.go @@ -36,6 +36,7 @@ func init() { RegisterImplementation(verifiercol.ConstCol{}) RegisterImplementation(verifiercol.FromYs{}) RegisterImplementation(verifiercol.FromAccessors{}) + RegisterImplementation(verifiercol.ExpandedVerifCol{}) RegisterImplementation(query.FixedPermutation{}) RegisterImplementation(query.GlobalConstraint{}) RegisterImplementation(query.Inclusion{}) diff --git a/prover/protocol/serialization/serialization_test.go b/prover/protocol/serialization/serialization_test.go index 2acaa16c7..7ddcb10b2 100644 --- a/prover/protocol/serialization/serialization_test.go +++ b/prover/protocol/serialization/serialization_test.go @@ -28,6 +28,7 @@ func TestSerializeValue(t *testing.T) { RegisterImplementation(verifiercol.ConstCol{}) RegisterImplementation(verifiercol.FromYs{}) RegisterImplementation(verifiercol.FromAccessors{}) + RegisterImplementation(verifiercol.ExpandedVerifCol{}) RegisterImplementation(accessors.FromPublicColumn{}) RegisterImplementation(accessors.FromConstAccessor{}) RegisterImplementation(query.UnivariateEval{})