Merge pull request #1089 from powdr-labs/revert-1082-assignment-registers-intermediate

Revert "Turn assignment registers into intermediate polynomials"

Author: Leo

asm-to-pil/src/vm_to_constrained.rs

@@ -299,18 +299,15 @@ impl<T: FieldElement> ASMPILConverter<T> {
                 default_update = Some(direct_reference(&name));
             }
         };
-        // Assignment registers are intermediate columns
-        if ty != RegisterTy::Assignment {
-            self.pil.push(witness_column(source, name.clone(), None));
-        }
         self.registers.insert(
-            name,
+            name.to_string(),
             Register {
                 conditioned_updates,
                 default_update,
                 ty,
             },
         );
+        self.pil.push(witness_column(source, name, None));
     }
 
     fn handle_instruction_def(
@@ -840,10 +837,9 @@ impl<T: FieldElement> ASMPILConverter<T> {
                 direct_reference(read_free) * direct_reference(free_value),
             ])
             .sum();
-        self.pil.push(PilStatement::PolynomialDefinition(
+        self.pil.push(PilStatement::Expression(
             SourceRef::unknown(),
-            register.clone(),
-            assign_constraint,
+            build::identity(direct_reference(register), assign_constraint),
         ));
     }
 

linker/src/lib.rs

@@ -298,6 +298,8 @@ mod test {
         let expectation = r#"namespace main(16);
     pol commit _operation_id(i) query ("hint", 4);
     pol commit pc;
+    pol commit X;
+    pol commit Y;
     pol commit reg_write_X_A;
     pol commit reg_write_Y_A;
     pol commit A;
@@ -312,12 +314,12 @@ mod test {
     pol commit X_read_free;
     pol commit read_X_A;
     pol commit read_X_pc;
-    pol X = ((((read_X_A * A) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value));
+    (X = ((((read_X_A * A) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value)));
     pol commit Y_const;
     pol commit Y_read_free;
     pol commit read_Y_A;
     pol commit read_Y_pc;
-    pol Y = ((((read_Y_A * A) + (read_Y_pc * pc)) + Y_const) + (Y_read_free * Y_free_value));
+    (Y = ((((read_Y_A * A) + (read_Y_pc * pc)) + Y_const) + (Y_read_free * Y_free_value)));
     pol constant first_step = [1] + [0]*;
     (A' = ((((reg_write_X_A * X) + (reg_write_Y_A * Y)) + (instr__reset * 0)) + ((1 - ((reg_write_X_A + reg_write_Y_A) + instr__reset)) * A)));
     pol pc_update = ((((instr__jump_to_operation * _operation_id) + (instr__loop * pc)) + (instr_return * 0)) + ((1 - ((instr__jump_to_operation + instr__loop) + instr_return)) * (pc + 1)));
@@ -356,6 +358,7 @@ namespace main_sub(16);
     pol commit _operation_id(i) query ("hint", 5);
     pol commit pc;
     pol commit _input_0;
+    pol commit _output_0;
     pol commit instr__jump_to_operation;
     pol commit instr__reset;
     pol commit instr__loop;
@@ -364,7 +367,7 @@ namespace main_sub(16);
     pol commit _output_0_read_free;
     pol commit read__output_0_pc;
     pol commit read__output_0__input_0;
-    pol _output_0 = ((((read__output_0_pc * pc) + (read__output_0__input_0 * _input_0)) + _output_0_const) + (_output_0_read_free * _output_0_free_value));
+    (_output_0 = ((((read__output_0_pc * pc) + (read__output_0__input_0 * _input_0)) + _output_0_const) + (_output_0_read_free * _output_0_free_value)));
     pol constant first_step = [1] + [0]*;
     (((1 - instr__reset) * (_input_0' - _input_0)) = 0);
     pol pc_update = ((((instr__jump_to_operation * _operation_id) + (instr__loop * pc)) + (instr_return * 0)) + ((1 - ((instr__jump_to_operation + instr__loop) + instr_return)) * (pc + 1)));
@@ -405,6 +408,7 @@ namespace main_sub(16);
     ((XIsZero * (1 - XIsZero)) = 0);
     pol commit _operation_id(i) query ("hint", 10);
     pol commit pc;
+    pol commit X;
     pol commit reg_write_X_A;
     pol commit A;
     pol commit reg_write_X_CNT;
@@ -427,7 +431,7 @@ namespace main_sub(16);
     pol commit read_X_A;
     pol commit read_X_CNT;
     pol commit read_X_pc;
-    pol X = (((((read_X_A * A) + (read_X_CNT * CNT)) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value));
+    (X = (((((read_X_A * A) + (read_X_CNT * CNT)) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value)));
     pol constant first_step = [1] + [0]*;
     (A' = (((reg_write_X_A * X) + (instr__reset * 0)) + ((1 - (reg_write_X_A + instr__reset)) * A)));
     (CNT' = ((((reg_write_X_CNT * X) + (instr_dec_CNT * (CNT - 1))) + (instr__reset * 0)) + ((1 - ((reg_write_X_CNT + instr_dec_CNT) + instr__reset)) * CNT)));
@@ -578,6 +582,7 @@ machine Main {
         let expected = r#"namespace main(1024);
     pol commit _operation_id(i) query ("hint", 3);
     pol commit pc;
+    pol commit X;
     pol commit reg_write_X_A;
     pol commit A;
     pol commit instr_add5_into_A;
@@ -589,7 +594,7 @@ machine Main {
     pol commit X_read_free;
     pol commit read_X_A;
     pol commit read_X_pc;
-    pol X = ((((read_X_A * A) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value));
+    (X = ((((read_X_A * A) + (read_X_pc * pc)) + X_const) + (X_read_free * X_free_value)));
     pol constant first_step = [1] + [0]*;
     (A' = ((((reg_write_X_A * X) + (instr_add5_into_A * A')) + (instr__reset * 0)) + ((1 - ((reg_write_X_A + instr_add5_into_A) + instr__reset)) * A)));
     pol pc_update = ((((instr__jump_to_operation * _operation_id) + (instr__loop * pc)) + (instr_return * 0)) + ((1 - ((instr__jump_to_operation + instr__loop) + instr_return)) * (pc + 1)));