@fast attribute to enable early (0-cycle) transitions between alternating dynamic/static groups

calyx-frontend/src/attribute.rs

@@ -69,7 +69,11 @@ pub enum BoolAttr {
     #[strum(serialize = "promoted")]
     /// denotes a static component or control promoted from dynamic
     Promoted,
+    #[strum(serialize = "fast")]
+    /// https://github.com/calyxir/calyx/issues/1828
+    Fast,
 }
+
 impl From<BoolAttr> for Attribute {
     fn from(attr: BoolAttr) -> Self {
         Attribute::Bool(attr)

calyx-opt/src/passes/static_promotion.rs

@@ -5,7 +5,7 @@ use crate::traversal::{
     Action, ConstructVisitor, Named, Order, ParseVal, PassOpt, VisResult,
     Visitor,
 };
-use calyx_ir::{self as ir, LibrarySignatures};
+use calyx_ir::{self as ir, BoolAttr, LibrarySignatures};
 use calyx_utils::CalyxResult;
 use ir::GetAttributes;
 use itertools::Itertools;
@@ -490,6 +490,12 @@ impl Visitor for StaticPromotion {
             })
         };
         self.inference_analysis.fixup_ctrl(&mut new_ctrl);
+
+        // this might be part of a larger issue where passes remove some attributes they shouldn't
+        if s.get_attributes().has(BoolAttr::Fast) {
+            new_ctrl.get_mut_attributes().insert(BoolAttr::Fast, 1);
+        }
+
         Ok(Action::change(new_ctrl))
     }
 

calyx-opt/src/passes/top_down_compile_control.rs

@@ -3,7 +3,9 @@ use crate::passes;
 use crate::traversal::{
     Action, ConstructVisitor, Named, ParseVal, PassOpt, VisResult, Visitor,
 };
-use calyx_ir::{self as ir, GetAttributes, LibrarySignatures, Printer, RRC};
+use calyx_ir::{
+    self as ir, BoolAttr, GetAttributes, LibrarySignatures, Printer, RRC,
+};
 use calyx_ir::{build_assignments, guard, structure, Id};
 use calyx_utils::Error;
 use calyx_utils::{CalyxResult, OutputFile};
