m-labs · Feb 22, 2016 · Feb 22, 2016
diff --git a/artiq/compiler/builtins.py b/artiq/compiler/builtins.py
@@ -144,8 +144,8 @@ def fn_print():
 def fn_kernel():
     return types.TBuiltinFunction("kernel")
 
-def obj_parallel():
-    return types.TBuiltin("parallel")
+def obj_interleave():
+    return types.TBuiltin("interleave")
 
 def obj_sequential():
     return types.TBuiltin("sequential")

diff --git a/artiq/compiler/ir.py b/artiq/compiler/ir.py
@@ -1418,7 +1418,7 @@ def _operands_as_string(self, type_printer):
     def opcode(self):
         return "loop({} times)".format(self.trip_count)
 
-class Parallel(Terminator):
+class Interleave(Terminator):
     """
     An instruction that schedules several threads of execution
     in parallel.
@@ -1428,7 +1428,7 @@ def __init__(self, destinations, name=""):
         super().__init__(destinations, builtins.TNone(), name)
 
     def opcode(self):
-        return "parallel"
+        return "interleave"
 
     def destinations(self):
         return self.operands

diff --git a/artiq/compiler/prelude.py b/artiq/compiler/prelude.py
@@ -30,7 +30,7 @@ def globals():
         "portable":             builtins.fn_kernel(),
 
         # ARTIQ context managers
-        "parallel":             builtins.obj_parallel(),
+        "interleave":           builtins.obj_interleave(),
         "sequential":           builtins.obj_sequential(),
         "watchdog":             builtins.fn_watchdog(),
 

diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -747,8 +747,8 @@ def visit_With(self, node):
         if types.is_builtin(context_expr_node.type, "sequential"):
             self.visit(node.body)
             return
-        elif types.is_builtin(context_expr_node.type, "parallel"):
-            parallel = self.append(ir.Parallel([]))
+        elif types.is_builtin(context_expr_node.type, "interleave"):
+            interleave = self.append(ir.Interleave([]))
 
             heads, tails = [], []
             for stmt in node.body:
@@ -758,7 +758,7 @@ def visit_With(self, node):
                 tails.append(self.current_block)
 
             for head in heads:
-                parallel.add_destination(head)
+                interleave.add_destination(head)
 
             self.current_block = self.add_block()
             for tail in tails:

diff --git a/artiq/compiler/transforms/inferencer.py b/artiq/compiler/transforms/inferencer.py
@@ -993,7 +993,7 @@ def visit_withitemT(self, node):
         self.generic_visit(node)
 
         typ = node.context_expr.type
-        if (types.is_builtin(typ, "parallel") or types.is_builtin(typ, "sequential") or
+        if (types.is_builtin(typ, "interleave") or types.is_builtin(typ, "sequential") or
                 (isinstance(node.context_expr, asttyped.CallT) and
                  types.is_builtin(node.context_expr.func.type, "watchdog"))):
             # builtin context managers
@@ -1092,7 +1092,7 @@ def visit_With(self, node):
 
         for item_node in node.items:
             typ = item_node.context_expr.type.find()
-            if (types.is_builtin(typ, "parallel") or types.is_builtin(typ, "sequential")) and \
+            if (types.is_builtin(typ, "interleave") or types.is_builtin(typ, "sequential")) and \
                     len(node.items) != 1:
                 diag = diagnostic.Diagnostic("error",
                     "the '{kind}' context manager must be the only one in a 'with' statement",

diff --git a/artiq/compiler/transforms/interleaver.py b/artiq/compiler/transforms/interleaver.py
@@ -66,7 +66,7 @@ def process_function(self, func):
 
         postdom_tree = None
         for insn in func.instructions():
-            if not isinstance(insn, ir.Parallel):
+            if not isinstance(insn, ir.Interleave):
                 continue
 
             # Lazily compute dominators.
@@ -79,15 +79,15 @@ def process_function(self, func):
             source_times  = [0 for _ in source_blocks]
 
             if len(source_blocks) == 1:
-                # Immediate dominator for a parallel instruction with one successor
+                # Immediate dominator for a interleave instruction with one successor
                 # is the first instruction in the body of the statement which created
                 # it, but below we expect that it would be the first instruction after
                 # the statement itself.
                 insn.replace_with(ir.Branch(source_blocks[0]))
                 continue
 
             interleave_until = postdom_tree.immediate_dominator(insn.basic_block)
-            assert interleave_until is not None # no nonlocal flow in `with parallel`
+            assert interleave_until is not None # no nonlocal flow in `with interleave`
             assert interleave_until not in source_blocks
 
             while len(source_blocks) > 0:
@@ -111,15 +111,15 @@ def time_after_block(pair):
                 assert target_time_delta >= 0
 
                 target_terminator = target_block.terminator()
-                if isinstance(target_terminator, ir.Parallel):
+                if isinstance(target_terminator, ir.Interleave):
                     target_terminator.replace_with(ir.Branch(source_block))
                 elif isinstance(target_terminator, (ir.Delay, ir.Branch)):
                     target_terminator.set_target(source_block)
                 else:
                     assert False
 
                 source_terminator = source_block.terminator()
-                if isinstance(source_terminator, ir.Parallel):
+                if isinstance(source_terminator, ir.Interleave):
                     source_terminator.replace_with(ir.Branch(source_terminator.target()))
                 elif isinstance(source_terminator, ir.Branch):
                     pass
@@ -149,7 +149,7 @@ def time_after_block(pair):
                             if old_decomp.static_target_function is None:
                                 diag = diagnostic.Diagnostic("fatal",
                                     "it is not possible to interleave this function call within "
-                                    "a 'with parallel:' statement because the compiler could not "
+                                    "a 'with interleave:' statement because the compiler could not "
                                     "prove that the same function would always be called", {},
                                     old_decomp.loc)
                                 self.engine.process(diag)

diff --git a/artiq/compiler/transforms/iodelay_estimator.py b/artiq/compiler/transforms/iodelay_estimator.py
@@ -219,7 +219,7 @@ def visit_With(self, node):
         self.visit(node.items)
 
         context_expr = node.items[0].context_expr
-        if len(node.items) == 1 and types.is_builtin(context_expr.type, "parallel"):
+        if len(node.items) == 1 and types.is_builtin(context_expr.type, "interleave"):
             try:
                 delays = []
                 for stmt in node.body:
@@ -235,7 +235,7 @@ def visit_With(self, node):
                 # since there's no chance that the code will never actually execute
                 # inside a `with` statement after all.
                 note = diagnostic.Diagnostic("note",
-                    "while interleaving this 'with parallel:' statement", {},
+                    "while interleaving this 'with interleave:' statement", {},
                     node.loc)
                 error.cause.notes += [note]
                 self.engine.process(error.cause)
@@ -249,11 +249,11 @@ def visit_With(self, node):
             if flow_stmt is not None:
                 note = diagnostic.Diagnostic("note",
                     "this '{kind}' statement transfers control out of "
-                    "the 'with parallel:' statement",
+                    "the 'with interleave:' statement",
                     {"kind": flow_stmt.keyword_loc.source()},
                     flow_stmt.loc)
                 diag = diagnostic.Diagnostic("error",
-                    "cannot interleave this 'with parallel:' statement", {},
+                    "cannot interleave this 'with interleave:' statement", {},
                     node.keyword_loc.join(node.colon_loc), notes=[note])
                 self.engine.process(diag)
 

diff --git a/artiq/language/core.py b/artiq/language/core.py
@@ -13,7 +13,7 @@
 
 # global namespace for kernels
 kernel_globals = (
-    "sequential", "parallel",
+    "sequential", "parallel", "interleave",
     "delay_mu", "now_mu", "at_mu", "delay",
     "seconds_to_mu", "mu_to_seconds",
     "watchdog"
@@ -264,7 +264,7 @@ def _not_implemented(self, *args, **kwargs):
 def set_time_manager(time_manager):
     """Set the time manager used for simulating kernels by running them
     directly inside the Python interpreter. The time manager responds to the
