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

test/coredevice: adapt to MU API

This commit is contained in:
Sebastien Bourdeauducq 2015-07-01 22:34:49 +02:00
parent 5ace0f8e7a
commit 771ad6cb26
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
artiq/test/coredevice.py
View File

@ -19,9 +19,9 @@ class RTT(Experiment, AutoDB):
self.ttl_inout.gate_rising(2*us) self.ttl_inout.gate_rising(2*us)
with sequential: with sequential:
delay(1*us) delay(1*us)
t0 = now() t0 = now_mu()
self.ttl_inout.pulse(1*us) self.ttl_inout.pulse(1*us)
self.rtt = self.ttl_inout.timestamp() - t0 self.rtt = mu_to_seconds(self.ttl_inout.timestamp() - t0)
class Loopback(Experiment, AutoDB): class Loopback(Experiment, AutoDB):
@ -37,9 +37,9 @@ class Loopback(Experiment, AutoDB):
self.loop_in.gate_rising(2*us) self.loop_in.gate_rising(2*us)
with sequential: with sequential:
delay(1*us) delay(1*us)
t0 = now() t0 = now_mu()
self.loop_out.pulse(1*us) self.loop_out.pulse(1*us)
self.rtt = self.loop_in.timestamp() - t0 self.rtt = mu_to_seconds(self.loop_in.timestamp() - t0)
class PulseRate(Experiment, AutoDB): class PulseRate(Experiment, AutoDB):
@ -50,17 +50,17 @@ class PulseRate(Experiment, AutoDB):
@kernel @kernel
def run(self): def run(self):
dt = time_to_cycles(1000*ns) dt = seconds_to_mu(1000*ns)
while True: while True:
try: try:
for i in range(1000): for i in range(1000):
self.loop_out.pulse(cycles_to_time(dt)) self.loop_out.pulse_mu(dt)
delay(cycles_to_time(dt)) delay_mu(dt)
except RTIOUnderflow: except RTIOUnderflow:
dt += 1 dt += 1
self.core.break_realtime() self.core.break_realtime()
else: else:
self.pulse_rate = cycles_to_time(2*dt) self.pulse_rate = mu_to_seconds(2*dt)
break break
@ -98,10 +98,10 @@ class RPCTiming(Experiment, AutoDB):
def bench(self): def bench(self):
self.ts = [0. for _ in range(self.repeats)] self.ts = [0. for _ in range(self.repeats)]
for i in range(self.repeats): for i in range(self.repeats):
t1 = self.core.get_rtio_time() t1 = self.core.get_rtio_counter_mu()
self.nop(1) self.nop(1)
t2 = self.core.get_rtio_time() t2 = self.core.get_rtio_counter_mu()
self.ts[i] = t2 - t1 self.ts[i] = mu_to_seconds(t2 - t1)
def run(self): def run(self):
self.bench() self.bench()
@ -116,5 +116,5 @@ class RPCTest(ExperimentCase):
res = self.execute(RPCTiming) res = self.execute(RPCTiming)
print(res) print(res)
self.assertGreater(res["rpc_time_mean"], 100*ns) self.assertGreater(res["rpc_time_mean"], 100*ns)
self.assertLess(res["rpc_time_mean"], 10*ms) self.assertLess(res["rpc_time_mean"], 15*ms)
self.assertLess(res["rpc_time_stddev"], 1*ms) self.assertLess(res["rpc_time_stddev"], 1*ms)