change riscv tests to use composite backends (#1583)

Also in preparation for registers in memory. Removing the `public`s for continuations as discussed with @georgwiese , since those are not sound anyway and we might change it completely soon.
powdr-labs · Jul 17, 2024 · e6bc15d · e6bc15d
1 parent eb3bdfb
commit e6bc15d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/pipeline/src/test_util.rs b/pipeline/src/test_util.rs
@@ -65,7 +65,6 @@ pub fn verify_pipeline(
     pipeline: Pipeline<GoldilocksField>,
     backend: BackendType,
 ) -> Result<(), String> {
-    // TODO: Also test Composite variants
     let mut pipeline = pipeline.with_backend(backend, None);
 
     if pipeline.output_dir().is_none() {

diff --git a/riscv/src/continuations/bootloader.rs b/riscv/src/continuations/bootloader.rs
@@ -73,22 +73,22 @@ pub fn bootloader_preamble() -> String {
     for (i, reg) in REGISTER_NAMES.iter().enumerate() {
         let reg = reg.strip_prefix("main.").unwrap();
         preamble.push_str(&format!(
-            "    public initial_{reg} = main_bootloader_inputs.value({i});\n"
+            "    //public initial_{reg} = main_bootloader_inputs.value({i});\n"
         ));
     }
     for (i, reg) in REGISTER_NAMES.iter().enumerate() {
         let reg = reg.strip_prefix("main.").unwrap();
         preamble.push_str(&format!(
-            "    public final_{reg} = main_bootloader_inputs.value({});\n",
+            "    //public final_{reg} = main_bootloader_inputs.value({});\n",
             i + REGISTER_NAMES.len()
         ));
     }
     preamble.push_str(&format!(
         r#"
-    public initial_memory_hash_1 = main_bootloader_inputs.value({});
-    public initial_memory_hash_2 = main_bootloader_inputs.value({});
-    public initial_memory_hash_3 = main_bootloader_inputs.value({});
-    public initial_memory_hash_4 = main_bootloader_inputs.value({});
+    //public initial_memory_hash_1 = main_bootloader_inputs.value({});
+    //public initial_memory_hash_2 = main_bootloader_inputs.value({});
+    //public initial_memory_hash_3 = main_bootloader_inputs.value({});
+    //public initial_memory_hash_4 = main_bootloader_inputs.value({});
 "#,
         MEMORY_HASH_START_INDEX,
         MEMORY_HASH_START_INDEX + 1,
@@ -97,10 +97,10 @@ pub fn bootloader_preamble() -> String {
     ));
     preamble.push_str(&format!(
         r#"
-    public final_memory_hash_1 = main_bootloader_inputs.value({});
-    public final_memory_hash_2 = main_bootloader_inputs.value({});
-    public final_memory_hash_3 = main_bootloader_inputs.value({});
-    public final_memory_hash_4 = main_bootloader_inputs.value({});
+    //public final_memory_hash_1 = main_bootloader_inputs.value({});
+    //public final_memory_hash_2 = main_bootloader_inputs.value({});
+    //public final_memory_hash_3 = main_bootloader_inputs.value({});
+    //public final_memory_hash_4 = main_bootloader_inputs.value({});
 "#,
         MEMORY_HASH_START_INDEX + 4,
         MEMORY_HASH_START_INDEX + 5,

diff --git a/riscv/tests/common/mod.rs b/riscv/tests/common/mod.rs
@@ -93,6 +93,6 @@ pub fn verify_riscv_asm_file(asm_file: &Path, runtime: &Runtime, use_pie: bool)
         &powdr_asm,
         &[],
         None,
-        BackendType::EStarkDump,
+        BackendType::EStarkDumpComposite,
     );
 }
diff --git a/riscv/tests/instructions.rs b/riscv/tests/instructions.rs
@@ -33,7 +33,7 @@ mod instruction_tests {
             &powdr_asm,
             Default::default(),
             None,
-            BackendType::EStarkDump,
+            BackendType::EStarkDumpComposite,
         );
     }
 

diff --git a/riscv/tests/riscv.rs b/riscv/tests/riscv.rs
@@ -4,7 +4,7 @@ use common::{verify_riscv_asm_file, verify_riscv_asm_string};
 use mktemp::Temp;
 use powdr_backend::BackendType;
 use powdr_number::GoldilocksField;
-use powdr_pipeline::{verify::verify, Pipeline};
+use powdr_pipeline::{test_util::verify_pipeline, Pipeline};
 use std::path::{Path, PathBuf};
 use test_log::test;
 
@@ -47,11 +47,7 @@ fn run_continuations_test(case: &str, powdr_asm: String) {
         .with_prover_inputs(Default::default())
         .with_output(tmp_dir.to_path_buf(), false);
     let pipeline_callback = |pipeline: Pipeline<GoldilocksField>| -> Result<(), ()> {
-        // Can't use `verify_pipeline`, because the pipeline was renamed in the middle of after
-        // computing the constants file.
-        let mut pipeline = pipeline.with_backend(BackendType::EStarkDump, None);
-        pipeline.compute_proof().unwrap();
-        verify(pipeline.output_dir().as_ref().unwrap()).unwrap();
+        verify_pipeline(pipeline, BackendType::EStarkDumpComposite).unwrap();
 
         Ok(())
     };
@@ -154,7 +150,7 @@ fn vec_median_estark_polygon() {
             .map(|x| x.into())
             .collect(),
         &Runtime::base(),
-        BackendType::EStarkPolygon,
+        BackendType::EStarkPolygonComposite,
     );
 }
 
@@ -387,7 +383,13 @@ fn verify_riscv_crate_with_data<S: serde::Serialize + Send + Sync + 'static>(
     runtime: &Runtime,
     data: Vec<(u32, S)>,
 ) {
-    verify_riscv_crate_from_both_paths(case, inputs, runtime, Some(data), BackendType::EStarkDump)
+    verify_riscv_crate_from_both_paths(
+        case,
+        inputs,
+        runtime,
+        Some(data),
+        BackendType::EStarkDumpComposite,
+    )
 }
 
 fn verify_riscv_crate_from_both_paths<S: serde::Serialize + Send + Sync + 'static>(