-    entering and leaving of parallel/sequential blocks, delays, etc. and
+    entering and leaving of interleave/parallel/sequential blocks, delays, etc. and
     provides a time-stamped logging facility for events.
     """
     global _time_manager
@@ -288,15 +288,15 @@ class _Parallel:
 
     The execution time of a parallel block is the execution time of its longest
     statement. A parallel block may contain sequential blocks, which themselves
-    may contain parallel blocks, etc.
+    may contain interleave blocks, etc.
     """
     def __enter__(self):
         _time_manager.enter_parallel()
 
     def __exit__(self, type, value, traceback):
         _time_manager.exit()
 parallel = _Parallel()
-
+interleave = _Parallel() # no difference in semantics on host
 
 def delay_mu(duration):
     """Increases the RTIO time by the given amount (in machine units)."""

diff --git a/artiq/test/coredevice/test_analyzer.py b/artiq/test/coredevice/test_analyzer.py
@@ -12,7 +12,7 @@ def build(self):
     def run(self):
         self.ttl_inout.output()
         delay_mu(100)
-        with parallel:
+        with interleave:
             self.ttl_inout.gate_both_mu(1200)
             with sequential:
                 delay_mu(100)

diff --git a/artiq/test/coredevice/test_portability.py b/artiq/test/coredevice/test_portability.py
@@ -100,7 +100,7 @@ def build(self):
     @kernel
     def run(self):
         for i in range(3):
