m-labs · Dec 18, 2015 · Dec 18, 2015 · Dec 18, 2015 · Dec 18, 2015
diff --git a/artiq/compiler/ir.py b/artiq/compiler/ir.py
@@ -500,7 +500,10 @@ def __str__(self):
 # Python-specific SSA IR classes
 
 class TEnvironment(types.TMono):
-    def __init__(self, vars, outer=None):
+    def __init__(self, name, vars, outer=None):
+        assert isinstance(name, str)
+        self.env_name = name # for readable type names in LLVM IR
+
         if outer is not None:
             assert isinstance(outer, TEnvironment)
             env = OrderedDict({"$outer": outer})

diff --git a/artiq/compiler/prelude.py b/artiq/compiler/prelude.py
@@ -27,6 +27,7 @@ def globals():
 
         # ARTIQ decorators
         "kernel":               builtins.fn_kernel(),
+        "portable":             builtins.fn_kernel(),
 
         # ARTIQ context managers
         "parallel":             builtins.obj_parallel(),

diff --git a/artiq/compiler/transforms/artiq_ir_generator.py b/artiq/compiler/transforms/artiq_ir_generator.py
@@ -181,11 +181,12 @@ def visit_ModuleT(self, node):
             entry = self.add_block("entry")
             old_block, self.current_block = self.current_block, entry
 
-            env = self.append(ir.Alloc([], ir.TEnvironment(node.typing_env), name="env"))
+            env_type = ir.TEnvironment(name=func.name, vars=node.typing_env)
+            env = self.append(ir.Alloc([], env_type, name="env"))
             old_env, self.current_env = self.current_env, env
 
-            priv_env = self.append(ir.Alloc([], ir.TEnvironment({ "$return": typ.ret }),
-                                            name="privenv"))
+            priv_env_type = ir.TEnvironment(name=func.name + ".priv", vars={ "$return": typ.ret })
+            priv_env = self.append(ir.Alloc([], priv_env_type, name="privenv"))
             old_priv_env, self.current_private_env = self.current_private_env, priv_env
 
             self.generic_visit(node)
@@ -264,13 +265,15 @@ def visit_function(self, node, is_lambda, is_internal):
                 {var: node.typing_env[var]
                  for var in node.typing_env
                   if var not in node.globals_in_scope}
-            env_type = ir.TEnvironment(env_without_globals, self.current_env.type)
+            env_type = ir.TEnvironment(name=func.name,
+                                       vars=env_without_globals, outer=self.current_env.type)
             env = self.append(ir.Alloc([], env_type, name="env"))
             old_env, self.current_env = self.current_env, env
 
             if not is_lambda:
-                priv_env = self.append(ir.Alloc([], ir.TEnvironment({ "$return": typ.ret }),
-                                                name="privenv"))
+                priv_env_type = ir.TEnvironment(name=func.name + ".priv",
+                                                vars={ "$return": typ.ret })
+                priv_env = self.append(ir.Alloc([], priv_env_type, name="privenv"))
                 old_priv_env, self.current_private_env = self.current_private_env, priv_env
 
             self.append(ir.SetLocal(env, "$outer", env_arg))
@@ -1092,7 +1095,9 @@ def visit_ListCompT(self, node):
         result = self.append(ir.Alloc([length], node.type))
 
         try:
-            env_type = ir.TEnvironment(node.typing_env, self.current_env.type)
+            gen_suffix = ".gen.{}.{}".format(node.loc.line(), node.loc.column())
+            env_type = ir.TEnvironment(name=self.current_function.name + gen_suffix,
+                                       vars=node.typing_env, outer=self.current_env.type)
             env = self.append(ir.Alloc([], env_type, name="env.gen"))
             old_env, self.current_env = self.current_env, env
 

diff --git a/artiq/compiler/transforms/inferencer.py b/artiq/compiler/transforms/inferencer.py
@@ -1017,7 +1017,7 @@ def visit_FunctionDefT(self, node):
 
             diag = diagnostic.Diagnostic("error",
                 "decorators are not supported", {},
-                node.at_locs[index], [decorator.loc])
+                node.at_locs[index], [])
             self.engine.process(diag)
 
         try:

diff --git a/artiq/compiler/transforms/llvm_ir_generator.py b/artiq/compiler/transforms/llvm_ir_generator.py
@@ -256,8 +256,10 @@ def llty_of_type(self, typ, bare=False, for_return=False):
         elif ir.is_option(typ):
             return ll.LiteralStructType([lli1, self.llty_of_type(typ.params["inner"])])
         elif ir.is_environment(typ):
-            llty = ll.LiteralStructType([self.llty_of_type(typ.params[name])
-                                         for name in typ.params])
+            llty = self.llcontext.get_identified_type("env.{}".format(typ.env_name))
+            if llty.elements is None:
+                llty.elements = [self.llty_of_type(typ.params[name]) for name in typ.params]
+
             if bare:
                 return llty
             else:

diff --git a/artiq/runtime/ksupport.c b/artiq/runtime/ksupport.c
@@ -28,7 +28,7 @@ extern void __divsi3, __modsi3, __ledf2, __gedf2, __unorddf2, __eqdf2, __ltdf2,
     __udivmoddi4, __floatsisf, __floatunsisf, __fixsfsi, __fixunssfsi,
     __adddf3, __subdf3, __muldf3, __divdf3, __floatsidf, __floatunsidf,
     __floatdidf, __fixdfsi, __fixdfdi, __fixunsdfsi, __clzsi2, __ctzsi2,
-    __udivdi3, __umoddi3, __moddi3;
+    __udivdi3, __umoddi3, __moddi3, __powidf2;
 
 /* artiq_personality symbols */
 extern void __artiq_personality;
@@ -80,6 +80,7 @@ static const struct symbol runtime_exports[] = {
     {"__udivdi3", &__udivdi3},
     {"__umoddi3", &__umoddi3},
     {"__moddi3", &__moddi3},
+    {"__powidf2", &__powidf2},
 
     /* exceptions */
     {"_Unwind_Resume", &_Unwind_Resume},