Merge branch 'main' of github.com:toolCHAINZ/crackers into ablation_b

Author: toolCHAINZ

src/bin/crackers/main.rs

@@ -120,25 +120,23 @@ fn synthesize(config: PathBuf) -> anyhow::Result<()> {
         .with(tracing_subscriber::fmt::layer().with_writer(writer))
         .init();
     let params = p.resolve()?;
-
-    match params.build_combined(&z3) {
-        Ok(mut p) => match p.decide() {
-            Ok(res) => match res {
-                DecisionResult::AssignmentFound(a) => {
-                    event!(Level::INFO, "Synthesis successful :)");
-                    println!("{}", a)
-                }
-                DecisionResult::Unsat(a) => {
-                    event!(Level::ERROR, "Synthesis unsuccessful: {:?}", a);
-                }
-            },
-            Err(e) => {
-                event!(Level::ERROR, "Synthesis error: {}", e)
+    let result = match params.combine_instructions{
+        true => params.build_combined(&z3).and_then(|mut c|c.decide()),
+        false => params.build_single(&z3).and_then(|mut c| c.decide())
+    };
+    match result {
+        Ok(res) => match res {
+            DecisionResult::AssignmentFound(a) => {
+                event!(Level::INFO, "Synthesis successful :)");
+                println!("{}", a)
+            }
+            DecisionResult::Unsat(a) => {
+                event!(Level::ERROR, "Synthesis unsuccessful: {:?}", a);
             }
         },
         Err(e) => {
-            event!(Level::ERROR, "Error setting up synthesis: {}", e)
+            event!(Level::ERROR, "Synthesis error: {}", e)
         }
-    };
+    }
     Ok(())
 }

src/config/mod.rs

@@ -40,6 +40,7 @@ impl CrackersConfig {
         b.gadget_library(library)
             .seed(self.meta.seed).slots(self.specification.max_instructions);
         b.selection_strategy(self.synthesis.strategy);
+        b.combine_instructions(self.synthesis.combine_instructions);
         b.candidates_per_slot(self.synthesis.max_candidates_per_slot);
         b.parallel(self.synthesis.parallel).seed(self.meta.seed);
 

src/config/synthesis.rs

@@ -7,6 +7,7 @@ pub struct SynthesisConfig {
     pub strategy: SynthesisSelectionStrategy,
     pub max_candidates_per_slot: usize,
     pub parallel: usize,
+    pub combine_instructions: bool
 }
 
 impl Default for SynthesisConfig {
@@ -15,6 +16,7 @@ impl Default for SynthesisConfig {
             strategy: SynthesisSelectionStrategy::OptimizeStrategy,
             max_candidates_per_slot: 50,
             parallel: 4,
+            combine_instructions: true
         }
     }
 }

src/synthesis/builder.rs

@@ -38,6 +38,8 @@ pub enum Library {
 #[derive(Clone, Builder)]
 pub struct SynthesisParams {
     pub seed: i64,
+    #[builder(default)]
+    pub combine_instructions: bool,
     pub selection_strategy: SynthesisSelectionStrategy,
     #[builder(setter(custom))]
     pub gadget_library: Arc<GadgetLibrary>,