Inline intermediate polynomials

Author: georgwiese

executor/src/witgen/jit/processor.rs

@@ -276,10 +276,10 @@ impl<'a, T: FieldElement> Processor<'a, T> {
                     Identity::Connect(..) => Ok(vec![]),
                 },
                 QueueItem::VariableAssignment(assignment) => witgen.process_equation_on_row(
-                    assignment.lhs,
-                    Some(assignment.rhs.clone()),
-                    0.into(),
-                    assignment.row_offset,
+                        assignment.lhs,
+                        Some(assignment.rhs.clone()),
+                        0.into(),
+                        assignment.row_offset,
                 ),
                 QueueItem::ConstantAssignment(assignment) => witgen.process_equation_on_row(
                     assignment.lhs,

std/machines/large_field/arith.asm

@@ -138,12 +138,12 @@ machine Arith with
     
     let combine: expr[] -> expr[] = |x| array::new(array::len(x) / 2, |i| x[2 * i + 1] * 2**16 + x[2 * i]);
     // Intermediate polynomials, arrays of 8 columns, 32 bit per column.
-    col x1c[8] = combine(x1);
-    col y1c[8] = combine(y1);
-    col x2c[8] = combine(x2);
-    col y2c[8] = combine(y2);
-    col x3c[8] = combine(x3);
-    col y3c[8] = combine(y3);
+    let x1c = combine(x1);
+    let y1c = combine(y1);
+    let x2c = combine(x2);
+    let y2c = combine(y2);
+    let x3c = combine(x3);
+    let y3c = combine(y3);
 
     let CLK32: col[32] = array::new(32, |i| |row| if row % 32 == i { 1 } else { 0 });
     let CLK32_31: expr = CLK32[31];
@@ -346,11 +346,11 @@ machine Arith with
     // TODO: To reduce the degree of the constraints, these intermediate columns should be materialized.
     // However, witgen doesn't work currently if we do, likely because for some operations, not all inputs are
     // available.
-    col eq0_sum = sum(32, |i| eq0(i) * CLK32[i]);
-    col eq1_sum = sum(32, |i| eq1(i) * CLK32[i]);
-    col eq2_sum = sum(32, |i| eq2(i) * CLK32[i]);
-    col eq3_sum = sum(32, |i| eq3(i) * CLK32[i]);
-    col eq4_sum = sum(32, |i| eq4(i) * CLK32[i]);
+    let eq0_sum = sum(32, |i| eq0(i) * CLK32[i]);
+    let eq1_sum = sum(32, |i| eq1(i) * CLK32[i]);
+    let eq2_sum = sum(32, |i| eq2(i) * CLK32[i]);
+    let eq3_sum = sum(32, |i| eq3(i) * CLK32[i]);
+    let eq4_sum = sum(32, |i| eq4(i) * CLK32[i]);
 
     selEq[0] * (eq0_sum + carry[0]) = selEq[0] * carry[0]' * 2**16;
     selEq[1] * (eq1_sum + carry[0]) = selEq[1] * carry[0]' * 2**16;

std/machines/large_field/arith256_memory.asm

@@ -286,12 +286,12 @@ machine Arith256Memory(mem: Memory) with
 
     let combine: expr[] -> expr[] = |x| array::new(array::len(x) / 2, |i| x[2 * i + 1] * 2**16 + x[2 * i]);
     // Intermediate polynomials, arrays of 8 columns, 32 bit per column.
-    col x1c[8] = combine(x1);
-    col y1c[8] = combine(y1);
-    col x2c[8] = combine(x2);
-    col y2c[8] = combine(y2);
-    col x3c[8] = combine(x3);
-    col y3c[8] = combine(y3);
+    let x1c = combine(x1);
+    let y1c = combine(y1);
+    let x2c = combine(x2);
+    let y2c = combine(y2);
+    let x3c = combine(x3);
+    let y3c = combine(y3);
 
     let CLK32: col[32] = array::new(32, |i| |row| if row % 32 == i { 1 } else { 0 });
     let CLK32_31: expr = CLK32[31];
@@ -501,11 +501,11 @@ machine Arith256Memory(mem: Memory) with
     // TODO: To reduce the degree of the constraints, these intermediate columns should be materialized.
     // However, witgen doesn't work currently if we do, likely because for some operations, not all inputs are
     // available.
-    col eq0_sum = sum(32, |i| eq0(i) * CLK32[i]);
-    col eq1_sum = sum(32, |i| eq1(i) * CLK32[i]);
-    col eq2_sum = sum(32, |i| eq2(i) * CLK32[i]);
-    col eq3_sum = sum(32, |i| eq3(i) * CLK32[i]);
-    col eq4_sum = sum(32, |i| eq4(i) * CLK32[i]);
+    let eq0_sum = sum(32, |i| eq0(i) * CLK32[i]);
+    let eq1_sum = sum(32, |i| eq1(i) * CLK32[i]);
+    let eq2_sum = sum(32, |i| eq2(i) * CLK32[i]);
+    let eq3_sum = sum(32, |i| eq3(i) * CLK32[i]);
+    let eq4_sum = sum(32, |i| eq4(i) * CLK32[i]);
 
     selEq[0] * (eq0_sum + carry[0]) = selEq[0] * carry[0]' * 2**16;
     selEq[1] * (eq1_sum + carry[0]) = selEq[1] * carry[0]' * 2**16;