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

specify plonky3 branch #101

Merged
merged 7 commits into from
Jan 23, 2024
Merged

specify plonky3 branch #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25aa215
specify plonky3 branch
hadasz Jan 22, 2024
0b35e91
Update ci.yml
hadasz Jan 22, 2024
c7cbdc1
Update ci.yml
hadasz Jan 22, 2024
b65af31
Update ci.yml
hadasz Jan 22, 2024
96a326a
Update ci.yml
hadasz Jan 22, 2024
4c5e588
comment this out for now
hadasz Jan 22, 2024
7a9c467
fmt
hadasz Jan 22, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ jobs:
- name: Checkout Plonky3
uses: actions/checkout@v4
with:
repository: Plonky3/Plonky3
repository: lita-xyz/Plonky3
path: Plonky3

ref: batch_prover

- name: Checkout Valida
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -48,8 +49,9 @@ jobs:
- name: Checkout Plonky3
uses: actions/checkout@v4
with:
repository: Plonky3/Plonky3
repository: lita-xyz/Plonky3
path: Plonky3
ref: batch_prover

- name: Checkout Valida
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/div/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;

use valida_util::pad_to_power_of_two;
use p3_uni_stark::StarkConfig;
use valida_util::pad_to_power_of_two;
pub mod columns;
pub mod stark;

