@static -> @Promotable

cucapra · Feb 1, 2024 · 8da7747 · 8da7747
1 parent 309c939
commit 8da7747
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 31 deletions.
diff --git a/file-tests/should-futil/for-multi-dim.expect b/file-tests/should-futil/for-multi-dim.expect
@@ -30,25 +30,25 @@ component main() -> () {
       le1.left = j0.out;
       le1.right = const3.out;
     }
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       i0.in = const0.out;
       i0.write_en = 1'd1;
       let0[done] = i0.done;
     }
-    group let1<"static"=1> {
+    group let1<"promotable"=1> {
       j0.in = const2.out;
       j0.write_en = 1'd1;
       let1[done] = j0.done;
     }
-    group let2<"static"=2> {
+    group let2<"promotable"=2> {
       A_read0_0.in = A.read_data;
       A_read0_0.write_en = A.read_done;
       let2[done] = A_read0_0.done;
       A.addr1 = j0.out;
       A.addr0 = i0.out;
       A.read_en = 1'd1;
     }
-    group upd0<"static"=1> {
+    group upd0<"promotable"=1> {
       B.addr1 = j0.out;
       B.addr0 = i0.out;
       B.write_en = 1'd1;
@@ -57,14 +57,14 @@ component main() -> () {
       B.write_data = add0.out;
       upd0[done] = B.write_done;
     }
-    group upd1<"static"=1> {
+    group upd1<"promotable"=1> {
       j0.write_en = 1'd1;
       add1.left = j0.out;
       add1.right = const5.out;
       j0.in = add1.out;
       upd1[done] = j0.done;
     }
-    group upd2<"static"=1> {
+    group upd2<"promotable"=1> {
       i0.write_en = 1'd1;
       add2.left = i0.out;
       add2.right = const6.out;

diff --git a/file-tests/should-futil/for.expect b/file-tests/should-futil/for.expect
@@ -20,27 +20,27 @@ component main() -> () {
       le0.left = i0.out;
       le0.right = const1.out;
     }
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       i0.in = const0.out;
       i0.write_en = 1'd1;
       let0[done] = i0.done;
     }
-    group let1<"static"=2> {
+    group let1<"promotable"=2> {
       A_read0_0.in = A.read_data;
       A_read0_0.write_en = A.read_done;
       let1[done] = A_read0_0.done;
       A.addr0 = i0.out;
       A.read_en = 1'd1;
     }
-    group upd0<"static"=1> {
+    group upd0<"promotable"=1> {
       B.addr0 = i0.out;
       B.write_en = 1'd1;
       add0.left = A_read0_0.out;
       add0.right = const2.out;
       B.write_data = add0.out;
       upd0[done] = B.write_done;
     }
-    group upd1<"static"=1> {
+    group upd1<"promotable"=1> {
       i0.write_en = 1'd1;
       add1.left = i0.out;
       add1.right = const3.out;

diff --git a/file-tests/should-futil/invoke-with-fixed-point.expect b/file-tests/should-futil/invoke-with-fixed-point.expect
@@ -6,7 +6,7 @@ component foo(x: 8) -> (@stable(1) out: 8) {
     y_0 = std_reg(8);
   }
   wires {
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       y_0.in = x;
       y_0.write_en = 1'd1;
       let0[done] = y_0.done;
@@ -25,7 +25,7 @@ component main() -> () {
     x_0 = std_reg(8);
   }
   wires {
-    group let1<"static"=1> {
+    group let1<"promotable"=1> {
       x_0.in = fp_const0.out;
       x_0.write_en = 1'd1;
       let1[done] = x_0.done;

diff --git a/file-tests/should-futil/invoke-with-memories.expect b/file-tests/should-futil/invoke-with-memories.expect
@@ -10,19 +10,19 @@ component mem_copy() -> () {
     zero_0 = std_reg(1);
   }
   wires {
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       zero_0.in = const0.out;
       zero_0.write_en = 1'd1;
       let0[done] = zero_0.done;
     }
-    group let1<"static"=2> {
+    group let1<"promotable"=2> {
       src_read0_0.in = src.read_data;
       src_read0_0.write_en = src.read_done;
       let1[done] = src_read0_0.done;
       src.addr0 = zero_0.out;
       src.read_en = 1'd1;
     }
-    group upd0<"static"=1> {
+    group upd0<"promotable"=1> {
       dest.addr0 = zero_0.out;
       dest.write_en = 1'd1;
       dest.write_data = src_read0_0.out;

diff --git a/file-tests/should-futil/invoke.expect b/file-tests/should-futil/invoke.expect
@@ -7,7 +7,7 @@ component foo(a: 32) -> (@stable(1) out: 32) {
     temp_0 = std_reg(32);
   }
   wires {
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       temp_0.in = a;
       temp_0.write_en = 1'd1;
       let0[done] = temp_0.done;
@@ -28,7 +28,7 @@ component main() -> () {
     sqrt0 = sqrt(32);
   }
   wires {
-    group let1<"static"=1> {
+    group let1<"promotable"=1> {
       b_0.in = const0.out;
       b_0.write_en = 1'd1;
       let1[done] = b_0.done;

diff --git a/file-tests/should-futil/sequentialize-reduce.expect b/file-tests/should-futil/sequentialize-reduce.expect
@@ -28,36 +28,36 @@ component main() -> () {
       le1.left = j0.out;
       le1.right = const4.out;
     }
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       i0.in = const0.out;
       i0.write_en = 1'd1;
       let0[done] = i0.done;
     }
-    group let1<"static"=1> {
+    group let1<"promotable"=1> {
       x_0.in = const2.out;
       x_0.write_en = 1'd1;
       let1[done] = x_0.done;
     }
-    group let2<"static"=1> {
+    group let2<"promotable"=1> {
       j0.in = const3.out;
       j0.write_en = 1'd1;
       let2[done] = j0.done;
     }
-    group upd0<"static"=1> {
+    group upd0<"promotable"=1> {
       x_0.write_en = 1'd1;
       add0.left = x_0.out;
       add0.right = j0.out;
       x_0.in = add0.out;
       upd0[done] = x_0.done;
     }
-    group upd1<"static"=1> {
+    group upd1<"promotable"=1> {
       j0.write_en = 1'd1;
       add1.left = j0.out;
       add1.right = const5.out;
       j0.in = add1.out;
       upd1[done] = j0.done;
     }
-    group upd2<"static"=1> {
+    group upd2<"promotable"=1> {
       i0.write_en = 1'd1;
       add2.left = i0.out;
       add2.right = const6.out;

diff --git a/file-tests/should-futil/use-plus-equals.expect b/file-tests/should-futil/use-plus-equals.expect
@@ -30,30 +30,30 @@ component use_plus_equals() -> () {
       le1.left = __j0.out;
       le1.right = const3.out;
     }
-    group let0<"static"=1> {
+    group let0<"promotable"=1> {
       __i0.in = const0.out;
       __i0.write_en = 1'd1;
       let0[done] = __i0.done;
     }
-    group let1<"static"=1> {
+    group let1<"promotable"=1> {
       __x_0.in = fp_const0.out;
       __x_0.write_en = 1'd1;
       let1[done] = __x_0.done;
     }
-    group let2<"static"=1> {
+    group let2<"promotable"=1> {
       __j0.in = const2.out;
       __j0.write_en = 1'd1;
       let2[done] = __j0.done;
     }
-    group let3<"static"=2> {
+    group let3<"promotable"=2> {
       red_read00.in = x2.read_data;
       red_read00.write_en = x2.read_done;
       let3[done] = red_read00.done;
       x2.addr1 = __j0.out;
       x2.addr0 = __i0.out;
       x2.read_en = 1'd1;
     }
-    group upd0<"static"=1> {
+    group upd0<"promotable"=1> {
       x2.addr1 = __j0.out;
       x2.addr0 = __i0.out;
       x2.write_en = 1'd1;
@@ -62,14 +62,14 @@ component use_plus_equals() -> () {
       x2.write_data = add0.out;
       upd0[done] = x2.write_done;
     }
-    group upd1<"static"=1> {
+    group upd1<"promotable"=1> {
       __j0.write_en = 1'd1;
       add1.left = __j0.out;
       add1.right = const4.out;
       __j0.in = add1.out;
       upd1[done] = __j0.done;
     }
-    group upd2<"static"=1> {
+    group upd2<"promotable"=1> {
       __i0.write_en = 1'd1;
       add2.left = __i0.out;
       add2.right = const5.out;

diff --git a/src/main/scala/backends/calyx/Ast.scala b/src/main/scala/backends/calyx/Ast.scala
@@ -203,7 +203,7 @@ object Calyx {
         (if (comb) text("comb ") else emptyDoc) <>
           text("group") <+> id.doc() <>
           (if (delay.isDefined)
-             angles(text("\"static\"") <> equal <> text(delay.get.toString()))
+             angles(text("\"promotable\"") <> equal <> text(delay.get.toString()))
            else emptyDoc) <+>
           scope(vsep(conns.map(_.doc())))
     }