@@ -460,6 +462,8 @@ impl Schedule<'_, '_> {
         preds: Vec<PredEdge>,
         // True if early_transitions are allowed
         early_transitions: bool,
+        // True if the `@fast` attribute has successfully been applied to the parent of this control
+        has_fast_guarantee: bool,
     ) -> CalyxResult<Vec<PredEdge>> {
         match con {
         // See explanation of FSM states generated in [ir::TopDownCompileControl].
@@ -495,7 +499,7 @@ impl Schedule<'_, '_> {
             // NOTE: We explicilty do not add `not_done` to the guard.
             // See explanation in [ir::TopDownCompileControl] to understand
             // why.
-            if early_transitions {
+            if early_transitions || has_fast_guarantee {
                 for (st, g) in &prev_states {
                     let early_go = build_assignments!(self.builder;
                         group["go"] = g ? signal_on["out"];
@@ -542,9 +546,13 @@ impl Schedule<'_, '_> {
         early_transitions: bool,
     ) -> CalyxResult<Vec<PredEdge>> {
         let mut prev = preds;
-        for stmt in &seq.stmts {
-            prev =
-                self.calculate_states_recur(stmt, prev, early_transitions)?;
+        for (i, stmt) in seq.stmts.iter().enumerate() {
+            prev = self.calculate_states_recur(
+                stmt,
+                prev,
+                early_transitions,
+                i > 0 && seq.get_attributes().has(BoolAttr::Fast),
+            )?;
         }
         Ok(prev)
     }
@@ -577,6 +585,7 @@ impl Schedule<'_, '_> {
             &if_stmt.tbranch,
             tru_transitions,
             early_transitions,
+            false,
         )?;
         // Previous states transitioning into false branch need the conditional
         // to be false.
@@ -594,6 +603,7 @@ impl Schedule<'_, '_> {
                 &if_stmt.fbranch,
                 fal_transitions,
                 early_transitions,
+                false,
             )?
         };
 
@@ -636,6 +646,7 @@ impl Schedule<'_, '_> {
             &while_stmt.body,
             transitions,
             early_transitions,
+            false,
         )?;
 
         // Step 3: The final out edges from the while come from:
@@ -740,6 +751,7 @@ impl Schedule<'_, '_> {
             con,
             vec![first_state],
             early_transitions,
+            false,
         )?;
         self.add_nxt_transition(prev);
         Ok(())

calyx-opt/src/passes/well_formed.rs

@@ -3,6 +3,7 @@ use calyx_ir::{
     self as ir, CellType, Component, GetAttributes, LibrarySignatures,
     RESERVED_NAMES,
 };
+use calyx_ir::{BoolAttr, Seq};
 use calyx_utils::{CalyxResult, Error, WithPos};
 use ir::Nothing;
 use ir::StaticTiming;
@@ -203,6 +204,30 @@ fn same_type(proto_out: &CellType, proto_in: &CellType) -> CalyxResult<()> {
     }
 }
 
+/// Confirms (in agreement with [this discussion](https://github.com/calyxir/calyx/issues/1828))
+/// that the `@fast` sequence `seq` is composed of alternating static-dynamic controls.
+fn check_fast_seq_invariant(seq: &Seq) -> CalyxResult<()> {
+    if seq.stmts.is_empty() {
+        return Ok(());
+    }
+    let mut last_is_static = seq
+        .stmts
+        .first()
+        .expect("non-empty already asserted")
+        .is_static();
+    for stmt in seq.stmts.iter().skip(1) {
+        if stmt.is_static() == last_is_static {
+            return Err(
+                Error::malformed_control(
+                    "`seq` marked `@fast` does not contain alternating static-dynamic control children (see #1828)"
+                )
+            );
+        }
+        last_is_static = stmt.is_static();
+    }
+    Ok(())
+}
+
 impl Visitor for WellFormed {
     fn start(
         &mut self,
@@ -680,6 +705,20 @@ impl Visitor for WellFormed {
         Ok(Action::Continue)
     }
 
+    fn start_seq(
+        &mut self,
+        s: &mut calyx_ir::Seq,
+        _comp: &mut Component,
+        _sigs: &LibrarySignatures,
+        _comps: &[calyx_ir::Component],
+    ) -> VisResult {
+        if s.attributes.has(BoolAttr::Fast) {
+            check_fast_seq_invariant(s)?;
+        }
+
+        Ok(Action::Continue)
+    }
+
     fn finish_if(
         &mut self,
         s: &mut ir::If,

runt.toml

@@ -233,9 +233,7 @@ timeout = 120
 
 [[tests]]
 name = "correctness static timing one-hot encoding"
-paths = [
-  "tests/correctness/static-interface/*.futil",
-]
+paths = ["tests/correctness/static-interface/*.futil"]
 cmd = """
 fud exec --from calyx --to jq \
          --through verilog \
@@ -390,6 +388,32 @@ fud e --from systolic --to jq \
 """
 expect_dir = "tests/correctness/systolic/mmult-expect"
 
+[[tests]]
+name = "[correctness] `@fast` attribute should not change program behavior"
+paths = ["tests/correctness/fast-attr/valid/*.futil"]
+cmd = """
+fud exec --from calyx --to jq \
+         --through dat \
+         --through icarus-verilog \
+         -s calyx.flags "-p validate -p compile -p lower" \
+         -s verilog.data {}.data \
+         -s jq.expr ".memories" \
+         {} -q
+"""
+
+[[tests]]
+name = "[correctness] `@fast` attribute should reject unoptimizable sequences"
+paths = ["tests/correctness/fast-attr/invalid/*.futil"]
+cmd = """
+fud exec --from calyx --to jq \
+         --through dat \
+         --through icarus-verilog \
+         -s calyx.flags "-p validate -p compile -p lower" \
+         -s verilog.data {}.data \
+         -s jq.expr ".memories" \
+         {} -q
+"""
+
 [[tests]]
 name = "[frontend] systolic array relu static correctness"
 paths = ["tests/correctness/systolic/relu-inputs/*.data"]

tests/correctness/fast-attr/invalid/invalid.expect

@@ -0,0 +1,9 @@
+---CODE---
+255
+---STDERR---
+[fud] ERROR: `/home/calyx/target/debug/calyx -l /home/calyx -b verilog --disable-verify -p validate -p compile -p lower' failed:
+=====STDERR=====
+Error: Malformed Control: `seq` marked `@fast` does not contain alternating static-dynamic control children (see #1828)
+
+=====STDOUT=====
+

tests/correctness/fast-attr/invalid/invalid.futil

@@ -0,0 +1,46 @@
+import "primitives/core.futil";
+import "primitives/memories/comb.futil";
+
+component main(@go go: 1) -> (@done done: 1) {
+    cells {
+        @external m = comb_mem_d1(32, 1, 32);
+        i0 = std_reg(32);
+        add = std_add(32);
+    }
+    wires {
+        static<1> group init {
+            i0.in = 32'd0;
+            i0.write_en = 1'b1;
+        }
+        group dyn_inc {
+            add.left = i0.out;
+            add.right = 32'd1;
+            i0.in = add.out;
+            i0.write_en = 1'b1;
+            dyn_inc[done] = i0.done;
+        }
+        static<1> group static_inc {
+            add.left = i0.out;
+            add.right = 32'd1;
+            i0.in = add.out;
+            i0.write_en = 1'b1;
+        }
+        group write {
+            m.write_data = i0.out;
+            m.write_en = 1'b1;
+            write[done] = m.done;
+        }
+    }
+    control {
+        @fast seq {
+            init;
+            dyn_inc;
+            dyn_inc;
+            dyn_inc;
+            static_inc;
+            static_inc;
+            static_inc;
+            write;
+        }
+    }
+}

tests/correctness/fast-attr/invalid/invalid.futil.data

@@ -0,0 +1,12 @@
+{
+    "m": {
+        "data": [
+            0
+        ],
+        "format": {
+            "numeric_type": "bitnum",
+            "is_signed": false,
+            "width": 32
+        }
+    }
+}

tests/correctness/fast-attr/valid/fast6inc.expect

@@ -0,0 +1,5 @@
+{
+  "m": [
+    6
+  ]
+}

tests/correctness/fast-attr/valid/fast6inc.futil

@@ -0,0 +1,46 @@
+import "primitives/core.futil";
+import "primitives/memories/comb.futil";
+
+component main(@go go: 1) -> (@done done: 1) {
+    cells {
+        @external m = comb_mem_d1(32, 1, 32);
+        i0 = std_reg(32);
+        add = std_add(32);
+    }
+    wires {
+        static<1> group init {
+            i0.in = 32'd0;
+            i0.write_en = 1'b1;
+        }
+        group dyn_inc {
+            add.left = i0.out;
+            add.right = 32'd1;
+            i0.in = add.out;
+            i0.write_en = 1'b1;
+            dyn_inc[done] = i0.done;
+        }
+        static<1> group static_inc {
+            add.left = i0.out;
+            add.right = 32'd1;
+            i0.in = add.out;
+            i0.write_en = 1'b1;
+        }
+        group write {
+            m.write_data = i0.out;
+            m.write_en = 1'b1;
+            write[done] = m.done;
+        }
+    }
+    control {
+        @fast seq {
+            init;
+            dyn_inc;
+            static_inc;
+            dyn_inc;
+            static_inc;
+            dyn_inc;
+            static_inc;
+            write;
+        }
+    }
+}

tests/correctness/fast-attr/valid/fast6inc.futil.data

@@ -0,0 +1,12 @@
+{
+    "m": {
+        "data": [
+            0
+        ],
+        "format": {
+            "numeric_type": "bitnum",
+            "is_signed": false,
+            "width": 32
+        }
+    }
+}