SHoltzen · ellieyhcheng · Mar 23, 2021 · Apr 2, 2021 · Jun 22, 2021 · Jun 24, 2021
diff --git a/bench/dicebench.ml b/bench/dicebench.ml
@@ -19,7 +19,7 @@ let run_benches () =
                       | Parser.Error ->
                         fprintf stderr "%a: syntax error\n" print_position buf;
                         failwith (Format.sprintf "Error parsing %s" contents) in
-                    (parsed, Compiler.compile_program ~eager_eval:true (snd (Passes.from_external_prog parsed)))
+                    (parsed, Compiler.compile_program ~eager_eval:true (snd (Passes.from_external_prog false (Passes.expand_recursion parsed) false false None false false)))
                   ))) in
   print_endline (Format.sprintf "Benchmark\tTime (s)\t#Paths (log10)\tBDD Size");
   List.iter benches ~f:(fun (name, bench) ->
@@ -60,8 +60,8 @@ let bench_caesar inline_functions =
   List.iter lst ~f:(fun len ->
       let t0 = Unix.gettimeofday () in
       let caesar = gen_caesar (List.init len ~f:(fun _ -> Random.int_incl 0 25)) in
-      let res = (if inline_functions then Passes.inline_functions caesar else caesar)
-                |> Passes.from_external_prog
+      let prog = (if inline_functions then Passes.inline_functions caesar else caesar) in
+      let res = Passes.from_external_prog false prog false false None false false
                 |> snd
                 |> Compiler.compile_program ~eager_eval:true in
       let sz = 0 in
@@ -99,8 +99,8 @@ let bench_caesar_error inline_functions =
   List.iter lst ~f:(fun len ->
       let t0 = Unix.gettimeofday () in
       let caesar = gen_caesar_error (List.init len ~f:(fun _ -> Random.int_incl 0 25)) in
-      let res = (if inline_functions then Passes.inline_functions caesar else caesar)
-                |> Passes.from_external_prog
+      let prog = (if inline_functions then Passes.inline_functions caesar else caesar) in 
+      let res = Passes.from_external_prog false prog false false None false false
                 |> snd
                 |> Compiler.compile_program ~eager_eval:true in
       (* let sz = Cudd.Bdd.size res.body.z in *)
@@ -135,7 +135,7 @@ let bench_diamond inline_functions =
       let caesar = gen_diamond (len + 1) in
       let inlined = if inline_functions then Passes.inline_functions caesar else caesar in
       let t0 = Unix.gettimeofday () in
-      let res = Passes.from_external_prog inlined
+      let res = Passes.from_external_prog false inlined false false None false false
                 |> snd
                 |> Compiler.compile_program ~eager_eval:true in
       let sz = VarState.state_size res.ctx.man [res.body.state] in
@@ -174,7 +174,7 @@ let bench_ladder inline_functions =
       let caesar = gen_ladder (len + 1) in
       let inlined = if inline_functions then Passes.inline_functions caesar else caesar in
       let t0 = Unix.gettimeofday () in
-      let res = Passes.from_external_prog inlined
+      let res = Passes.from_external_prog false inlined false false None false false
                 |> snd
                 |> Compiler.compile_program ~eager_eval:true in
       let sz = VarState.state_size res.ctx.man [res.body.state] in

diff --git a/benchmarks/bayesian-networks/BN_28.dice b/benchmarks/bayesian-networks/BN_28.dice
diff --git a/benchmarks/bayesian-networks/BN_78.dice b/benchmarks/bayesian-networks/BN_78.dice
diff --git a/benchmarks/bayesian-networks/BN_79.dice b/benchmarks/bayesian-networks/BN_79.dice
diff --git a/benchmarks/bayesian-networks/alarm-alt.dice b/benchmarks/bayesian-networks/alarm-alt.dice
diff --git a/benchmarks/bayesian-networks/alarm-safer.dice b/benchmarks/bayesian-networks/alarm-safer.dice
diff --git a/benchmarks/bayesian-networks/alarm.bif.dice → benchmarks/bayesian-networks/alarm.dice b/benchmarks/bayesian-networks/alarm.bif.dice → benchmarks/bayesian-networks/alarm.dice
diff --git a/benchmarks/bayesian-networks/alarm.bif.psi → benchmarks/bayesian-networks/alarm.psi b/benchmarks/bayesian-networks/alarm.bif.psi → benchmarks/bayesian-networks/alarm.psi