-            with parallel:
+            with interleave:
                 with sequential:
                     self.a.pulse(100+i, 20*us)
                     self.b.pulse(200+i, 20*us)

diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py
@@ -16,7 +16,7 @@ def build(self):
     def run(self):
         self.ttl_inout.output()
         delay(1*us)
-        with parallel:
+        with interleave:
             # make sure not to send two commands into the same RTIO
             # channel with the same timestamp
             self.ttl_inout.gate_rising(5*us)
@@ -37,7 +37,7 @@ def build(self):
     def run(self):
         self.loop_in.input()
         delay(1*us)
-        with parallel:
+        with interleave:
             self.loop_in.gate_rising(2*us)
             with sequential:
                 delay(1*us)
@@ -57,7 +57,7 @@ def run(self):
         self.loop_clock_in.input()
         self.loop_clock_out.stop()
         delay(1*us)
-        with parallel:
+        with interleave:
             self.loop_clock_in.gate_rising(10*us)
             with sequential:
                 delay(200*ns)
@@ -110,7 +110,7 @@ def set_count(self, count):
     def run(self):
         self.ttl_inout.output()
         delay(5*us)
-        with parallel:
+        with interleave:
             self.ttl_inout.gate_rising(10*us)
             with sequential:
                 for i in range(self.npulses):

diff --git a/artiq/test/lit/inferencer/error_with_many.py b/artiq/test/lit/inferencer/error_with_many.py
@@ -1,6 +1,6 @@
 # RUN: %python -m artiq.compiler.testbench.inferencer +diag %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-# CHECK-L: ${LINE:+1}: error: the 'parallel' context manager must be the only one in a 'with' statement
-with parallel, sequential:
+# CHECK-L: ${LINE:+1}: error: the 'interleave' context manager must be the only one in a 'with' statement
+with interleave, sequential:
     pass
diff --git a/artiq/test/lit/inferencer/with.py b/artiq/test/lit/inferencer/with.py
@@ -2,4 +2,4 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 # CHECK-L: as x:NoneType
-with parallel as x: pass
+with interleave as x: pass
diff --git a/artiq/test/lit/interleaving/control_flow.py b/artiq/test/lit/interleaving/control_flow.py
@@ -2,7 +2,7 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def f():
-    with parallel:
+    with interleave:
         if True:
             print(1)
         else:

diff --git a/artiq/test/lit/interleaving/error_inlining.py b/artiq/test/lit/interleaving/error_inlining.py
@@ -10,7 +10,7 @@ def g():
 x = f if True else g
 
 def h():
-    with parallel:
+    with interleave:
         f()
-        # CHECK-L: ${LINE:+1}: fatal: it is not possible to interleave this function call within a 'with parallel:' statement because the compiler could not prove that the same function would always be called
+        # CHECK-L: ${LINE:+1}: fatal: it is not possible to interleave this function call within a 'with interleave:' statement because the compiler could not prove that the same function would always be called
         x()
diff --git a/artiq/test/lit/interleaving/error_toplevel_control_flow.py b/artiq/test/lit/interleaving/error_toplevel_control_flow.py
@@ -2,16 +2,16 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def f():
-    # CHECK-L: ${LINE:+1}: error: cannot interleave this 'with parallel:' statement
-    with parallel:
-        # CHECK-L: ${LINE:+1}: note: this 'return' statement transfers control out of the 'with parallel:' statement
+    # CHECK-L: ${LINE:+1}: error: cannot interleave this 'with interleave:' statement
+    with interleave:
+        # CHECK-L: ${LINE:+1}: note: this 'return' statement transfers control out of the 'with interleave:' statement
         return
         delay(1.0)
 
 def g():
     while True:
