Skip to content

Commit

Permalink
Remove test
Browse files Browse the repository at this point in the history
  • Loading branch information
georgwiese committed Oct 25, 2024
1 parent 9855348 commit 1bbcc9b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 43 deletions.
14 changes: 7 additions & 7 deletions pipeline/tests/powdr_std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,15 @@ fn permutation_via_challenges_ext() {
}

#[test]
fn lookup_via_challenges_bn() {
fn lookup_via_challenges() {
let f = "std/lookup_via_challenges.asm";
test_halo2(make_simple_prepared_pipeline(f));

// TODO: Plonky3 fails, not sure why...
// test_plonky3_pipeline(make_simple_prepared_pipeline::<GoldilocksField>(f));

// At least run witness generation on Goldilocks.
make_simple_prepared_pipeline::<GoldilocksField>(f);
}

#[test]
Expand All @@ -175,12 +181,6 @@ fn bus_permutation_via_challenges_bn() {
test_halo2(make_simple_prepared_pipeline(f));
}

#[test]
fn test_multiplicities() {
let f = "std/multiplicities.asm";
test_halo2(make_simple_prepared_pipeline(f));
}

#[test]
fn bus_permutation_via_challenges_ext_bn() {
let f = "std/bus_permutation_via_challenges_ext.asm";
Expand Down
25 changes: 13 additions & 12 deletions test_data/std/lookup_via_challenges.asm
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
use std::prelude::Query;
use std::convert::fe;
use std::protocols::lookup::lookup;
use std::math::fp2::from_base;
use std::prover::challenge;

machine Main with degree: 8 {

// Pre-compute f(X) = X + 1 for X = 1, 2, 3, 4, 5, 6, 7, 8
col fixed X_PRECOMPUTED = [1, 2, 3, 4, 5, 6, 7, 8];
col fixed Y_PRECOMPUTED = [2, 3, 4, 5, 6, 7, 8, 9];

// Runtime values, masking some elements
col fixed x = [2, 2, 5, 4, 7, 8, 3, 3];
col fixed MASK = [1, 1, 0, 1, 1, 1, 0, 1];
col fixed x = [1, 5, 2, 6, 4, 2, 6, 3];
col witness y;

col fixed m = [0, 2, 1, 1, 0, 0, 1, 1];
// Pre-compute f(x) = x + 1 for all x in [1, 8]
col fixed INC_X = [1, 2, 3, 4, 5, 6, 7, 8];
col fixed INC_Y = [2, 3, 4, 5, 6, 7, 8, 9];

// Machine extractor currently accepts the multiplicity column with exact the name of "m_logup_multiplicity"
col witness m_logup_multiplicity;

// This would be the correct multiplicity values that would satisfy the constraints:
//col fixed m_logup_multiplicity = [1, 2, 1, 1, 1, 2, 0, 0];

let lookup_constraint = MASK $ [x, y] in [X_PRECOMPUTED, Y_PRECOMPUTED];
let lookup_constraint = [x, y] in [INC_X, INC_Y];

lookup(lookup_constraint, m);
}
lookup(lookup_constraint, m_logup_multiplicity);
}
24 changes: 0 additions & 24 deletions test_data/std/multiplicities.asm

This file was deleted.

0 comments on commit 1bbcc9b

Please sign in to comment.