M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

test/coredevice: partial update to new APIs

This commit is contained in:
Sebastien Bourdeauducq 2015-12-16 19:45:57 +08:00
parent 142b9b059b
commit 5e38cad64c
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/test/coredevice/embedding.py
View File

@ -1,14 +1,16 @@
from artiq.language import * from artiq.language import *
from artiq.test.hardware_testbench import ExperimentCase from artiq.test.hardware_testbench import ExperimentCase
class Roundtrip(EnvExperiment): class Roundtrip(EnvExperiment):
def build(self): def build(self):
self.attr_device("core") self.setattr_device("core")
@kernel @kernel
def roundtrip(self, obj, fn): def roundtrip(self, obj, fn):
fn(obj) fn(obj)
class RoundtripTest(ExperimentCase): class RoundtripTest(ExperimentCase):
def assertRoundtrip(self, obj): def assertRoundtrip(self, obj):
exp = self.create(Roundtrip) exp = self.create(Roundtrip)

2
artiq/test/coredevice/portability.py
View File

@ -153,7 +153,7 @@ class _Exceptions(EnvExperiment):
class _RPCExceptions(EnvExperiment): class _RPCExceptions(EnvExperiment):
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
self.setattr_argument("catch", FreeValue(False)) self.setattr_argument("catch", PYONValue(False))
self.success = False self.success = False

30
artiq/test/coredevice/rtio.py
View File

@ -28,7 +28,7 @@ class RTT(EnvExperiment):
delay(1*us) delay(1*us)
t0 = now_mu() t0 = now_mu()
self.ttl_inout.pulse(1*us) self.ttl_inout.pulse(1*us)
self.set_result("rtt", mu_to_seconds(self.ttl_inout.timestamp_mu() - t0)) self.set_dataset("rtt", mu_to_seconds(self.ttl_inout.timestamp_mu() - t0))
class Loopback(EnvExperiment): class Loopback(EnvExperiment):
@ -50,7 +50,7 @@ class Loopback(EnvExperiment):
delay(1*us) delay(1*us)
t0 = now_mu() t0 = now_mu()
self.loop_out.pulse(1*us) self.loop_out.pulse(1*us)
self.set_result("rtt", mu_to_seconds(self.loop_in.timestamp_mu() - t0)) self.set_dataset("rtt", mu_to_seconds(self.loop_in.timestamp_mu() - t0))
class ClockGeneratorLoopback(EnvExperiment): class ClockGeneratorLoopback(EnvExperiment):
@ -72,7 +72,7 @@ class ClockGeneratorLoopback(EnvExperiment):
with sequential: with sequential:
delay(200*ns) delay(200*ns)
self.loop_clock_out.set(1*MHz) self.loop_clock_out.set(1*MHz)
self.set_result("count", self.loop_clock_in.count()) self.set_dataset("count", self.loop_clock_in.count())
class PulseRate(EnvExperiment): class PulseRate(EnvExperiment):
@ -95,7 +95,7 @@ class PulseRate(EnvExperiment):
dt += 1 dt += 1
self.core.break_realtime() self.core.break_realtime()
else: else:
self.set_result("pulse_rate", mu_to_seconds(2*dt)) self.set_dataset("pulse_rate", mu_to_seconds(2*dt))
break break
@ -129,7 +129,7 @@ class LoopbackCount(EnvExperiment):
for i in range(self.npulses): for i in range(self.npulses):
delay(25*ns) delay(25*ns)
self.ttl_inout.pulse(25*ns) self.ttl_inout.pulse(25*ns)
self.set_result("count", self.ttl_inout.count()) self.set_dataset("count", self.ttl_inout.count())
class Underflow(EnvExperiment): class Underflow(EnvExperiment):
@ -174,12 +174,9 @@ class TimeKeepsRunning(EnvExperiment):
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
def set_time_at_start(self, time_at_start):
self.set_dataset("time_at_start", time_at_start)
@kernel @kernel
def run(self): def run(self):
self.set_result("time_at_start", now_mu()) self.set_dataset("time_at_start", now_mu())
class Handover(EnvExperiment): class Handover(EnvExperiment):
@ -187,14 +184,13 @@ class Handover(EnvExperiment):
self.setattr_device("core") self.setattr_device("core")
@kernel @kernel
def get_now(self, var): def k(self, var):
self.set_result(var, now_mu()) self.set_dataset(var, now_mu())
delay_mu(1234)
def run(self): def run(self):
self.get_now() self.k("t1")
self.set_dataset("t1", self.time_at_start) self.k("t2")
self.get_now()
self.set_dataset("t2", self.time_at_start)
class CoredeviceTest(ExperimentCase): class CoredeviceTest(ExperimentCase):
@ -259,14 +255,14 @@ class CoredeviceTest(ExperimentCase):
def test_handover(self): def test_handover(self):
self.execute(Handover) self.execute(Handover)
self.assertEqual(self.dataset_mgr.get("t1"), self.assertEqual(self.dataset_mgr.get("t1") + 1234,
self.dataset_mgr.get("t2")) self.dataset_mgr.get("t2"))
class RPCTiming(EnvExperiment): class RPCTiming(EnvExperiment):
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
self.setattr_argument("repeats", FreeValue(100)) self.setattr_argument("repeats", PYONValue(100))
def nop(self): def nop(self):
pass pass