opts and tests from the memory project

.github/workflows/ci.yml

@@ -22,8 +22,10 @@ jobs:
               with:
                   toolchain: stable
             - uses: Swatinem/rust-cache@v2
+            - name: No default features pushed
+              run: zsh ./scripts/assert_no_default_features.zsh
             - name: Set all features on
-              run: python3 driver.py --all_features
+              run: python3 driver.py --all-features
             - name: Install python reqs
               run: python3 driver.py --install
             - name: Check

.gitignore

@@ -15,3 +15,5 @@ __pycache__
 .mode.txt
 scripts/aby_tests/tests
 /flamegraph*.svg
+/.ccls-cache
+/.vscode

Cargo.toml

@@ -61,7 +61,7 @@ bls12_381 = "0.7"
 approx = "0.5.0"
 
 [features]
-default = ["bellman", "r1cs", "poly", "smt", "zok"]
+default = []
 # frontends
 c = ["lang-c"]
 zok = ["smt", "zokrates_parser", "zokrates_pest_ast", "typed-arena", "petgraph"]

circ_opt/README.md

@@ -92,6 +92,13 @@ Options:
           [default: false]
           [possible values: true, false]
 
+      --ir-fits-in-bits-ip <FITS_IN_BITS_IP>
+          Use an IP to check bit-constraints
+
+          [env: IR_FITS_IN_BITS_IP=]
+          [default: true]
+          [possible values: true, false]
+
       --ram <ENABLED>
           Whether to use advanced RAM techniques
 
@@ -120,7 +127,7 @@ Options:
           - uniqueness: Use the GCD-derivative uniqueness argument
 
       --ram-permutation <PERMUTATION>
-          How to argue that indices are only repeated in blocks
+          How to permute accesses
 
           [env: RAM_PERMUTATION=]
           [default: msh]
@@ -212,14 +219,16 @@ Options:
           Which field to use [env: IR_FIELD_TO_BV=] [default: wrap] [possible values: wrap, panic]
       --ir-frequent-gc <FREQUENT_GC>
           Garbage collection after each optimization pass [env: IR_FREQUENT_GC=] [default: false] [possible values: true, false]
+      --ir-fits-in-bits-ip <FITS_IN_BITS_IP>
+          Use an IP to check bit-constraints [env: IR_FITS_IN_BITS_IP=] [default: true] [possible values: true, false]
       --ram <ENABLED>
           Whether to use advanced RAM techniques [env: RAM=] [default: false] [possible values: true, false]
       --ram-range <RANGE>
           How to argue that values are in a range [env: RAM_RANGE=] [default: sort] [possible values: bit-split, sort]
       --ram-index <INDEX>
           How to argue that indices are only repeated in blocks [env: RAM_INDEX=] [default: uniqueness] [possible values: sort, uniqueness]
       --ram-permutation <PERMUTATION>
-          How to argue that indices are only repeated in blocks [env: RAM_PERMUTATION=] [default: msh] [possible values: waksman, msh]
+          How to permute accesses [env: RAM_PERMUTATION=] [default: msh] [possible values: waksman, msh]
       --ram-rom <ROM>
           ROM approach [env: RAM_ROM=] [default: haboeck] [possible values: haboeck, permute]
       --fmt-use-default-field <USE_DEFAULT_FIELD>
@@ -259,6 +268,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -305,6 +315,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -349,6 +360,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -393,6 +405,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -437,6 +450,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -481,6 +495,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -525,6 +540,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -569,6 +585,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -616,6 +633,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -661,6 +679,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -708,6 +727,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -753,6 +773,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -800,6 +821,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,
@@ -845,6 +867,7 @@ BinaryOpt {
         ir: IrOpt {
             field_to_bv: Wrap,
             frequent_gc: false,
+            fits_in_bits_ip: true,
         },
         ram: RamOpt {
             enabled: false,

circ_opt/src/lib.rs

@@ -168,7 +168,7 @@ impl Default for BuiltinField {
 }
 
 /// Options for the prime field used
-#[derive(Args, Debug, Default, Clone, PartialEq, Eq)]
+#[derive(Args, Debug, Clone, PartialEq, Eq)]
 pub struct IrOpt {
     /// Which field to use
     #[arg(
@@ -186,6 +186,24 @@ pub struct IrOpt {
         default_value = "false"
     )]
     pub frequent_gc: bool,
+    /// Use an IP to check bit-constraints
+    #[arg(
+        long = "ir-fits-in-bits-ip",
+        env = "IR_FITS_IN_BITS_IP",
+        action = ArgAction::Set,
+        default_value = "true"
+    )]
+    pub fits_in_bits_ip: bool,
+}
+
+impl Default for IrOpt {
+    fn default() -> Self {
+        Self {
+            field_to_bv: Default::default(),
+            frequent_gc: Default::default(),
+            fits_in_bits_ip: true,
+        }
+    }
 }
 
 #[derive(ValueEnum, Debug, PartialEq, Eq, Clone, Copy)]
@@ -231,7 +249,7 @@ pub struct RamOpt {
         default_value = "uniqueness"
     )]
     pub index: IndexStrategy,
-    /// How to argue that indices are only repeated in blocks.
+    /// How to permute accesses
     #[arg(
         long = "ram-permutation",
         env = "RAM_PERMUTATION",