-        # CHECK-L: ${LINE:+1}: error: cannot interleave this 'with parallel:' statement
-        with parallel:
-            # CHECK-L: ${LINE:+1}: note: this 'break' statement transfers control out of the 'with parallel:' statement
+        # CHECK-L: ${LINE:+1}: error: cannot interleave this 'with interleave:' statement
+        with interleave:
+            # CHECK-L: ${LINE:+1}: note: this 'break' statement transfers control out of the 'with interleave:' statement
             break
             delay(1.0)
diff --git a/artiq/test/lit/interleaving/indirect.py b/artiq/test/lit/interleaving/indirect.py
@@ -5,7 +5,7 @@ def f():
     delay_mu(2)
 
 def g():
-    with parallel:
+    with interleave:
         with sequential:
             print("A", now_mu())
             f()

diff --git a/artiq/test/lit/interleaving/indirect_arg.py b/artiq/test/lit/interleaving/indirect_arg.py
@@ -5,7 +5,7 @@ def f(n):
     delay_mu(n)
 
 def g():
-    with parallel:
+    with interleave:
         with sequential:
             print("A", now_mu())
             f(2)

diff --git a/artiq/test/lit/interleaving/nonoverlapping.py b/artiq/test/lit/interleaving/nonoverlapping.py
@@ -2,7 +2,7 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def g():
-    with parallel:
+    with interleave:
         with sequential:
             print("A", now_mu())
             delay_mu(2)

diff --git a/artiq/test/lit/interleaving/overlapping.py b/artiq/test/lit/interleaving/overlapping.py
@@ -2,7 +2,7 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def g():
-    with parallel:
+    with interleave:
         with sequential:
             print("A", now_mu())
             delay_mu(3)

diff --git a/artiq/test/lit/interleaving/pure_impure_tie.py b/artiq/test/lit/interleaving/pure_impure_tie.py
@@ -5,7 +5,7 @@ def f():
     delay_mu(2)
 
 def g():
-    with parallel:
+    with interleave:
         f()
         delay_mu(2)
     print(now_mu())

diff --git a/artiq/test/lit/interleaving/unrolling.py b/artiq/test/lit/interleaving/unrolling.py
@@ -1,7 +1,7 @@
 # RUN: %python -m artiq.compiler.testbench.jit %s >%t
 # RUN: OutputCheck %s --file-to-check=%t
 
-with parallel:
+with interleave:
     for x in range(10):
         delay_mu(1)
         print("a", x)

diff --git a/artiq/test/lit/iodelay/error_bad_parallel.py → .../test/lit/iodelay/error_bad_interleave.py b/artiq/test/lit/iodelay/error_bad_parallel.py → .../test/lit/iodelay/error_bad_interleave.py
@@ -2,7 +2,7 @@
 # RUN: OutputCheck %s --file-to-check=%t
 
 def f():
-    with parallel:
+    with interleave:
         # CHECK-L: ${LINE:+1}: error: while statement cannot be interleaved
         while True:
             delay_mu(1)
diff --git a/artiq/test/lit/iodelay/parallel.py → artiq/test/lit/iodelay/interleave.py b/artiq/test/lit/iodelay/parallel.py → artiq/test/lit/iodelay/interleave.py
@@ -3,13 +3,13 @@
 
 # CHECK-L: f: (a:int(width=64), b:int(width=64))->NoneType delay(max(a, b) mu)
 def f(a, b):
-    with parallel:
+    with interleave:
         delay_mu(a)
         delay_mu(b)
 
 # CHECK-L: g: (a:int(width=64))->NoneType delay(max(a, 200) mu)
 def g(a):
-    with parallel:
+    with interleave:
         delay_mu(100)
         delay_mu(200)
         delay_mu(a)
diff --git a/artiq/test/lit/lit.cfg b/artiq/test/lit/lit.cfg
@@ -19,7 +19,8 @@ else:
     python = sys.executable
 config.substitutions.append( ("%python", python) )
 
-config.environment["PYTHONPATH"] = os.getenv("PYTHONPATH")
+if os.getenv("PYTHONPATH"):
+    config.environment["PYTHONPATH"] = os.getenv("PYTHONPATH")
 
 not_ = "{} {}".format(sys.executable, os.path.join(root, "not.py"))
 config.substitutions.append( ("%not", not_) )