m-labs · Aug 28, 2015 · Aug 28, 2015 · Aug 28, 2015
Showing with 15 additions and 11 deletions.

+2 −2 artiq/compiler/embedding.py

+10 −6 artiq/compiler/targets.py

+1 −1 artiq/frontend/artiq_run.py

+2 −2 artiq/tools.py
diff --git a/artiq/compiler/embedding.py b/artiq/compiler/embedding.py
@@ -420,7 +420,7 @@ def _quote_embedded_function(self, function):
         embedded_function = function.artiq_embedded.function
         source_code = textwrap.dedent(inspect.getsource(embedded_function))
         filename = embedded_function.__code__.co_filename
-        module_name, _ = os.path.splitext(os.path.basename(filename))
+        module_name = embedded_function.__globals__['__name__']
         first_line = embedded_function.__code__.co_firstlineno
 
         # Extract function environment.
@@ -436,7 +436,7 @@ def _quote_embedded_function(self, function):
         function_node = parsetree.body[0]
 
         # Mangle the name, since we put everything into a single module.
-        function_node.name = "{}.{}".format(module_name, function_node.name)
+        function_node.name = "{}.{}".format(module_name, function.__qualname__)
 
         # Normally, LocalExtractor would populate the typing environment
         # of the module with the function name. However, since we run

diff --git a/artiq/compiler/targets.py b/artiq/compiler/targets.py
@@ -69,7 +69,11 @@ def __init__(self):
     def compile(self, module):
         """Compile the module to a relocatable object for this target."""
 
-        if os.getenv('ARTIQ_DUMP_IR'):
+        if os.getenv("ARTIQ_DUMP_SIG"):
+            print("====== MODULE_SIGNATURE DUMP ======", file=sys.stderr)
+            print(module, file=sys.stderr)
+
+        if os.getenv("ARTIQ_DUMP_IR"):
             print("====== ARTIQ IR DUMP ======", file=sys.stderr)
             for function in module.artiq_ir:
                 print(function, file=sys.stderr)
@@ -78,7 +82,7 @@ def compile(self, module):
         llparsedmod = llvm.parse_assembly(str(llmod))
         llparsedmod.verify()
 
-        if os.getenv('ARTIQ_DUMP_LLVM'):
+        if os.getenv("ARTIQ_DUMP_LLVM"):
             print("====== LLVM IR DUMP ======", file=sys.stderr)
             print(str(llparsedmod), file=sys.stderr)
 
@@ -90,7 +94,7 @@ def compile(self, module):
         llpassmgrbuilder.populate(llpassmgr)
         llpassmgr.run(llparsedmod)
 
-        if os.getenv('ARTIQ_DUMP_LLVM'):
+        if os.getenv("ARTIQ_DUMP_LLVM"):
             print("====== LLVM IR DUMP (OPTIMIZED) ======", file=sys.stderr)
             print(str(llparsedmod), file=sys.stderr)
 
@@ -99,7 +103,7 @@ def compile(self, module):
                         features=",".join(self.features),
                         reloc="pic", codemodel="default")
 
-        if os.getenv('ARTIQ_DUMP_ASSEMBLY'):
+        if os.getenv("ARTIQ_DUMP_ASSEMBLY"):
             print("====== ASSEMBLY DUMP ======", file=sys.stderr)
             print(llmachine.emit_assembly(llparsedmod), file=sys.stderr)
 
@@ -115,7 +119,7 @@ def link(self, objects, init_fn):
                 as results:
             library = results["output"].read()
 
-            if os.getenv('ARTIQ_DUMP_ELF'):
+            if os.getenv("ARTIQ_DUMP_ELF"):
                 shlib_temp = tempfile.NamedTemporaryFile(suffix=".so", delete=False)
                 shlib_temp.write(library)
                 shlib_temp.close()
@@ -145,7 +149,7 @@ def symbolize(self, library, addresses):
             backtrace = []
             for function_name, location, address in zip(lines[::2], lines[1::2], addresses):
                 filename, line = location.rsplit(":", 1)
-                if filename == '??':
+                if filename == "??":
                     continue
                 # can't get column out of addr2line D:
                 backtrace.append((filename, int(line), -1, function_name, address))

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
@@ -92,7 +92,7 @@ def _build_experiment(dmgr, pdb, rdb, args):
                                  "for ELF kernels")
             return ELFRunner(dmgr, pdb, rdb, file=args.file)
         else:
-            module = file_import(args.file)
+            module = file_import(args.file, prefix="artiq_run_")
         file = args.file
     else:
         module = sys.modules["__main__"]

diff --git a/artiq/tools.py b/artiq/tools.py
@@ -19,7 +19,7 @@ def parse_arguments(arguments):
     return d
 
 
-def file_import(filename):
+def file_import(filename, prefix="file_import_"):
     linecache.checkcache(filename)
 
     modname = filename
@@ -29,7 +29,7 @@ def file_import(filename):
     i = modname.find(".")
     if i > 0:
         modname = modname[:i]
-    modname = "file_import_" + modname
+    modname = prefix + modname
 
     path = os.path.dirname(os.path.realpath(filename))
     sys.path.insert(0, path)