Turn dynamic to static

calyx-ir/src/guard.rs

@@ -108,6 +108,39 @@ where
     }
 }
 
+impl<Nothing> Guard<Nothing> {
+    /// Turns a normal guard into a static guard
+    pub fn into_static_guard(&self) -> Guard<StaticTiming> {
+        match self {
+            Guard::Or(left, right) => {
+                let l = left.into_static_guard();
+                let r = right.into_static_guard();
+                Guard::Or(Box::new(l), Box::new(r))
+            }
+            Guard::And(left, right) => {
+                let l = left.into_static_guard();
+                let r = right.into_static_guard();
+                Guard::And(Box::new(l), Box::new(r))
+            }
+            Guard::Not(c) => {
+                let inside = c.into_static_guard();
+                Guard::Not(Box::new(inside))
+            }
+            Guard::True => Guard::True,
+            Guard::CompOp(pc, left, right) => {
+                Guard::CompOp(pc.clone(), Rc::clone(left), Rc::clone(right))
+            }
+            Guard::Port(p) => Guard::Port(Rc::clone(p)),
+            Guard::Info(_) => {
+                unreachable!(
+                    "Compilation error: Guards should not be of the
+                info variant type"
+                )
+            }
+        }
+    }
+}
+
 impl<T> Guard<T> {
     /// Returns true if this is a `Guard::True`.
     pub fn is_true(&self) -> bool {

calyx-ir/src/structure.rs

@@ -458,6 +458,18 @@ impl<T> Assignment<T> {
     }
 }
 
+impl<Nothing> Assignment<Nothing> {
+    /// Turns a normal assignment into a static assignment
+    pub fn into_static(&self) -> Assignment<StaticTiming> {
+        Assignment {
+            dst: Rc::clone(&self.dst),
+            src: Rc::clone(&self.src),
+            guard: Box::new(self.guard.into_static_guard()),
+            attributes: self.attributes.clone(),
+        }
+    }
+}
+
 impl<StaticTiming> Assignment<StaticTiming> {
     /// Apply function `f` to each port contained within the assignment and
     /// replace the port with the generated value if not None.

calyx-opt/src/default_passes.rs

@@ -3,11 +3,12 @@ use crate::passes::{
     Canonicalize, CellShare, ClkInsertion, CollapseControl, CombProp,
     CompileEmpty, CompileInvoke, CompileRef, CompileStatic, CompileSync,
     ComponentInliner, DeadAssignmentRemoval, DeadCellRemoval, DeadGroupRemoval,
-    Externalize, GoInsertion, GroupToInvoke, GroupToSeq, HoleInliner,
-    InferShare, InferStaticTiming, LowerGuards, MergeAssign, MergeStaticPar,
-    Papercut, ParToSeq, RegisterUnsharing, RemoveCombGroups, RemoveIds,
-    ResetInsertion, StaticParConv, SynthesisPapercut, TopDownCompileControl,
-    TopDownStaticTiming, UnrollBounded, WellFormed, WireInliner,
+    Externalize, GoInsertion, GroupStaticPromotion, GroupToInvoke, GroupToSeq,
+    HoleInliner, InferShare, InferStaticTiming, LowerGuards, MergeAssign,
+    MergeStaticPar, Papercut, ParToSeq, RegisterUnsharing, RemoveCombGroups,
+    RemoveIds, ResetInsertion, StaticParConv, SynthesisPapercut,
+    TopDownCompileControl, TopDownStaticTiming, UnrollBounded, WellFormed,
+    WireInliner,
 };
 use crate::traversal::Named;
 use crate::{pass_manager::PassManager, register_alias};
@@ -35,6 +36,7 @@ impl PassManager {
         pm.register_pass::<InferShare>()?;
         pm.register_pass::<CellShare>()?;
         pm.register_pass::<InferStaticTiming>()?;
+        pm.register_pass::<GroupStaticPromotion>()?;
         pm.register_pass::<MergeStaticPar>()?;
         pm.register_pass::<StaticParConv>()?;