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

Jump to bottom

feat: remove redundant check #166

Merged
merged 3 commits into from
Sep 22, 2024
Merged

feat: remove redundant check #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
643b075
chore: remove redundant check
eigmax Sep 20, 2024
5445bea
fix: fmt
eigmax Sep 20, 2024
bf7a72a
fix: typos
eigmax Sep 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ There are two ways to prove the program:
- Hardware: X86 CPU, 32 cores, 32G memory
- OS: Ubuntu22

| Cycles Per Segment | RAM |
| Instructions Per Segment | RAM |
| ------------------ | --- |
| 32768 | 13G |
| 65536 | 19G |
Expand Down
6 changes: 3 additions & 3 deletions prover/src/cpu/cpu_stark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::constraint_consumer::{ConstraintConsumer, RecursiveConstraintConsumer
use crate::cpu::columns::{COL_MAP, NUM_CPU_COLUMNS};
//use crate::cpu::membus::NUM_GP_CHANNELS;
use crate::cpu::{
bits, bootstrap_kernel, count, decode, exit_kernel, jumps, membus, memio, misc, shift, syscall,
bits, bootstrap_kernel, count, decode, jumps, membus, memio, misc, shift, syscall,
};
use crate::cross_table_lookup::{Column, Filter, TableWithColumns};
use crate::evaluation_frame::{StarkEvaluationFrame, StarkFrame};
Expand Down Expand Up @@ -212,7 +212,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
syscall::eval_packed(local_values, yield_constr);
bits::eval_packed(local_values, yield_constr);
misc::eval_packed(local_values, yield_constr);
exit_kernel::eval_exit_kernel_packed(local_values, next_values, yield_constr);
//exit_kernel::eval_exit_kernel_packed(local_values, next_values, yield_constr);
}

fn eval_ext_circuit(
Expand Down Expand Up @@ -244,7 +244,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
syscall::eval_ext_circuit(builder, local_values, yield_constr);
bits::eval_ext_circuit(builder, local_values, yield_constr);
misc::eval_ext_circuit(builder, local_values, yield_constr);
exit_kernel::eval_exit_kernel_ext_circuit(builder, local_values, next_values, yield_constr);
//exit_kernel::eval_exit_kernel_ext_circuit(builder, local_values, next_values, yield_constr);
}

fn constraint_degree(&self) -> usize {
Expand Down
3 changes: 1 addition & 2 deletions prover/src/generation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use crate::all_stark::{AllStark, NUM_TABLES};
use crate::config::StarkConfig;
use crate::cpu::bootstrap_kernel::generate_bootstrap_kernel;
use crate::cpu::columns::CpuColumnsView;
use crate::cpu::exit_kernel::generate_exit_kernel;
use crate::cpu::kernel::assembler::Kernel;
use crate::generation::outputs::{get_outputs, GenerationOutputs};
use crate::generation::state::GenerationState;
Expand Down Expand Up @@ -93,7 +92,7 @@ pub(crate) fn simulate_cpu<F: RichField + Extendable<D>, const D: usize>(
)
}

generate_exit_kernel::<F>(state, kernel);
//generate_exit_kernel::<F>(state, kernel);

// Padding
let mut row = CpuColumnsView::<F>::default();
Expand Down
4 changes: 2 additions & 2 deletions prover/src/prover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ where
);
let logic_proof = timed!(
timing,
"prove logic STARK",
"prove Logic STARK",
prove_single_table(
&all_stark.logic_stark,
config,
Expand All @@ -272,7 +272,7 @@ where
);
let memory_proof = timed!(
timing,
"prove memory STARK",
"prove Memory STARK",
prove_single_table(
&all_stark.memory_stark,
config,
Expand Down
Loading