Re-write Predication to use FunctionEditor

hercules_opt/src/pass.rs

@@ -25,6 +25,7 @@ pub enum Pass {
     PhiElim,
     Forkify,
     ForkGuardElim,
+    WritePredication,
     Predication,
     SROA,
     Inline,
@@ -469,27 +470,58 @@ impl PassManager {
                     }
                     self.clear_analyses();
                 }
+                Pass::WritePredication => {
+                    self.make_def_uses();
+                    let def_uses = self.def_uses.as_ref().unwrap();
+                    for idx in 0..self.module.functions.len() {
+                        let constants_ref =
+                            RefCell::new(std::mem::take(&mut self.module.constants));
+                        let dynamic_constants_ref =
+                            RefCell::new(std::mem::take(&mut self.module.dynamic_constants));
+                        let types_ref = RefCell::new(std::mem::take(&mut self.module.types));
+                        let mut editor = FunctionEditor::new(
+                            &mut self.module.functions[idx],
+                            FunctionID::new(idx),
+                            &constants_ref,
+                            &dynamic_constants_ref,
+                            &types_ref,
+                            &def_uses[idx],
+                        );
+                        write_predication(&mut editor);
+
+                        self.module.constants = constants_ref.take();
+                        self.module.dynamic_constants = dynamic_constants_ref.take();
+                        self.module.types = types_ref.take();
+
+                        self.module.functions[idx].delete_gravestones();
+                    }
+                    self.clear_analyses();
+                }
                 Pass::Predication => {
                     self.make_def_uses();
-                    self.make_reverse_postorders();
-                    self.make_doms();
-                    self.make_fork_join_maps();
+                    self.make_typing();
                     let def_uses = self.def_uses.as_ref().unwrap();
-                    let reverse_postorders = self.reverse_postorders.as_ref().unwrap();
-                    let doms = self.doms.as_ref().unwrap();
-                    let fork_join_maps = self.fork_join_maps.as_ref().unwrap();
+                    let typing = self.typing.as_ref().unwrap();
                     for idx in 0..self.module.functions.len() {
-                        predication(
+                        let constants_ref =
+                            RefCell::new(std::mem::take(&mut self.module.constants));
+                        let dynamic_constants_ref =
+                            RefCell::new(std::mem::take(&mut self.module.dynamic_constants));
+                        let types_ref = RefCell::new(std::mem::take(&mut self.module.types));
+                        let mut editor = FunctionEditor::new(
                             &mut self.module.functions[idx],
+                            FunctionID::new(idx),
+                            &constants_ref,
+                            &dynamic_constants_ref,
+                            &types_ref,
                             &def_uses[idx],
-                            &reverse_postorders[idx],
-                            &doms[idx],
-                            &fork_join_maps[idx],
                         );
-                        let num_nodes = self.module.functions[idx].nodes.len();
-                        self.module.functions[idx]
-                            .schedules
-                            .resize(num_nodes, vec![]);
+                        predication(&mut editor, &typing[idx]);
+
+                        self.module.constants = constants_ref.take();
+                        self.module.dynamic_constants = dynamic_constants_ref.take();
+                        self.module.types = types_ref.take();
+
                         self.module.functions[idx].delete_gravestones();
                     }
                     self.clear_analyses();

juno_frontend/src/lib.rs

@@ -179,6 +179,15 @@ pub fn compile_ir(
     add_pass!(pm, verify, DCE);
     add_pass!(pm, verify, GVN);
     add_pass!(pm, verify, DCE);
+    add_pass!(pm, verify, WritePredication);
+    add_pass!(pm, verify, PhiElim);
+    add_pass!(pm, verify, DCE);
+    add_pass!(pm, verify, Predication);
+    add_pass!(pm, verify, DCE);
+    add_pass!(pm, verify, CCP);
+    add_pass!(pm, verify, DCE);
+    add_pass!(pm, verify, GVN);
+    add_pass!(pm, verify, DCE);
     if x_dot {
         pm.add_pass(hercules_opt::pass::Pass::Xdot(true));
     }

juno_samples/antideps/src/antideps.jn

@@ -2,7 +2,13 @@
 fn simple_antideps(a : usize, b : usize) -> i32 {
   let arr : i32[3];
   let r = arr[b];
-  arr[a] = 5;
+  let x : i32[1];
+  if a == b {
+    x[0] = 5;
+  } else {
+    x[0] = 7;
+  }
+  arr[a] = x[0];
   return r + arr[b];
 }