m-labs · May 3, 2016 · May 3, 2016 · May 3, 2016
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -40,6 +40,12 @@ unreleased [2.x]
   has been replaced. Pass the parent as first argument instead.
 
 
+1.0rc4 (unreleased)
+-------------------
+
+* setattr_argument and setattr_device add their key to kernel_invariants.
+
+
 1.0rc3
 ------
 

diff --git a/artiq/gateware/nist_qc2.py b/artiq/gateware/nist_qc2.py
@@ -43,7 +43,7 @@ def FPins(s):
                 Subsignal("wr_n", FPins("FMC:LA24_P")),
                 Subsignal("rd_n", FPins("FMC:LA25_N")),
                 Subsignal("rst", FPins("FMC:LA25_P")),
-                IOStandard("LVTTL")),
+                IOStandard("LVTTL"), Misc("DRIVE=24")),
 
             ("i2c_fmc", next(i2c_fmc),
                 Subsignal("scl", FPins("FMC:IIC_SCL")),

diff --git a/artiq/language/environment.py b/artiq/language/environment.py
@@ -216,8 +216,12 @@ def get_argument(self, key, processor, group=None):
 
     def setattr_argument(self, key, processor=None, group=None):
         """Sets an argument as attribute. The names of the argument and of the
-        attribute are the same."""
+        attribute are the same.
+
+        The key is added to the instance's kernel invariants."""
         setattr(self, key, self.get_argument(key, processor, group))
+        kernel_invariants = getattr(self, "kernel_invariants", set())
+        self.kernel_invariants = kernel_invariants | {key}
 
     def get_device_db(self):
         """Returns the full contents of the device database."""
@@ -229,8 +233,12 @@ def get_device(self, key):
 
     def setattr_device(self, key):
         """Sets a device driver as attribute. The names of the device driver
-         and of the attribute are the same."""
+         and of the attribute are the same.
+
+        The key is added to the instance's kernel invariants."""
         setattr(self, key, self.get_device(key))
+        kernel_invariants = getattr(self, "kernel_invariants", set())
+        self.kernel_invariants = kernel_invariants | {key}
 
     def set_dataset(self, key, value,
                     broadcast=False, persist=False, save=True):

diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py
@@ -83,8 +83,6 @@ def run(self):
 
 
 class PulseRate(EnvExperiment):
-    kernel_invariants = {"core", "ttl_out"}
-
     def build(self):
         self.setattr_device("core")
         self.setattr_device("ttl_out")
@@ -107,8 +105,6 @@ def run(self):
 
 
 class PulseRateDDS(EnvExperiment):
-    kernel_invariants = {"core", "core_dds", "dds0", "dds1"}
-
     def build(self):
         self.setattr_device("core")
         self.setattr_device("core_dds")

diff --git a/artiq/test/lit/embedding/error_attr_constant.py b/artiq/test/lit/embedding/error_attr_constant.py
@@ -5,7 +5,7 @@
 from artiq.language.types import *
 
 class c:
-    kernel_invariants = {'a'}
+    kernel_invariants = {"a"}
 
     def __init__(self):
         self.a = 1

diff --git a/artiq/test/lit/embedding/warning_invariant_2.py b/artiq/test/lit/embedding/warning_invariant_2.py
@@ -12,8 +12,8 @@ def __init__(self, invariants):
     def __repr__(self):
         return "<testbench.c object>"
 
-i1 = c({'a', 'b'})
-i2 = c({'a'})
+i1 = c({"a", "b"})
+i2 = c({"a"})
 
 @kernel
 def entrypoint():