feat: generic const expr (#854)

Co-authored-by: Chris Tian <[email protected]>
succinctlabs · May 31, 2024 · 27c1741 · 27c1741
1 parent af7c26c
commit 27c1741
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 50 deletions.
diff --git a/core/benches/main.rs b/core/benches/main.rs
@@ -1,6 +1,3 @@
-#![allow(incomplete_features)]
-#![feature(generic_const_exprs)]
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use sp1_core::io::SP1Stdin;
 use sp1_core::runtime::{Program, Runtime};

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -11,7 +11,6 @@
     deprecated,
     incomplete_features
 )]
-#![feature(generic_const_exprs)]
 #![warn(unused_extern_crates)]
 
 extern crate alloc;

diff --git a/core/src/syscall/precompiles/weierstrass/weierstrass_add.rs b/core/src/syscall/precompiles/weierstrass/weierstrass_add.rs
@@ -36,8 +36,7 @@ use crate::utils::ec::weierstrass::WeierstrassParameters;
 use crate::utils::ec::AffinePoint;
 use crate::utils::ec::CurveType;
 use crate::utils::ec::EllipticCurve;
-use crate::utils::limbs_from_prev_access;
-use crate::utils::pad_rows;
+use crate::utils::{limbs_from_prev_access, pad_rows};
 
 pub const fn num_weierstrass_add_cols<P: FieldParameters + NumWords>() -> usize {
     size_of::<WeierstrassAddAssignCols<u8, P>>()
@@ -202,8 +201,6 @@ impl<E: EllipticCurve> WeierstrassAddAssignChip<E> {
 
 impl<F: PrimeField32, E: EllipticCurve + WeierstrassParameters> MachineAir<F>
     for WeierstrassAddAssignChip<E>
-where
-    [(); num_weierstrass_add_cols::<E::BaseField>()]:,
 {
     type Record = ExecutionRecord;
     type Program = Program;
@@ -235,7 +232,7 @@ where
 
         for i in 0..events.len() {
             let event = &events[i];
-            let mut row = [F::zero(); num_weierstrass_add_cols::<E::BaseField>()];
+            let mut row = vec![F::zero(); num_weierstrass_add_cols::<E::BaseField>()];
             let cols: &mut WeierstrassAddAssignCols<F, E::BaseField> =
                 row.as_mut_slice().borrow_mut();
 
@@ -287,7 +284,7 @@ where
         output.add_byte_lookup_events(new_byte_lookup_events);
 
         pad_rows(&mut rows, || {
-            let mut row = [F::zero(); num_weierstrass_add_cols::<E::BaseField>()];
+            let mut row = vec![F::zero(); num_weierstrass_add_cols::<E::BaseField>()];
             let cols: &mut WeierstrassAddAssignCols<F, E::BaseField> =
                 row.as_mut_slice().borrow_mut();
             let zero = BigUint::zero();

diff --git a/core/src/syscall/precompiles/weierstrass/weierstrass_decompress.rs b/core/src/syscall/precompiles/weierstrass/weierstrass_decompress.rs
@@ -32,15 +32,14 @@ use crate::runtime::Syscall;
 use crate::runtime::SyscallCode;
 use crate::syscall::precompiles::create_ec_decompress_event;
 use crate::syscall::precompiles::SyscallContext;
-use crate::utils::bytes_to_words_le_vec;
 use crate::utils::ec::weierstrass::bls12_381::bls12381_sqrt;
 use crate::utils::ec::weierstrass::secp256k1::secp256k1_sqrt;
 use crate::utils::ec::weierstrass::WeierstrassParameters;
 use crate::utils::ec::CurveType;
 use crate::utils::ec::EllipticCurve;
 use crate::utils::limbs_from_access;
 use crate::utils::limbs_from_prev_access;
-use crate::utils::pad_rows;
+use crate::utils::{bytes_to_words_le_vec, pad_rows};
 
 pub const fn num_weierstrass_decompress_cols<P: FieldParameters + NumWords>() -> usize {
     size_of::<WeierstrassDecompressCols<u8, P>>()
@@ -137,8 +136,6 @@ impl<E: EllipticCurve + WeierstrassParameters> WeierstrassDecompressChip<E> {
 
 impl<F: PrimeField32, E: EllipticCurve + WeierstrassParameters> MachineAir<F>
     for WeierstrassDecompressChip<E>
-where
-    [(); num_weierstrass_decompress_cols::<E::BaseField>()]:,
 {
     type Record = ExecutionRecord;
     type Program = Program;
@@ -168,7 +165,7 @@ where
 
         for i in 0..events.len() {
             let event = events[i].clone();
-            let mut row = [F::zero(); num_weierstrass_decompress_cols::<E::BaseField>()];
+            let mut row = vec![F::zero(); num_weierstrass_decompress_cols::<E::BaseField>()];
             let cols: &mut WeierstrassDecompressCols<F, E::BaseField> =
                 row.as_mut_slice().borrow_mut();
 
@@ -209,7 +206,7 @@ where
         output.add_byte_lookup_events(new_byte_lookup_events);
 
         pad_rows(&mut rows, || {
-            let mut row = [F::zero(); num_weierstrass_decompress_cols::<E::BaseField>()];
+            let mut row = vec![F::zero(); num_weierstrass_decompress_cols::<E::BaseField>()];
             let cols: &mut WeierstrassDecompressCols<F, E::BaseField> =
                 row.as_mut_slice().borrow_mut();
 

diff --git a/core/src/syscall/precompiles/weierstrass/weierstrass_double.rs b/core/src/syscall/precompiles/weierstrass/weierstrass_double.rs
@@ -37,8 +37,7 @@ use crate::utils::ec::weierstrass::WeierstrassParameters;
 use crate::utils::ec::AffinePoint;
 use crate::utils::ec::CurveType;
 use crate::utils::ec::EllipticCurve;
-use crate::utils::limbs_from_prev_access;
-use crate::utils::pad_rows;
+use crate::utils::{limbs_from_prev_access, pad_rows};
 
 pub const fn num_weierstrass_double_cols<P: FieldParameters + NumWords>() -> usize {
     size_of::<WeierstrassDoubleAssignCols<u8, P>>()
@@ -221,8 +220,6 @@ impl<E: EllipticCurve + WeierstrassParameters> WeierstrassDoubleAssignChip<E> {
 
 impl<F: PrimeField32, E: EllipticCurve + WeierstrassParameters> MachineAir<F>
     for WeierstrassDoubleAssignChip<E>
-where
-    [(); num_weierstrass_double_cols::<E::BaseField>()]:,
 {
     type Record = ExecutionRecord;
     type Program = Program;
@@ -261,7 +258,8 @@ where
                 let rows = events
                     .iter()
                     .map(|event| {
-                        let mut row = [F::zero(); num_weierstrass_double_cols::<E::BaseField>()];
+                        let mut row =
+                            vec![F::zero(); num_weierstrass_double_cols::<E::BaseField>()];
                         let cols: &mut WeierstrassDoubleAssignCols<F, E::BaseField> =
                             row.as_mut_slice().borrow_mut();
 
@@ -310,7 +308,7 @@ where
         }
 
         pad_rows(&mut rows, || {
-            let mut row = [F::zero(); num_weierstrass_double_cols::<E::BaseField>()];
+            let mut row = vec![F::zero(); num_weierstrass_double_cols::<E::BaseField>()];
             let cols: &mut WeierstrassDoubleAssignCols<F, E::BaseField> =
                 row.as_mut_slice().borrow_mut();
             let zero = BigUint::zero();

diff --git a/core/src/utils/mod.rs b/core/src/utils/mod.rs
@@ -65,7 +65,7 @@ pub fn limbs_from_access<T: Copy, N: ArrayLength, M: MemoryCols<T>>(cols: &[M])
     Limbs(sized)
 }
 
-pub fn pad_rows<T: Clone, const N: usize>(rows: &mut Vec<[T; N]>, row_fn: impl Fn() -> [T; N]) {
+pub fn pad_rows<T: Clone>(rows: &mut Vec<T>, row_fn: impl Fn() -> T) {
     let nb_rows = rows.len();
     let mut padded_nb_rows = nb_rows.next_power_of_two();
     if padded_nb_rows < 16 {

diff --git a/eval/src/main.rs b/eval/src/main.rs
@@ -1,6 +1,3 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use clap::{command, Parser};
 use csv::WriterBuilder;
 use serde::Serialize;

diff --git a/prover/scripts/build_plonk_bn254.rs b/prover/scripts/build_plonk_bn254.rs
@@ -1,6 +1,3 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use std::path::PathBuf;
 
 use clap::Parser;

diff --git a/prover/scripts/e2e.rs b/prover/scripts/e2e.rs
@@ -1,6 +1,3 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use std::borrow::Borrow;
 use std::path::PathBuf;
 

diff --git a/prover/scripts/fibonacci_groth16.rs b/prover/scripts/fibonacci_groth16.rs
@@ -1,8 +1,5 @@
 //! Tests end-to-end performance of wrapping a recursion proof to PLONK.
 
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use std::time::Instant;
 
 use itertools::iproduct;

diff --git a/prover/scripts/fibonacci_sweep.rs b/prover/scripts/fibonacci_sweep.rs
@@ -1,8 +1,5 @@
 //! Sweeps end-to-end prover performance across a wide range of parameters for Fibonacci.
 
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use std::{fs::File, io::BufWriter, io::Write, time::Instant};
 
 use itertools::iproduct;

diff --git a/prover/scripts/tendermint_sweep.rs b/prover/scripts/tendermint_sweep.rs
@@ -1,8 +1,5 @@
 //! Sweeps end-to-end prover performance across a wide range of parameters for Tendermint.
 
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
 use std::{fs::File, io::BufWriter, io::Write, time::Instant};
 
 use itertools::iproduct;

diff --git a/prover/src/lib.rs b/prover/src/lib.rs
@@ -7,8 +7,6 @@
 //! 3. Wrap the shard proof into a SNARK-friendly field.
 //! 4. Wrap the last shard proof, proven over the SNARK-friendly field, into a PLONK proof.
 
-#![allow(incomplete_features)]
-#![feature(generic_const_exprs)]
 #![allow(clippy::too_many_arguments)]
 #![allow(clippy::new_without_default)]
 

diff --git a/recursion/core/src/poseidon2_wide/external.rs b/recursion/core/src/poseidon2_wide/external.rs
@@ -61,8 +61,7 @@ impl<F: PrimeField32, const DEGREE: usize> MachineAir<F> for Poseidon2WideChip<D
         let num_columns = <Self as BaseAir<F>>::width(self);
 
         for event in &input.poseidon2_events {
-            let mut row = Vec::new();
-            row.resize(num_columns, F::zero());
+            let mut row = vec![F::zero(); num_columns];
 
             let mut cols = if use_sbox_3 {
                 let cols: &mut Poseidon2SBoxCols<F> = row.as_mut_slice().borrow_mut();

diff --git a/recursion/program/src/lib.rs b/recursion/program/src/lib.rs
@@ -1,5 +1,3 @@
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
 #![allow(type_alias_bounds)]
 #![allow(clippy::type_complexity)]
 #![allow(clippy::too_many_arguments)]

diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -5,9 +5,6 @@
 //! Visit the [Getting Started](https://succinctlabs.github.io/sp1/getting-started.html) section
 //! in the official SP1 documentation for a quick start guide.
 
-#![allow(incomplete_features)]
-#![feature(generic_const_exprs)]
-
 #[rustfmt::skip]
 pub mod proto {
     pub mod network;