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

comm_analyzer: fix stopped_x

This commit is contained in:
Simon Renblad 2024-02-08 15:44:09 +08:00 committed by Sébastien Bourdeauducq
parent 7c583b9c04
commit efb8aaf9f9
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
artiq/coredevice/comm_analyzer.py
View File

@ -223,6 +223,7 @@ class VCDManager:
self.out = fileobj self.out = fileobj
self.codes = vcd_codes() self.codes = vcd_codes()
self.current_time = None self.current_time = None
self.start_time = 0
def set_timescale_ps(self, timescale): def set_timescale_ps(self, timescale):
self.out.write("$timescale {}ps $end\n".format(round(timescale))) self.out.write("$timescale {}ps $end\n".format(round(timescale)))
@ -240,10 +241,14 @@ class VCDManager:
self.out.write("$upscope $end\n") self.out.write("$upscope $end\n")
def set_time(self, time): def set_time(self, time):
time -= self.start_time
if time != self.current_time: if time != self.current_time:
self.out.write("#{}\n".format(time)) self.out.write("#{}\n".format(time))
self.current_time = time self.current_time = time
def set_start_time(self, time):
self.start_time = time
def set_end_time(self, time): def set_end_time(self, time):
pass pass
@ -251,6 +256,8 @@ class VCDManager:
class WaveformManager: class WaveformManager:
def __init__(self): def __init__(self):
self.current_time = 0 self.current_time = 0
self.start_time = 0
self.end_time = 0
self.channels = list() self.channels = list()
self.current_scope = "" self.current_scope = ""
self.trace = {"timescale": 1, "stopped_x": None, "logs": dict(), "data": dict()} self.trace = {"timescale": 1, "stopped_x": None, "logs": dict(), "data": dict()}
@ -274,11 +281,18 @@ class WaveformManager:
self.current_scope = old_scope self.current_scope = old_scope
def set_time(self, time): def set_time(self, time):
time -= self.start_time
for channel in self.channels: for channel in self.channels:
channel.set_time(time) channel.set_time(time)
def set_start_time(self, time):
self.start_time = time
if self.trace["stopped_x"] is not None:
self.trace["stopped_x"] = self.end_time - self.start_time
def set_end_time(self, time): def set_end_time(self, time):
self.trace["stopped_x"] = time self.end_time = time
self.trace["stopped_x"] = self.end_time - self.start_time
class WaveformChannel: class WaveformChannel:
@ -712,11 +726,12 @@ def decoded_dump_to_target(manager, devices, dump, uniform_interval):
start_time = get_message_time(m) start_time = get_message_time(m)
if start_time: if start_time:
break break
if not uniform_interval:
t0 = 0 manager.set_start_time(start_time)
t0 = start_time
for i, message in enumerate(messages): for i, message in enumerate(messages):
if message.channel in channel_handlers: if message.channel in channel_handlers:
t = get_message_time(message) - start_time t = get_message_time(message)
if t >= 0: if t >= 0:
if uniform_interval: if uniform_interval:
interval.set_value_double((t - t0)*ref_period) interval.set_value_double((t - t0)*ref_period)