Renamed symbol a bunch in goldilocks, goldilocks tests pass

This commit is contained in:
Uma Roy
2023-10-10 22:32:54 -07:00
parent 07cf7bd857
commit 1c0235b35a
39 changed files with 195 additions and 184 deletions

View File

@@ -58,7 +58,7 @@ func (g *ArithmeticExtensionGate) wiresIthOutput(i uint64) Range {
func (g *ArithmeticExtensionGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
const0 := vars.localConstants[0]

View File

@@ -59,7 +59,7 @@ func (g *ArithmeticGate) WireIthOutput(i uint64) uint64 {
func (g *ArithmeticGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
const0 := vars.localConstants[0]

View File

@@ -65,7 +65,7 @@ func (g *BaseSumGate) limbs() []uint64 {
func (g *BaseSumGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
sum := vars.localWires[BASESUM_GATE_WIRE_SUM]

View File

@@ -56,7 +56,7 @@ func (g *ConstantGate) WireOutput(i uint64) uint64 {
func (g *ConstantGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
constraints := []gl.QuadraticExtensionVariable{}

View File

@@ -147,7 +147,7 @@ func (g *CosetInterpolationGate) wiresShiftedEvaluationPoint() Range {
func (g *CosetInterpolationGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
constraints := []gl.QuadraticExtensionVariable{}

View File

@@ -36,7 +36,7 @@ func (g *EvaluateGatesChip) computeFilter(
s gl.QuadraticExtensionVariable,
manySelector bool,
) gl.QuadraticExtensionVariable {
glApi := gl.NewChip(g.api)
glApi := gl.NewGoldilocksApi(g.api)
product := gl.OneExtension()
for i := groupRange.start; i < groupRange.end; i++ {
if i == uint64(row) {
@@ -62,7 +62,7 @@ func (g *EvaluateGatesChip) evalFiltered(
groupRange Range,
numSelectors uint64,
) []gl.QuadraticExtensionVariable {
glApi := gl.NewChip(g.api)
glApi := gl.NewGoldilocksApi(g.api)
filter := g.computeFilter(row, groupRange, vars.localConstants[selectorIndex], numSelectors > 1)
vars.RemovePrefix(numSelectors)
@@ -75,7 +75,7 @@ func (g *EvaluateGatesChip) evalFiltered(
}
func (g *EvaluateGatesChip) EvaluateGateConstraints(vars EvaluationVars) []gl.QuadraticExtensionVariable {
glApi := gl.NewChip(g.api)
glApi := gl.NewGoldilocksApi(g.api)
constraints := make([]gl.QuadraticExtensionVariable, g.numGateConstraints)
for i := range constraints {
constraints[i] = gl.ZeroExtension()

View File

@@ -65,7 +65,7 @@ func (g *ExponentiationGate) wireIntermediateValue(i uint64) uint64 {
func (g *ExponentiationGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
base := vars.localWires[g.wireBase()]

View File

@@ -12,7 +12,7 @@ type Gate interface {
Id() string
EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable
}

View File

@@ -693,7 +693,7 @@ func (circuit *TestGateCircuit) Define(api frontend.API) error {
commonCircuitData := verifier.DeserializeCommonCircuitData("../../data/decode_block/common_circuit_data.json")
numSelectors := commonCircuitData.SelectorsInfo.NumSelectors()
glApi := gl.NewChip(api)
glApi := gl.NewGoldilocksApi(api)
vars := gates.NewEvaluationVars(localConstants[numSelectors:], localWires, publicInputsHash)

View File

@@ -54,7 +54,7 @@ func (g *MultiplicationExtensionGate) wiresIthOutput(i uint64) Range {
func (g *MultiplicationExtensionGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
const0 := vars.localConstants[0]

View File

@@ -27,7 +27,7 @@ func (g *NoopGate) Id() string {
func (g *NoopGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
return []gl.QuadraticExtensionVariable{}

View File

@@ -91,7 +91,7 @@ func (g *PoseidonGate) WiresEnd() uint64 {
func (g *PoseidonGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
constraints := []gl.QuadraticExtensionVariable{}

View File

@@ -45,7 +45,7 @@ func (g *PoseidonMdsGate) mdsRowShfAlgebra(
v [poseidon.SPONGE_WIDTH]gl.QuadraticExtensionAlgebraVariable,
api frontend.API,
) gl.QuadraticExtensionAlgebraVariable {
glApi := gl.NewChip(api)
glApi := gl.NewGoldilocksApi(api)
if r >= poseidon.SPONGE_WIDTH {
panic("MDS row index out of range")
}
@@ -75,7 +75,7 @@ func (g *PoseidonMdsGate) mdsLayerAlgebra(
func (g *PoseidonMdsGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
constraints := []gl.QuadraticExtensionVariable{}

View File

@@ -31,7 +31,7 @@ func (g *PublicInputGate) WiresPublicInputsHash() []uint64 {
func (g *PublicInputGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
constraints := []gl.QuadraticExtensionVariable{}

View File

@@ -116,7 +116,7 @@ func (g *RandomAccessGate) WireBit(i uint64, copy uint64) uint64 {
func (g *RandomAccessGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
two := gl.NewVariable(2).ToQuadraticExtension()

View File

@@ -76,7 +76,7 @@ func (g *ReducingExtensionGate) wiresAccs(i uint64) Range {
func (g *ReducingExtensionGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
alpha := vars.GetLocalExtAlgebra(g.wiresAlpha())

View File

@@ -76,7 +76,7 @@ func (g *ReducingGate) wiresAccs(i uint64) Range {
func (g *ReducingGate) EvalUnfiltered(
api frontend.API,
glApi gl.Chip,
glApi gl.GoldilocksApi,
vars EvaluationVars,
) []gl.QuadraticExtensionVariable {
alpha := vars.GetLocalExtAlgebra(g.wiresAlpha())

View File

@@ -13,8 +13,8 @@ type PlonkChip struct {
commonData types.CommonCircuitData `gnark:"-"`
DEGREE gl.Variable `gnark:"-"`
DEGREE_BITS_F gl.Variable `gnark:"-"`
DEGREE gl.GoldilocksVariable `gnark:"-"`
DEGREE_BITS_F gl.GoldilocksVariable `gnark:"-"`
DEGREE_QE gl.QuadraticExtensionVariable `gnark:"-"`
evaluateGatesChip *gates.EvaluateGatesChip
@@ -44,7 +44,7 @@ func NewPlonkChip(api frontend.API, commonData types.CommonCircuitData) *PlonkCh
}
func (p *PlonkChip) expPowerOf2Extension(x gl.QuadraticExtensionVariable) gl.QuadraticExtensionVariable {
glApi := gl.NewChip(p.api)
glApi := gl.NewGoldilocksApi(p.api)
for i := uint64(0); i < p.commonData.DegreeBits; i++ {
x = glApi.MulExtension(x, x)
}
@@ -53,7 +53,7 @@ func (p *PlonkChip) expPowerOf2Extension(x gl.QuadraticExtensionVariable) gl.Qua
func (p *PlonkChip) evalL0(x gl.QuadraticExtensionVariable, xPowN gl.QuadraticExtensionVariable) gl.QuadraticExtensionVariable {
// L_0(x) = (x^n - 1) / (n * (x - 1))
glApi := gl.NewChip(p.api)
glApi := gl.NewGoldilocksApi(p.api)
evalZeroPoly := glApi.SubExtension(
xPowN,
gl.OneExtension(),
@@ -74,7 +74,7 @@ func (p *PlonkChip) checkPartialProducts(
challengeNum uint64,
openings types.OpeningSet,
) []gl.QuadraticExtensionVariable {
glApi := gl.NewChip(p.api)
glApi := gl.NewGoldilocksApi(p.api)
numPartProds := p.commonData.NumPartialProducts
quotDegreeFactor := p.commonData.QuotientDegreeFactor
@@ -110,7 +110,7 @@ func (p *PlonkChip) evalVanishingPoly(
openings types.OpeningSet,
zetaPowN gl.QuadraticExtensionVariable,
) []gl.QuadraticExtensionVariable {
glApi := gl.NewChip(p.api)
glApi := gl.NewGoldilocksApi(p.api)
constraintTerms := p.evaluateGatesChip.EvaluateGateConstraints(vars)
// Calculate the k[i] * x
@@ -197,7 +197,7 @@ func (p *PlonkChip) Verify(
openings types.OpeningSet,
publicInputsHash poseidon.GoldilocksHashOut,
) {
glApi := gl.NewChip(p.api)
glApi := gl.NewGoldilocksApi(p.api)
// Calculate zeta^n
zetaPowN := p.expPowerOf2Extension(proofChallenges.PlonkZeta)