m-labs · Nov 23, 2015 · Nov 23, 2015 · Nov 23, 2015
Showing with 32 additions and 5 deletions.

+5 −4 artiq/compiler/testbench/embedding.py

+1 −1 artiq/compiler/transforms/artiq_ir_generator.py

+10 −0 artiq/compiler/transforms/interleaver.py

+16 −0 lit-test/test/interleaving/error_inlining.py
diff --git a/artiq/compiler/testbench/embedding.py b/artiq/compiler/testbench/embedding.py
@@ -12,15 +12,16 @@ def main():
     else:
         compile_only = False
 
+    ddb_path = os.path.join(os.path.dirname(sys.argv[1]), "device_db.pyon")
+    dmgr = DeviceManager(DeviceDB(ddb_path))
+
     with open(sys.argv[1]) as f:
         testcase_code = compile(f.read(), f.name, "exec")
-        testcase_vars = {'__name__': 'testbench'}
+        testcase_vars = {'__name__': 'testbench', 'dmgr': dmgr}
         exec(testcase_code, testcase_vars)
 
-    ddb_path = os.path.join(os.path.dirname(sys.argv[1]), "device_db.pyon")
-
     try:
-        core = DeviceManager(DeviceDB(ddb_path)).get("core")
+        core = dmgr.get("core")
         if compile_only:
             core.compile(testcase_vars["entrypoint"], (), {})
         else:

diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -1625,7 +1625,7 @@ def visit_CallT(self, node):
             method_key = None
             if isinstance(node.func, asttyped.AttributeT):
                 attr_node = node.func
-                self.method_map[(attr_node.value.type, attr_node.attr)].append(insn)
+                self.method_map[(attr_node.value.type.find(), attr_node.attr)].append(insn)
 
         if node.iodelay is not None and not iodelay.is_const(node.iodelay, 0):
             after_delay = self.add_block()

diff --git a/artiq/compiler/transforms/interleaver.py b/artiq/compiler/transforms/interleaver.py
@@ -3,6 +3,8 @@
 the timestamp would always monotonically nondecrease.
 """
 
+from pythonparser import diagnostic
+
 from .. import types, builtins, ir, iodelay
 from ..analyses import domination
 from ..algorithms import inline
@@ -127,6 +129,14 @@ def time_after_block(pair):
                     else: # It's a call.
                         need_to_inline = len(source_blocks) > 1
                         if need_to_inline:
+                            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 "
+                                    "prove that the same function would always be called", {},
+                                    old_decomp.loc)
+                                self.engine.process(diag)
+
                             inline(old_decomp)
                             postdom_tree = domination.PostDominatorTree(func)
                             continue

diff --git a/lit-test/test/interleaving/error_inlining.py b/lit-test/test/interleaving/error_inlining.py
@@ -0,0 +1,16 @@
+# RUN: %python -m artiq.compiler.testbench.signature +diag %s >%t
+# RUN: OutputCheck %s --file-to-check=%t
+
+def f():
+    delay_mu(2)
+
+def g():
+    delay_mu(2)
+
+x = f if True else g
+
+def h():
+    with parallel:
+        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
+        x()