fix more tests

Author: Schaeff

executor/src/witgen/jit/prover_function_heuristics.rs

@@ -122,7 +122,7 @@ fn try_decode_provide_if_unknown<T>(
 }
 
 /// Decodes functions of the form
-/// ```
+/// ```pil
 /// query |<i>| std::prover::handle_query(<Y>, <i>, match std::prover::eval(<pc>) {
 ///   <value1> => std::prelude::Query::Output(std::convert::int::<fe>(std::prover::eval(<arg1>)), std::prover::eval(<arg2>)),
 ///   <value2> => std::prelude::Query::Input(std::convert::int::<fe>(std::prover::eval(<arg1>)), std::convert::int::<fe>(std::prover::eval(<arg2>))),

pilopt/src/lib.rs

@@ -131,7 +131,11 @@ fn remove_unreferenced_definitions<T: FieldElement>(pil_file: &mut Analyzed<T>)
                 )
             }
         } else if let Some((_, value)) = pil_file.intermediate_columns.get(n.name.as_ref()) {
-            assert!(n.type_args.is_none());
+            assert!(n
+                .type_args
+                .as_ref()
+                .map(|args| args.is_empty())
+                .unwrap_or(true));
             Box::new(value.iter().flat_map(|v| {
                 v.all_children().flat_map(|e| {
                     if let AlgebraicExpression::Reference(AlgebraicReference { poly_id, .. }) = e {
@@ -565,7 +569,7 @@ fn extract_constant_lookups<T: FieldElement>(pil_file: &mut Analyzed<T>) {
 
 /// Identifies witness columns that are constrained to a non-shifted (multi)linear expression, replaces the witness column by an intermediate polynomial.
 /// The pattern is the following:
-/// ```
+/// ```pil
 /// col witness x;
 /// x = lin;
 /// ```

pipeline/tests/pil.rs

@@ -256,7 +256,7 @@ fn halo_without_lookup() {
 
 #[test]
 fn add() {
-    let f = "pil/add.pil";
+    let f = "pil/mul.pil";
     regular_test_gl(f, Default::default());
 }
 

test_data/pil/add.pil test_data/pil/mul.pil

@@ -1,5 +1,5 @@
-namespace Add(8);
+namespace Mul(8);
     let a;
     let b;
     let c;
-    a + b = c;
+    a * b = c;

test_data/std/fingerprint_test.asm

@@ -34,7 +34,8 @@ machine Main with degree: 2048 {
     col witness stage(1) fingerprint_value1_hint(i) query Query::Hint(fingerprint_hint()[1]);
 
     // Assert consistency between `fingerprint` and `fingerprint_inter`
-    fingerprint_value0 = fingerprint_value0_hint;
-    fingerprint_value1 = fingerprint_value1_hint;
+    // We compare squares to avoid the linear constraint being optimized away, which currently leads to an issue because `fingerprint_value0_hint` has a hint
+    fingerprint_value0 * fingerprint_value0 = fingerprint_value0_hint * fingerprint_value0_hint;
+    fingerprint_value1 * fingerprint_value1 = fingerprint_value1_hint * fingerprint_value1_hint;
 
 }