transforms.iodelay_estimator: fix handling of with sequential.

m-labs · Nov 16, 2015 · e619154 · e619154
1 parent 506725f
commit e619154
Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/artiq/compiler/transforms/iodelay_estimator.py b/artiq/compiler/transforms/iodelay_estimator.py
@@ -216,7 +216,7 @@ def visit_With(self, node):
                 self.current_delay = old_delay
 
             self.current_delay += iodelay.Max(delays)
-        elif len(node.items) == 1 and types.is_builtin(context_expr.type, "serial"):
+        elif len(node.items) == 1 and types.is_builtin(context_expr.type, "sequential"):
             self.visit(node.body)
         else:
             self.abort("with statement cannot be interleaved", node.loc)

diff --git a/lit-test/test/iodelay/sequential.py b/lit-test/test/iodelay/sequential.py
@@ -0,0 +1,8 @@
+# RUN: %python -m artiq.compiler.testbench.signature %s >%t
+# RUN: OutputCheck %s --file-to-check=%t
+
+# CHECK-L: f: (a:int(width=64), b:int(width=64))->NoneType delay(a + b mu)
+def f(a, b):
+    with sequential:
+        delay_mu(a)
+        delay_mu(b)