Expand Down
2 changes: 1 addition & 1 deletion alu_u32/src/lt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use p3_field::{AbstractField, Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;

use valida_util::pad_to_power_of_two;
use p3_uni_stark::StarkConfig;
use valida_util::pad_to_power_of_two;
pub mod columns;
pub mod stark;

Expand Down
96 changes: 47 additions & 49 deletions basic/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use alloc::vec::Vec;
use core::marker::PhantomData;
use p3_air::Air;
use p3_commit::{Pcs, UnivariatePcs, UnivariatePcsWithLde};
use p3_field::PrimeField32;
use p3_field::{extension::BinomialExtensionField, TwoAdicField};
use p3_goldilocks::Goldilocks;
use p3_matrix::dense::RowMajorMatrix;
Expand All @@ -16,7 +17,6 @@ use p3_uni_stark::{
ProverConstraintFolder, ProverData, StarkConfig, SymbolicAirBuilder,
};
use p3_util::log2_ceil_usize;
use p3_field::PrimeField32;
use valida_alu_u32::{
add::{Add32Chip, Add32Instruction, MachineWithAdd32Chip},
bitwise::{
Expand Down Expand Up @@ -277,92 +277,91 @@ impl<F: PrimeField32 + TwoAdicField> MachineWithRangeChip<F, 256> for BasicMachi
}

impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {

fn run<Adv: AdviceProvider>(&mut self, program: &ProgramROM<i32>, advice: &mut Adv) {
loop {
let pc = self.cpu.pc;
let instruction = program.get_instruction(pc);
let opcode = instruction.opcode;
let ops = instruction.operands;
match opcode {
<Load32Instruction as Instruction<Self,F>>::OPCODE => {
<Load32Instruction as Instruction<Self, F>>::OPCODE => {
Load32Instruction::execute_with_advice(self, ops, advice);
}
<Store32Instruction as Instruction<Self,F>>::OPCODE => {
<Store32Instruction as Instruction<Self, F>>::OPCODE => {
Store32Instruction::execute_with_advice(self, ops, advice);
}
<JalInstruction as Instruction<Self,F>>::OPCODE => {
<JalInstruction as Instruction<Self, F>>::OPCODE => {
JalInstruction::execute_with_advice(self, ops, advice);
}
<JalvInstruction as Instruction<Self,F>>::OPCODE => {
<JalvInstruction as Instruction<Self, F>>::OPCODE => {
JalvInstruction::execute_with_advice(self, ops, advice);
}
<BeqInstruction as Instruction<Self,F>>::OPCODE => {
<BeqInstruction as Instruction<Self, F>>::OPCODE => {
BeqInstruction::execute_with_advice(self, ops, advice);
}
<BneInstruction as Instruction<Self,F>>::OPCODE => {
<BneInstruction as Instruction<Self, F>>::OPCODE => {
BneInstruction::execute_with_advice(self, ops, advice);
}
<Imm32Instruction as Instruction<Self,F>>::OPCODE => {
<Imm32Instruction as Instruction<Self, F>>::OPCODE => {
Imm32Instruction::execute_with_advice(self, ops, advice);
}
<Add32Instruction as Instruction<Self,F>>::OPCODE => {
<Add32Instruction as Instruction<Self, F>>::OPCODE => {
Add32Instruction::execute_with_advice(self, ops, advice);
}
<Sub32Instruction as Instruction<Self,F>>::OPCODE => {
<Sub32Instruction as Instruction<Self, F>>::OPCODE => {
Sub32Instruction::execute_with_advice(self, ops, advice);
}
<Mul32Instruction as Instruction<Self,F>>::OPCODE => {
<Mul32Instruction as Instruction<Self, F>>::OPCODE => {
Mul32Instruction::execute_with_advice(self, ops, advice);
}
<Mulhs32Instruction as Instruction<Self,F>>::OPCODE => {
<Mulhs32Instruction as Instruction<Self, F>>::OPCODE => {
Mulhs32Instruction::execute_with_advice(self, ops, advice);
}
<Mulhu32Instruction as Instruction<Self,F>>::OPCODE => {
<Mulhu32Instruction as Instruction<Self, F>>::OPCODE => {
Mulhu32Instruction::execute_with_advice(self, ops, advice);
}
<Div32Instruction as Instruction<Self,F>>::OPCODE => {
<Div32Instruction as Instruction<Self, F>>::OPCODE => {
Div32Instruction::execute_with_advice(self, ops, advice);
}
<SDiv32Instruction as Instruction<Self,F>>::OPCODE => {
<SDiv32Instruction as Instruction<Self, F>>::OPCODE => {
SDiv32Instruction::execute_with_advice(self, ops, advice);
}
<Shl32Instruction as Instruction<Self,F>>::OPCODE => {
<Shl32Instruction as Instruction<Self, F>>::OPCODE => {
Shl32Instruction::execute_with_advice(self, ops, advice);
}
<Shr32Instruction as Instruction<Self,F>>::OPCODE => {
<Shr32Instruction as Instruction<Self, F>>::OPCODE => {
Shr32Instruction::execute_with_advice(self, ops, advice);
}
<Sra32Instruction as Instruction<Self,F>>::OPCODE => {
<Sra32Instruction as Instruction<Self, F>>::OPCODE => {
Sra32Instruction::execute_with_advice(self, ops, advice);
}
<Lt32Instruction as Instruction<Self,F>>::OPCODE => {
<Lt32Instruction as Instruction<Self, F>>::OPCODE => {
Lt32Instruction::execute_with_advice(self, ops, advice);
}
<And32Instruction as Instruction<Self,F>>::OPCODE => {
<And32Instruction as Instruction<Self, F>>::OPCODE => {
And32Instruction::execute_with_advice(self, ops, advice);
}
<Or32Instruction as Instruction<Self,F>>::OPCODE => {
<Or32Instruction as Instruction<Self, F>>::OPCODE => {
Or32Instruction::execute_with_advice(self, ops, advice);
}
<Xor32Instruction as Instruction<Self,F>>::OPCODE => {
<Xor32Instruction as Instruction<Self, F>>::OPCODE => {
Xor32Instruction::execute_with_advice(self, ops, advice);
}
<ReadAdviceInstruction as Instruction<Self,F>>::OPCODE => {
<ReadAdviceInstruction as Instruction<Self, F>>::OPCODE => {
ReadAdviceInstruction::execute_with_advice(self, ops, advice);
}
<WriteInstruction as Instruction<Self,F>>::OPCODE => {
<WriteInstruction as Instruction<Self, F>>::OPCODE => {
WriteInstruction::execute_with_advice(self, ops, advice);
}
<StopInstruction as Instruction<Self,F>>::OPCODE => {
<StopInstruction as Instruction<Self, F>>::OPCODE => {
StopInstruction::execute_with_advice(self, ops, advice);
}
_ => {}
}

self.read_word(pc as usize);

if opcode == <StopInstruction as Instruction<Self,F>>::OPCODE {
if opcode == <StopInstruction as Instruction<Self, F>>::OPCODE {
break;
}
}
Expand Down Expand Up @@ -400,24 +399,24 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {
let mut quotient_commitments = Vec::new();
let mut log_degrees = Vec::new();
let mut log_quotient_degrees = Vec::new();
/*
let air = &self.cpu();
assert_eq!(air.operations.len() > 0, true);
let trace = air.generate_trace(air, self);
self.add_chip_trace(
config,
challenger,
&mut trace_commitments,
&mut quotient_commitments,
&mut log_degrees,
&mut log_quotient_degrees,
air,
trace,
);
*/
/*
let air = &self.cpu();
assert_eq!(air.operations.len() > 0, true);
let trace = air.generate_trace(air, self);
self.add_chip_trace(
config,
challenger,
&mut trace_commitments,
&mut quotient_commitments,
&mut log_degrees,
&mut log_quotient_degrees,
air,
trace,
);
*/
if self.add_u32.operations.len() > 0 {
let air = &self.add_u32;
let trace = <Add32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air,self);
let trace = <Add32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

self.add_chip_trace(
config,
Expand Down Expand Up @@ -447,7 +446,7 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {
}
if self.mul_u32.operations.len() > 0 {
let air = &self.mul_u32;
let trace =<Mul32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);
let trace = <Mul32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

self.add_chip_trace(
config,
Expand All @@ -463,7 +462,7 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {
if self.div_u32.operations.len() > 0 {
let air = &self.div_u32;

let trace = <Div32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);
let trace = <Div32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);
self.add_chip_trace(
config,
challenger,
Expand All @@ -477,8 +476,7 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {
}
if self.shift_u32.operations.len() > 0 {
let air = &self.shift_u32;
let trace = <Shift32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

let trace = <Shift32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

self.add_chip_trace(
config,
Expand All @@ -493,7 +491,7 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {
}
if self.lt_u32.operations.len() > 0 {
let air = &self.lt_u32;
let trace = <Lt32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);
let trace = <Lt32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

self.add_chip_trace(
config,
Expand All @@ -509,7 +507,7 @@ impl<F: PrimeField32 + TwoAdicField> Machine<F> for BasicMachine<F> {

if self.bitwise_u32.operations.len() > 0 {
let air = &self.bitwise_u32;
let trace = <Bitwise32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);
let trace = <Bitwise32Chip as Chip<BasicMachine<F>, SC>>::generate_trace(air, self);

self.add_chip_trace(
config,
Expand Down
2 changes: 1 addition & 1 deletion machine/src/__internal/prove.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::__internal::ConstraintFolder;
//use crate::__internal::ConstraintFolder;
use crate::proof::ChipProof;
use crate::{Chip, Machine};
use p3_air::Air;
Expand Down
2 changes: 1 addition & 1 deletion machine/src/chip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ use alloc::vec::Vec;
use valida_util::batch_multiplicative_inverse;

//use crate::config::StarkConfig;
use p3_uni_stark::StarkConfig;
use p3_air::{Air, AirBuilder, PairBuilder, PermutationAirBuilder, VirtualPairCol};
use p3_field::{AbstractExtensionField, AbstractField, ExtensionField, Field, Powers};
use p3_matrix::{dense::RowMajorMatrix, Matrix, MatrixRowSlices};
use p3_uni_stark::StarkConfig;

pub trait Chip<M: Machine<SC::Val>, SC: StarkConfig>:
for<'a> Air<ProverConstraintFolder<'a, M, SC>> + for<'a> Air<DebugConstraintBuilder<'a, M, SC>>
Expand Down
9 changes: 4 additions & 5 deletions memory/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ use alloc::collections::BTreeMap;
use alloc::vec;
use alloc::vec::Vec;
use core::mem::transmute;
use valida_bus::MachineWithMemBus;
use valida_machine::{BusArgument, Chip, Interaction, Machine, Word};
use valida_util::batch_multiplicative_inverse;
use p3_uni_stark::StarkConfig;
use p3_air::VirtualPairCol;
use p3_field::{Field, PrimeField};
use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;

use p3_uni_stark::StarkConfig;
use valida_bus::MachineWithMemBus;
use valida_machine::{BusArgument, Chip, Interaction, Machine, Word};
use valida_util::batch_multiplicative_inverse;

pub mod columns;
pub mod stark;
Expand Down
1 change: 0 additions & 1 deletion native_field/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use p3_matrix::dense::RowMajorMatrix;
use p3_maybe_rayon::*;
use p3_uni_stark::StarkConfig;


pub mod columns;
pub mod stark;

Expand Down
1 change: 0 additions & 1 deletion range/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use p3_field::{AbstractField, Field};
use p3_matrix::dense::RowMajorMatrix;
use p3_uni_stark::StarkConfig;


pub mod columns;
pub mod stark;

Expand Down
Loading